[2616]

[Robert Millan]

Revision: 2616
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2616
Author:   robertmh
Date:     2009-09-26 11:48:55 +0000 (Sat, 26 Sep 2009)
Log Message:
-----------

2009-09-26  Robert Millan  <address@hidden>

        * conf/common.rmk (pkglib_MODULES): Remove `lua.mod'.
        (lua_mod_SOURCES, lua_mod_CFLAGS, lua_mod_LDFLAGS): Remove.

        * util/osdetect.lua: Remove.
        * script/lua/lauxlib.c: Likewise.
        * script/lua/ldebug.c: Likewise.
        * script/lua/grub_main.c: Likewise.
        * script/lua/lauxlib.h: Likewise.
        * script/lua/ldebug.h: Likewise.
        * script/lua/ltablib.c: Likewise.
        * script/lua/liolib.c: Likewise.
        * script/lua/lstrlib.c: Likewise.
        * script/lua/lualib.h: Likewise.
        * script/lua/ldo.c: Likewise.
        * script/lua/ldump.c: Likewise.
        * script/lua/ldo.h: Likewise.
        * script/lua/loslib.c: Likewise.
        * script/lua/lundump.c: Likewise.
        * script/lua/grub_lib.c: Likewise.
        * script/lua/ldblib.c: Likewise.
        * script/lua/lundump.h: Likewise.
        * script/lua/lmem.c: Likewise.
        * script/lua/grub_lib.h: Likewise.
        * script/lua/lmathlib.c: Likewise.
        * script/lua/lstate.c: Likewise.
        * script/lua/ltm.c: Likewise.
        * script/lua/lvm.c: Likewise.
        * script/lua/lmem.h: Likewise.
        * script/lua/lstate.h: Likewise.
        * script/lua/ltm.h: Likewise.
        * script/lua/ltable.c: Likewise.
        * script/lua/lvm.h: Likewise.
        * script/lua/llex.c: Likewise.
        * script/lua/lgc.c: Likewise.
        * script/lua/grub_lua.h: Likewise.
        * script/lua/loadlib.c: Likewise.
        * script/lua/lfunc.c: Likewise.
        * script/lua/lopcodes.c: Likewise.
        * script/lua/lparser.c: Likewise.
        * script/lua/ltable.h: Likewise.
        * script/lua/llex.h: Likewise.
        * script/lua/lgc.h: Likewise.
        * script/lua/lfunc.h: Likewise.
        * script/lua/lbaselib.c: Likewise.
        * script/lua/lopcodes.h: Likewise.
        * script/lua/lparser.h: Likewise.
        * script/lua/lzio.c: Likewise.
        * script/lua/linit.c: Likewise.
        * script/lua/lobject.c: Likewise.
        * script/lua/llimits.h: Likewise.
        * script/lua/lstring.c: Likewise.
        * script/lua/lzio.h: Likewise.
        * script/lua/lapi.c: Likewise.
        * script/lua/lcode.c: Likewise.
        * script/lua/lua.h: Likewise.
        * script/lua/lobject.h: Likewise.
        * script/lua/lstring.h: Likewise.
        * script/lua/lapi.h: Likewise.
        * script/lua/lcode.h: Likewise.
        * script/lua/luaconf.h: Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/conf/common.rmk

Removed Paths:
-------------
    trunk/grub2/script/lua/
    trunk/grub2/util/osdetect.lua

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-09-25 23:43:46 UTC (rev 2615)
+++ trunk/grub2/ChangeLog       2009-09-26 11:48:55 UTC (rev 2616)
@@ -1,3 +1,66 @@
+2009-09-26  Robert Millan  <address@hidden>
+
+       * conf/common.rmk (pkglib_MODULES): Remove `lua.mod'.
+       (lua_mod_SOURCES, lua_mod_CFLAGS, lua_mod_LDFLAGS): Remove.
+
+       * util/osdetect.lua: Remove.
+       * script/lua/lauxlib.c: Likewise.
+       * script/lua/ldebug.c: Likewise.
+       * script/lua/grub_main.c: Likewise.
+       * script/lua/lauxlib.h: Likewise.
+       * script/lua/ldebug.h: Likewise.
+       * script/lua/ltablib.c: Likewise.
+       * script/lua/liolib.c: Likewise.
+       * script/lua/lstrlib.c: Likewise.
+       * script/lua/lualib.h: Likewise.
+       * script/lua/ldo.c: Likewise.
+       * script/lua/ldump.c: Likewise.
+       * script/lua/ldo.h: Likewise.
+       * script/lua/loslib.c: Likewise.
+       * script/lua/lundump.c: Likewise.
+       * script/lua/grub_lib.c: Likewise.
+       * script/lua/ldblib.c: Likewise.
+       * script/lua/lundump.h: Likewise.
+       * script/lua/lmem.c: Likewise.
+       * script/lua/grub_lib.h: Likewise.
+       * script/lua/lmathlib.c: Likewise.
+       * script/lua/lstate.c: Likewise.
+       * script/lua/ltm.c: Likewise.
+       * script/lua/lvm.c: Likewise.
+       * script/lua/lmem.h: Likewise.
+       * script/lua/lstate.h: Likewise.
+       * script/lua/ltm.h: Likewise.
+       * script/lua/ltable.c: Likewise.
+       * script/lua/lvm.h: Likewise.
+       * script/lua/llex.c: Likewise.
+       * script/lua/lgc.c: Likewise.
+       * script/lua/grub_lua.h: Likewise.
+       * script/lua/loadlib.c: Likewise.
+       * script/lua/lfunc.c: Likewise.
+       * script/lua/lopcodes.c: Likewise.
+       * script/lua/lparser.c: Likewise.
+       * script/lua/ltable.h: Likewise.
+       * script/lua/llex.h: Likewise.
+       * script/lua/lgc.h: Likewise.
+       * script/lua/lfunc.h: Likewise.
+       * script/lua/lbaselib.c: Likewise.
+       * script/lua/lopcodes.h: Likewise.
+       * script/lua/lparser.h: Likewise.
+       * script/lua/lzio.c: Likewise.
+       * script/lua/linit.c: Likewise.
+       * script/lua/lobject.c: Likewise.
+       * script/lua/llimits.h: Likewise.
+       * script/lua/lstring.c: Likewise.
+       * script/lua/lzio.h: Likewise.
+       * script/lua/lapi.c: Likewise.
+       * script/lua/lcode.c: Likewise.
+       * script/lua/lua.h: Likewise.
+       * script/lua/lobject.h: Likewise.
+       * script/lua/lstring.h: Likewise.
+       * script/lua/lapi.h: Likewise.
+       * script/lua/lcode.h: Likewise.
+       * script/lua/luaconf.h: Likewise.
+
 2009-09-26  Colin Watson  <address@hidden>
 
        * docs/grub.texi (Command-line and menu entry commands): Document

