From: okuji Date: Sun, 25 Dec 2005 15:22:55 +0000 (+0000) Subject: 2005-12-25 Yoshinori K. Okuji X-Git-Tag: 1.98~2020 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=befaed6ce77092b709678963501c1e601ebe668f;p=thirdparty%2Fgrub.git 2005-12-25 Yoshinori K. Okuji * DISTLIST: Added geninitheader.sh, geninit.sh, commands/test.c, commands/i386/pc/play.c, conf/common.mk, conf/common.rmk, include/grub/parser.h, include/grub/script.h, kern/parser.c, kern/sparc64/cache.S, normal/execute.c, normal/function.c, normal/lexer.c, normal/parser.y, normal/script.c, and partmap/gpt.c. Removed kern/sparc64/cache.c. * conf/common.rmk (DISTCLEANFILES): Added grub_script.tab.c, grub_script.tab.h, grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c. * configure.ac (AC_INIT): Bumped to 1.92. --- diff --git a/ChangeLog b/ChangeLog index c491f7569..3d1851b26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2005-12-25 Yoshinori K. Okuji + + * DISTLIST: Added geninitheader.sh, geninit.sh, commands/test.c, + commands/i386/pc/play.c, conf/common.mk, conf/common.rmk, + include/grub/parser.h, include/grub/script.h, kern/parser.c, + kern/sparc64/cache.S, normal/execute.c, normal/function.c, + normal/lexer.c, normal/parser.y, normal/script.c, and + partmap/gpt.c. + Removed kern/sparc64/cache.c. + + * conf/common.rmk (DISTCLEANFILES): Added grub_script.tab.c, + grub_script.tab.h, grub_modules_init.lst, grub_modules_init.h, + grub_emu_init.c. + + * configure.ac (AC_INIT): Bumped to 1.92. + 2005-12-24 Vesa Jaaskelainen * kern/err.c (grub_error_push): Added new function to support error diff --git a/DISTLIST b/DISTLIST index dc74dec7a..f480ac4c2 100644 --- a/DISTLIST +++ b/DISTLIST @@ -18,6 +18,8 @@ configure.ac gencmdlist.sh gendistlist.sh genfslist.sh +geninitheader.sh +geninit.sh genkernsyms.sh genmk.rb genmodsrc.sh @@ -37,14 +39,18 @@ commands/help.c commands/ls.c commands/search.c commands/terminal.c +commands/test.c commands/timeout.c commands/i386/pc/halt.c +commands/i386/pc/play.c commands/i386/pc/reboot.c commands/i386/pc/vbeinfo.c commands/i386/pc/vbetest.c commands/ieee1275/halt.c commands/ieee1275/reboot.c commands/ieee1275/suspend.c +conf/common.mk +conf/common.rmk conf/i386-pc.mk conf/i386-pc.rmk conf/powerpc-ieee1275.mk @@ -88,9 +94,11 @@ include/grub/misc.h include/grub/mm.h include/grub/net.h include/grub/normal.h +include/grub/parser.h include/grub/partition.h include/grub/pc_partition.h include/grub/rescue.h +include/grub/script.h include/grub/setjmp.h include/grub/symbol.h include/grub/term.h @@ -148,6 +156,7 @@ kern/loader.c kern/main.c kern/misc.c kern/mm.c +kern/parser.c kern/partition.c kern/rescue.c kern/term.c @@ -162,7 +171,7 @@ kern/powerpc/ieee1275/cmain.c kern/powerpc/ieee1275/crt0.S kern/powerpc/ieee1275/init.c kern/powerpc/ieee1275/openfw.c -kern/sparc64/cache.c +kern/sparc64/cache.S kern/sparc64/dl.c kern/sparc64/ieee1275/init.c kern/sparc64/ieee1275/openfw.c @@ -179,15 +188,21 @@ normal/cmdline.c normal/command.c normal/completion.c normal/context.c +normal/execute.c +normal/function.c +normal/lexer.c normal/main.c normal/menu.c normal/menu_entry.c normal/misc.c +normal/parser.y +normal/script.c normal/i386/setjmp.S normal/powerpc/setjmp.S partmap/acorn.c partmap/amiga.c partmap/apple.c +partmap/gpt.c partmap/pc.c partmap/sun.c term/terminfo.c diff --git a/conf/common.mk b/conf/common.mk index efd8fb68f..7d35311b9 100644 --- a/conf/common.mk +++ b/conf/common.mk @@ -3,17 +3,20 @@ # For the parser. grub_script.tab.c grub_script.tab.h: normal/parser.y $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y +DISTCLEANFILES += grub_script.tab.c grub_script.tab.h # For grub-emu. grub_modules_init.lst: geninit.sh (cd $(srcdir); find . -name '*.c' -printf "%P\n" | xargs grep GRUB_MOD_INIT) > $@ +DISTCLEANFILES += grub_modules_init.lst grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst sh $(srcdir)/geninitheader.sh > $@ +DISTCLEANFILES += grub_modules_init.h grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@ - +DISTCLEANFILES += grub_emu_init.c # Filing systems. diff --git a/conf/common.rmk b/conf/common.rmk index db8abc4b6..a6384c7fb 100644 --- a/conf/common.rmk +++ b/conf/common.rmk @@ -3,17 +3,20 @@ # For the parser. grub_script.tab.c grub_script.tab.h: normal/parser.y $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y +DISTCLEANFILES += grub_script.tab.c grub_script.tab.h # For grub-emu. grub_modules_init.lst: geninit.sh (cd $(srcdir); find . -name '*.c' -printf "%P\n" | xargs grep GRUB_MOD_INIT) > $@ +DISTCLEANFILES += grub_modules_init.lst grub_modules_init.h: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh grub_modules_init.lst sh $(srcdir)/geninitheader.sh > $@ +DISTCLEANFILES += grub_modules_init.h grub_emu_init.c: $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_modules_init.lst grub_modules_init.h sh $(srcdir)/geninit.sh $(filter %.c,$^) > $@ - +DISTCLEANFILES += grub_emu_init.c # Filing systems. diff --git a/configure b/configure index 9f53bedd6..dc2a9f2c4 100644 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GRUB 1.91. +# Generated by GNU Autoconf 2.59 for GRUB 1.92. # # Report bugs to . # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='GRUB' PACKAGE_TARNAME='grub' -PACKAGE_VERSION='1.91' -PACKAGE_STRING='GRUB 1.91' +PACKAGE_VERSION='1.92' +PACKAGE_STRING='GRUB 1.92' PACKAGE_BUGREPORT='bug-grub@gnu.org' ac_unique_file="include/grub/dl.h" @@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GRUB 1.91 to adapt to many kinds of systems. +\`configure' configures GRUB 1.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -841,7 +841,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GRUB 1.91:";; + short | recursive ) echo "Configuration of GRUB 1.92:";; esac cat <<\_ACEOF @@ -958,7 +958,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -GRUB configure 1.91 +GRUB configure 1.92 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -972,7 +972,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GRUB $as_me 1.91, which was +It was created by GRUB $as_me 1.92, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -6965,7 +6965,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by GRUB $as_me 1.91, which was +This file was extended by GRUB $as_me 1.92, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7028,7 +7028,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GRUB config.status 1.91 +GRUB config.status 1.92 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 8eed5baab..7de56c496 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -AC_INIT(GRUB, 1.91, [bug-grub@gnu.org]) +AC_INIT(GRUB, 1.92, [bug-grub@gnu.org]) AC_PREREQ(2.53) AC_CONFIG_SRCDIR([include/grub/dl.h]) AC_CONFIG_HEADER([config.h])