From d66e649b3f460921c218ed64e26cbcf4df2ccdd4 Mon Sep 17 00:00:00 2001 From: gord Date: Thu, 30 Sep 1999 18:19:06 +0000 Subject: [PATCH] Getting ready for new release. --- ChangeLog | 27 ++++++++++++++++++-------- debian/README.debian | 2 +- debian/changelog | 5 +++++ debian/control | 2 +- debian/copyright | 2 +- debian/postinst | 6 ++++++ debian/prerm | 3 +++ debian/rules | 4 ++++ docs/menu.lst | 8 ++++---- stage2/cmdline.c | 45 ++++++++++++++++++++------------------------ 10 files changed, 64 insertions(+), 40 deletions(-) create mode 100644 debian/postinst create mode 100644 debian/prerm diff --git a/ChangeLog b/ChangeLog index bdafdd6ae..8b34eb65c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +1999-09-30 Gordon Matzigkeit + + * debian/postinst: New file to call install-info. + * debian/prerm: Likewise. + * debian/rules (binary-arch): Add postinst and prerm, compress the + info files, and call dpkg-shlibdeps. + + * stage2/cmdline.c (skip_to): Restructure, and count tabs as + whitespace. + (find_command): Likewise. + 1999-09-30 OKUJI Yoshinori * grub/getopt.c: Moved to ... @@ -12,7 +23,7 @@ * Makefile.am (SUBDIRS): Added lib. * configure.in: lib/Makefile is added into the arguments for AC_OUTPUT. - + 1999-09-30 OKUJI Yoshinori From Pavel Roskin: @@ -39,7 +50,7 @@ (struct ocg): Likewise. (cgbase): Use mach_daddr_t instead of daddr_t. (itod): Likewise. - + 1999-09-30 OKUJI Yoshinori * acinclude.m4 (grub_CHECK_START_SYMBOL): Use AC_TRY_LINK @@ -50,7 +61,7 @@ * stage2/disk_io.c (set_device) [!STAGE1_5]: Use RESULT instead of RETVAL to check if the analysis succeeds. - + 1999-09-29 OKUJI Yoshinori * stage2/builtins.c (install_func): If the Stage 2 id in FILE is @@ -74,7 +85,7 @@ * stage2/fsys_ffs.c (ffs_dir): Likewise. * stage2/fsys_fat.c (fat_dir): Likewise. * stage2/fsys_minix.c (minix_dir): Likewise. - + 1999-09-29 OKUJI Yoshinori * stage1/stage1.S [!FFS_STAGE1_5] (blocklist_default_len): Do @@ -85,7 +96,7 @@ * stage2/builtins.c (install_func): When installing Stage 1.5, if set_device returns NULL, then set CURRENT_DRIVE to 0xFF and CONFIG_FILE to PTR. - + 1999-09-26 OKUJI Yoshinori * stage2/char_io.c [!STAGE1_5] (get_cmdline): In cl_insert, call @@ -102,7 +113,7 @@ (check_BSD_parts) [!STAGE1_5]: Likewise. [!STAGE1_5] (print_a_completion): Ignore NAME if it is "." or "..". - + 1999-09-25 OKUJI Yoshinori * acinclude.m4 (grub_CHECK_USCORE_END_SYMBOL): Do not call @@ -128,13 +139,13 @@ SAVED_PARTITION, respectively. Otherwise set to DRIVE and PARTITION, respectively. (setup_part) [STAGE1_5]: Always call set_device. - + 1999-09-24 OKUJI Yoshinori * acinclude.m4 (grub_CHECK_END_SYMBOL): Add a missing double-quote. Reported by Johannes Kroeger . - + 1999-09-14 Gordon Matzigkeit * stage1/stage1.S (blocklist_default_start): New label for default diff --git a/debian/README.debian b/debian/README.debian index 03214f519..6162698b4 100644 --- a/debian/README.debian +++ b/debian/README.debian @@ -14,7 +14,7 @@ edit configuration files or rerun a special installation program. NOTE: GRUB does not yet have a simple installation mechanism, but we're working on this, so please don't report it as a bug. Until -then, read the Texinfo documentation, and copy the binary files in +then, do `info grub', and copy the binary files in /usr/lib/grub/$(HWARCH) to /boot/grub. WARNING: Never use the binary files in /usr/lib/grub directly diff --git a/debian/changelog b/debian/changelog index a960032d1..9b2515bed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ grub (0.5.93) unstable; urgency=low + * Updated example configurations. (fixes:bug#42136) + * Highlight color set correctly when editing. (fixes:bug#42549) + * dpkg-shlibdeps called on /usr/sbin/grub. (fixes:bug#42704) + * Properly install Texinfo documentation. (fixes:bug#42705,bug#42919) + grub (0.5.92) unstable; urgency=low * Data files are now in /usr/lib/grub/$(HWARCH). diff --git a/debian/control b/debian/control index 4778a1a85..a3f576853 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: grub Section: base Priority: extra -Maintainer: Gordon Matzigkeit +Maintainer: GNU GRUB Maintainers Standards-Version: 2.5.0.0 Package: grub diff --git a/debian/copyright b/debian/copyright index 89ca736d6..619ca3825 100644 --- a/debian/copyright +++ b/debian/copyright @@ -24,4 +24,4 @@ GRUB's copyright: Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. On Debian GNU systems, the complete text of the GNU General Public -License can be found in `/usr/doc/copyright/GPL'. +License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/postinst b/debian/postinst new file mode 100644 index 000000000..87903c1e7 --- /dev/null +++ b/debian/postinst @@ -0,0 +1,6 @@ +#! /bin/sh +set -e +install-info --quiet --section Kernel Kernel \ + /usr/info/grub.info.gz +install-info --quiet --section Kernel Kernel \ + /usr/info/multiboot.info.gz diff --git a/debian/prerm b/debian/prerm new file mode 100644 index 000000000..14e5da5b7 --- /dev/null +++ b/debian/prerm @@ -0,0 +1,3 @@ +#! /bin/sh +install-info --quiet --remove /usr/info/grub.info.gz +install-info --quiet --remove /usr/info/multiboot.info.gz diff --git a/debian/rules b/debian/rules index 14c114f39..0b37573e5 100644 --- a/debian/rules +++ b/debian/rules @@ -35,6 +35,7 @@ binary-arch: checkroot build ## install files dir=`cd debian/tmp && pwd` && make install DESTDIR=$$dir + gzip -f9 debian/tmp/usr/info/* $(INSTALL_DATA) TODO debian/tmp/usr/doc/grub/ $(INSTALL_DATA) BUGS debian/tmp/usr/doc/grub/ @@ -47,6 +48,9 @@ binary-arch: checkroot build $(INSTALL_DATA) debian/copyright debian/tmp/usr/doc/grub/ $(INSTALL_DATA) debian/README.debian debian/tmp/usr/doc/grub/ + # Install control files. + $(INSTALL_PROGRAM) debian/postinst debian/prerm debian/tmp/DEBIAN + dpkg-shlibdeps debian/tmp/usr/sbin/grub dpkg-gencontrol chown -R root.root debian/tmp chmod -R go=rX debian/tmp diff --git a/docs/menu.lst b/docs/menu.lst index 327f7ad49..587cfedf7 100644 --- a/docs/menu.lst +++ b/docs/menu.lst @@ -8,11 +8,11 @@ timeout 30 # By default, boot the first entry. default 0 -# For booting the GNU HURD -title GNU/HURD +# For booting the GNU Hurd +title GNU/Hurd root (hd0,0) -kernel /boot/gnumach root=hd0s1 -module /boot/serverboot +kernel /boot/gnumach.gz root=hd0s1 +module /boot/serverboot.gz # For booting Linux title GNU/Linux diff --git a/stage2/cmdline.c b/stage2/cmdline.c index 8d7092e8b..b14bec584 100644 --- a/stage2/cmdline.c +++ b/stage2/cmdline.c @@ -27,21 +27,16 @@ char * skip_to (int after_equal, char *cmdline) { - if (after_equal) - { - while (*cmdline && *cmdline != ' ' && *cmdline != '=') - cmdline++; - while (*cmdline == ' ' || *cmdline == '=') - cmdline++; - } - else - { - while (*cmdline && *cmdline != ' ') - cmdline++; - while (*cmdline == ' ') - cmdline++; - } - + /* Skip until we hit whitespace, or maybe an equal sign. */ + while (*cmdline && *cmdline != ' ' && *cmdline != '\t' && + ! (after_equal && *cmdline == '=')) + cmdline ++; + + /* Skip whitespace, and maybe equal signs. */ + while (*cmdline == ' ' || *cmdline == '\t' || + (after_equal && *cmdline == '=')) + cmdline ++; + return cmdline; } @@ -62,11 +57,11 @@ find_command (char *command) char *ptr; char c; struct builtin **builtin; - + /* Find the first space and terminate the command name. */ ptr = command; - while (*ptr && *ptr != ' ' && *ptr != '=') - ptr++; + while (*ptr && *ptr != ' ' && *ptr != '\t' && *ptr != '=') + ptr ++; c = *ptr; *ptr = 0; @@ -74,7 +69,7 @@ find_command (char *command) for (builtin = builtin_table; *builtin != 0; builtin++) { int ret = grub_strcmp (command, (*builtin)->name); - + if (ret == 0) { /* Find the builtin for COMMAND. */ @@ -84,7 +79,7 @@ find_command (char *command) else if (ret < 0) break; } - + /* Cannot find COMMAND. */ errnum = ERR_UNRECOGNIZED; *ptr = c; @@ -100,7 +95,7 @@ init_cmdline (void) saved_partition = install_partition; current_drive = 0xFF; errnum = 0; - + /* Restore memory probe state. */ mbi.mem_upper = saved_mem_upper; if (mbi.mmap_length) @@ -124,7 +119,7 @@ enter_cmdline (char *heap) { struct builtin *builtin; char *arg; - + *heap = 0; print_error (); @@ -158,7 +153,7 @@ run_script (char *script, char *heap) { char *old_entry; char *cur_entry = script; - + /* Initialize the data. */ init_cmdline (); @@ -166,9 +161,9 @@ run_script (char *script, char *heap) { struct builtin *builtin; char *arg; - + print_error (); - + if (errnum) { grub_printf ("Press any key to continue...");