Modified: trunk/grub2/conf/common.rmk
===================================================================
--- trunk/grub2/conf/common.rmk 2009-09-25 23:43:46 UTC (rev 2615)
+++ trunk/grub2/conf/common.rmk 2009-09-26 11:48:55 UTC (rev 2616)
@@ -367,7 +367,7 @@
        fs_file.mod fs_uuid.mod configfile.mod echo.mod         \
        terminfo.mod test.mod blocklist.mod hexdump.mod         \
        read.mod sleep.mod loadenv.mod crc.mod parttool.mod     \
-       msdospart.mod memrw.mod normal.mod sh.mod lua.mod       \
+       msdospart.mod memrw.mod normal.mod sh.mod               \
        gptsync.mod true.mod probe.mod password.mod             \
        keystatus.mod
 
@@ -536,23 +536,6 @@
 sh_mod_CFLAGS = $(COMMON_CFLAGS)
 sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For lua.mod.
-lua_mod_SOURCES = script/lua/lapi.c script/lua/lcode.c script/lua/ldebug.c \
-       script/lua/ldo.c script/lua/ldump.c script/lua/lfunc.c \
-       script/lua/lgc.c script/lua/llex.c script/lua/lmem.c \
-       script/lua/lobject.c script/lua/lopcodes.c script/lua/lparser.c \
-       script/lua/lstate.c script/lua/lstring.c script/lua/ltable.c \
-       script/lua/ltm.c script/lua/lundump.c script/lua/lvm.c \
-       script/lua/lzio.c script/lua/lauxlib.c script/lua/lbaselib.c \
-       script/lua/linit.c script/lua/ltablib.c script/lua/lstrlib.c \
-       script/lua/grub_main.c script/lua/grub_lib.c
-lua_mod_CFLAGS = $(COMMON_CFLAGS)
-lua_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Extra libraries for lua
-# script/lua/lmathlib.c script/lua/loslib.c script/lua/liolib.c
-# script/lua/ldblib.c script/lua/loadlib.c
-
 # Common Video Subsystem specific modules.
 pkglib_MODULES += video.mod videotest.mod bitmap.mod tga.mod jpeg.mod  \
        png.mod font.mod gfxterm.mod video_fb.mod

