rpms/grub/devel grub-fedora-9.patch,1.8,1.9 grub.spec,1.70,1.71

[Peter Jones (pjones)]

Author: pjones

Update of /cvs/extras/rpms/grub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8738

Modified Files:
	grub-fedora-9.patch grub.spec 
Log Message:
* Wed Mar 19 2008 Peter Jones <pjones at redhat.com> - 0.97-30
- Fix the bootloader for ANOTHER random kernel ABI change on EFI+x86_64.


grub-fedora-9.patch:

Index: grub-fedora-9.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-9.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grub-fedora-9.patch	19 Mar 2008 19:54:24 -0000	1.8
+++ grub-fedora-9.patch	19 Mar 2008 23:51:38 -0000	1.9
@@ -1,3 +1,69 @@
+diff --git a/ChangeLog b/ChangeLog
+index 0f93033..9602fb9 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -772,6 +772,18 @@
+ 	DATA_LEN is less than or equal to MULTIBOOT_SEARCH.
+ 	Reported by Neelkanth Natu <neelnatu at yahoo.com>.
+ 
++2003-03-12  Leonid Lisovskiy  <lly at pisem.net>
++
++	* lib/device.c (get_drive_geometry): grub utility didn't work
++	due to uninitialized 'sector_size' struct geometry member.
++	* stage1/stage1.h (GRUB_NO_DRIVE): Constant moved from
++	stage2/shared.h and its value rolled back to 0xFF for backward
++	compatibility with original grub.
++	* stage1/stage1.S (boot_drive): Use GRUB_NO_DRIVE instead of
++	constant.
++	* stage2/bios.c (get_diskinfo): Workaround for BIOS'es that
++	has CD-ROM drive number = last harddisk + 1.
++
+ 2003-03-10  Yoshinori K. Okuji  <okuji at enbug.org>
+ 
+ 	From Andrew Walrond <andrew at walrond.org>:
+@@ -816,6 +828,42 @@
+ 	thus corrupts the stack.  This is why we specify the exactly 
+ 	necessary size of 0x42 bytes.
+ 
++2003-01-28  Leonid Lisovskiy  <lly at pisem.net>
++
++	ISO9660 support is added.
++
++	* stage2/fsys_iso9660.c: New file - a lot of code stolen from
++	GRUB/98 0.5.
++	* stage2/iso9660.h: Likewise.
++	* stage2/start_torito.S: New file - El Torito boot sector.
++	* stage2/Makefile.am (noinst_HEADERS): iso9660.h added.
++	(libgrub_a_SOURCES): fsys_iso9660.c added.
++	(pkgdata_DATA): iso9660_stage1_5 added.
++	(noinst_PROGRAMS): iso9660_stage1_5.exec added.
++	* configure.in (--disable-iso9660): New option.
++	* stage2/builtins.c (setup_func): Add item for ISO9660 into
++	STAGE1_5_MAP.
++	* stage2/disk_io.c (rawread): Ability to read devices with
++	sector size other than 512 added.
++	(fsys_table): Added entry for ISO9660.
++	(check_and_print_mount): Don't print error when probing
++	partition.
++	(real_open_partition): Cleanup globals after probing.
++	* stage2/filesys.h [FSYS_ISO9660]: Add entries for ISO9660
++	functions.
++	(NUM_FSYS): Added FSYS_ISO9660_NUM.
++	* stage2/shared.h (STAGE2_ID_ISO9660_STAGE1_5): New macro.
++	(GRUB_NO_DRIVE): New constant.
++	(struct geometry): New member 'sector_size'.
++	* stage2/bios.c (get_diskinfo): Request 1.xx version of
++	int13 extensions only since higher version request can
++	destroy El Torito emulation on some BIOS'es.
++	(get_cdinfo): New function - get El Torito emulation parameters.
++	* stage2/asm.S (biosdisk_int13_extensions): pass AX, instead
++	of AH for universality, save EBX,ECX,EDX registers content to
++	avoid data corruption in caller functions.
++	(get_diskinfo_int13_extensions): Removed.
++
+ 2003-01-25  Yoshinori K. Okuji  <okuji at enbug.org>
+ 
+ 	From Steven Dick <ssd.gnu at mmae.ucf.edu>:
 diff --git a/Makefile.am b/Makefile.am
 index 63a9a4f..a27da9c 100644
 --- a/Makefile.am
@@ -26615,10 +26681,10 @@
 +
 diff --git a/efi/x86_64/loader/linux.c b/efi/x86_64/loader/linux.c
 new file mode 100644
-index 0000000..2108260
+index 0000000..b367305
 --- /dev/null
 +++ b/efi/x86_64/loader/linux.c
-@@ -0,0 +1,797 @@
+@@ -0,0 +1,798 @@
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 2006  Free Software Foundation, Inc.
@@ -27205,6 +27271,7 @@
 +  params->rom_config_len = 0;
 +
 +  if (grub_le_to_cpu16 (lh->version) >= 0x0206) {
++    grub_memcpy(&params->version_0204.efi_signature, "EL64", 4);
 +    params->version_0206.efi_system_table = \
 +                        (grub_uint32_t) (unsigned long) grub_efi_system_table;
 +  } else if (grub_le_to_cpu16 (lh->version) >= 0x0204) {


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- grub.spec	18 Mar 2008 23:10:35 -0000	1.70
+++ grub.spec	19 Mar 2008 23:51:38 -0000	1.71
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 29%{?dist}
+Release: 30%{?dist}
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -89,6 +89,9 @@
 %{_datadir}/grub
 
 %changelog
+* Wed Mar 19 2008 Peter Jones <pjones at redhat.com> - 0.97-30
+- Fix the bootloader for ANOTHER random kernel ABI change on EFI+x86_64.
+
 * Tue Mar 18 2008 Peter Jones <pjones at redhat.com> - 0.97-29
 - Remove all the prot_mode_mem code from EFI loader on x86_64.