rpms/grub/devel grub-keystatus.patch,1.1,1.2 grub.spec,1.78,1.79

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15812

Modified Files:
	grub-keystatus.patch grub.spec 
Log Message:
* Fri Feb 13 2009 Peter Jones <pjones at redhat.com> - 0.97-39
- Remove chainloader timeout patch; fixing it in booty instead in order to
  address rhbz#468526 .
- Fix up some style weirdness in the .spec 
- Require newer gnu-efi so it'll build with newer binutils.


grub-keystatus.patch:

Index: grub-keystatus.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-keystatus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-keystatus.patch	25 Jun 2008 23:42:41 -0000	1.1
+++ grub-keystatus.patch	13 Feb 2009 21:23:23 -0000	1.2
@@ -586,3 +586,42 @@
  int console_getxy (void);
  void console_gotoxy (int x, int y);
  void console_cls (void);
+diff -up grub-0.97/stage2/stage2.c.fix-plymouth-patch grub-0.97/stage2/stage2.c
+--- grub-0.97/stage2/stage2.c.fix-plymouth-patch	2008-09-30 17:00:18.000000000 -0400
++++ grub-0.97/stage2/stage2.c	2008-09-30 17:00:58.000000000 -0400
+@@ -258,14 +258,19 @@ restart:
+      interface. */
+   if (grub_timeout < 0)
+     show_menu = 1;
+-  
++
+   /* If SHOW_MENU is false, don't display the menu until ESC is pressed.  */
+   if (! show_menu)
+     {
++      /* Don't show the "Booting in blah seconds message" if the timeout is 0 */
++      int print_message = grub_timeout != 0;
++
+       /* Get current time.  */
+       while ((time1 = getrtsecs ()) == 0xFF)
+ 	;
+-      grub_verbose_printf("\rPress any key to enter the menu\n\n\n");
++
++      if (print_message)
++	grub_printf("\rPress any key to enter the menu\n\n\n");
+ 
+       while (1)
+ 	{
+@@ -301,9 +306,10 @@ restart:
+ 	      grub_timeout--;
+ 	      
+ 	      /* Print a message.  */
+-	      grub_verbose_printf ("\rBooting %s in %d seconds...",
+-				   get_entry(menu_entries, first_entry + entryno, 0),
+-				   grub_timeout);
++	      if (print_message)
++		grub_printf ("\rBooting %s in %d seconds...",
++		             get_entry(menu_entries, first_entry + entryno, 0),
++		             grub_timeout);
+ 	    }
+ 	}
+     }


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- grub.spec	11 Jan 2009 13:07:58 -0000	1.78
+++ grub.spec	13 Feb 2009 21:23:23 -0000	1.79
@@ -1,13 +1,13 @@
 Name: grub
 Version: 0.97
-Release: 37%{?dist}
-Summary: Grand Unified Boot Loader
+Release: 39%{?dist}
+Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
 
 ExclusiveArch: i386 x86_64 ia64
 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, ncurses-static, texinfo
-BuildRequires: autoconf /usr/lib/crt1.o automake gnu-efi >= 3.0e-2
+BuildRequires: autoconf /usr/lib/crt1.o automake gnu-efi >= 3.0e-3
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: mktemp
@@ -20,16 +20,14 @@
 # This is from
 # http://git.kernel.org/?p=boot/grub-fedora/grub-fedora.git;a=summary
 Patch0: grub-fedora-9.patch
-
 Patch1: grub-keystatus.patch
-Patch2: grub-chainloader-timeout.patch
 
 # Various bugfixes
 # http://fedorapeople.org/~lkundrak/grub-fedora.git/
-Patch1001: 0001-Get-rid-of-usr-bin-cmp-dependency.patch
-Patch1002: 0002-Add-strspn-strcspn-and-strtok_r.patch
-Patch1003: 0003-Allow-passing-multiple-image-files-to-the-initrd-com.patch
-Patch1004: 0004-Obey-2.06-boot-protocol-s-cmdline_size.patch
+Patch2: 0001-Get-rid-of-usr-bin-cmp-dependency.patch
+Patch3: 0002-Add-strspn-strcspn-and-strtok_r.patch
+Patch4: 0003-Allow-passing-multiple-image-files-to-the-initrd-com.patch
+Patch5: 0004-Obey-2.06-boot-protocol-s-cmdline_size.patch
 
 %description
 GRUB (Grand Unified Boot Loader) is an experimental boot loader
@@ -42,10 +40,9 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch1001 -p1
-%patch1002 -p1
-%patch1003 -p1
-%patch1004 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 autoreconf
@@ -108,6 +105,12 @@
 %{_datadir}/grub
 
 %changelog
+* Fri Feb 13 2009 Peter Jones <pjones at redhat.com> - 0.97-39
+- Remove chainloader timeout patch; fixing it in booty instead in order to
+  address rhbz#468526 .
+- Fix up some style weirdness in the .spec 
+- Require newer gnu-efi so it'll build with newer binutils.
+
 * Sun Jan 11 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.97-37
 - Get rid of /usr/bin/cmp dependency (Ville Skyttä, #431351)
 - Support multiple initrds (Jeff Layton, #179127)