Deleted: trunk/grub2/util/osdetect.lua
===================================================================
--- trunk/grub2/util/osdetect.lua       2009-09-25 23:43:46 UTC (rev 2615)
+++ trunk/grub2/util/osdetect.lua       2009-09-26 11:48:55 UTC (rev 2616)
@@ -1,111 +0,0 @@
-#!lua
---
--- Copyright (C) 2009  Free Software Foundation, Inc.
---
--- GRUB is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- GRUB is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
---
-
-function enum_device (device, fs, uuid)
-  local root
-  local title
-  local source
-  local kernels = {}
-  local kernel_num = 0
-
-  local function enum_file (name)
-    local version
-
-    version = string.match (name, "vmlinuz%-(.*)")
-    if (version ~= nil) then
-      table.insert (kernels, version)
-      kernel_num = kernel_num + 1
-    end
-  end
-
-  local function sort_kernel (first, second)
-    local a1, a2, a3, a4, b1, b2, b3, b4
-
-    a1, a2, a3, a4 = string.match (first, "(%d+)%.?(%d*).?(%d*)%-?(%d*)")
-    b1, b2, b3, b4 = string.match (second, "(%d+)%.?(%d*).?(%d*)%-?(%d*)")
-    return (a1 > b1) or (a2 > b2) or (a3 > b3) or (a4 < b4);
-  end
-
-  root = "(" .. device .. ")/"
-  source = "root (" .. device .. ")\nchainloader +1"
-  title = nil
-  if (grub.file_exist (root .. "bootmgr") and
-      grub.file_exist (root .. "boot/bcd")) then
-    title = "Windows Vista bootmgr"
-  elseif (grub.file_exist (root .. "ntldr") and
-         grub.file_exist (root .. "ntdetect.com") and
-         grub.file_exist (root .. "boot.ini")) then
-    title = "Windows NT/2000/XP loader"
-  elseif (grub.file_exist (root .. "windows/win.com")) then
-    title = "Windows 98/ME"
-  elseif (grub.file_exist (root .. "io.sys") and
-         grub.file_exist (root .. "command.com")) then
-    title = "MS-DOS"
-  elseif (grub.file_exist (root .. "kernel.sys")) then
-    title = "FreeDOS"
-  elseif (grub.file_exist (root .. "boot/loader") and
-         grub.file_exist (root .. "boot/device.hints")) then
-    source = "root (" .. device .. ")\nfreebsd /boot/loader" ..
-      "\nfreebsd_loadenv /boot/device.hints"
-    title = "FreeBSD"
-  else
-    grub.enum_file (enum_file, root .. "boot")
-    if kernel_num ~= 0 then
-      table.sort (kernels, sort_kernel)
-      for i = 1, kernel_num do
-       local initrd
-
-       title = "Linux " .. kernels[i]
-       source = "root (" .. device ..
-         ")\nlinux /boot/vmlinuz-" .. kernels[i] ..
-         " root=UUID=" .. uuid .. " ro"
-
-       if grub.file_exist (root .. "boot/initrd-" ..
-                           kernels[i] .. ".img") then
-         initrd = "\ninitrd /boot/initrd-" .. kernels[i] .. ".img"
-       elseif grub.file_exist (root .. "boot/initrd.img-" .. kernels[i]) then
-         initrd = "\ninitrd /boot/initrd.img-" .. kernels[i]
-       elseif grub.file_exist (root .. "boot/initrd-" .. kernels[i]) then
-         initrd = "\ninitrd /boot/initrd-" .. kernels[i]
-       else
-         initrd = ""
-       end
-
-       grub.add_menu (source .. initrd, title)
-       grub.add_menu (source .. " single" .. initrd,
-                      title .. " (single-user mode)")
-      end
-      return 0
-    end
-  end
-
-  if title == nil then
-    local partition = string.match (device, ".*,(%d+)")
-
-    if (partition ~= nil) and (tonumber (partition) > 4) then
-      return 0
-    end
-
-    title = "Other OS"
-  end
-
-  grub.add_menu (source, title)
-  return 0
-end
-
-grub.enum_device (enum_device)