rpms/grub/devel grub-fedora-9.patch,1.1,1.2

[Peter Jones (pjones)]

Author: pjones

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

Modified Files:
	grub-fedora-9.patch 
Log Message:
Update with specfile changes, and change some HdrS data to claim we're elilo.


grub-fedora-9.patch:

Index: grub-fedora-9.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-9.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-fedora-9.patch	5 Nov 2007 20:31:16 -0000	1.1
+++ grub-fedora-9.patch	5 Nov 2007 22:07:36 -0000	1.2
@@ -22113,10 +22113,10 @@
 +#endif /* ! GRUB_TYPES_HEADER */
 diff --git a/efi/grub/x86_64/linux.h b/efi/grub/x86_64/linux.h
 new file mode 100644
-index 0000000..c2d97fe
+index 0000000..4d3e280
 --- /dev/null
 +++ b/efi/grub/x86_64/linux.h
-@@ -0,0 +1,190 @@
+@@ -0,0 +1,199 @@
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 1999,2000,2001,2002,2003,2004  Free Software Foundation, Inc.
@@ -22144,7 +22144,11 @@
 +#define GRUB_LINUX_FLAG_CAN_USE_HEAP	0x80
 +#define GRUB_LINUX_INITRD_MAX_ADDRESS	0x37FFFFFF
 +#define GRUB_LINUX_MAX_SETUP_SECTS	64
++#if 0
 +#define GRUB_LINUX_BOOT_LOADER_TYPE	0x72
++#else
++#define GRUB_LINUX_BOOT_LOADER_TYPE	0x50
++#endif
 +#define GRUB_LINUX_HEAP_END_OFFSET	(0x9000 - 0x200)
 +
 +#define GRUB_LINUX_BZIMAGE_ADDR		0x100000
@@ -22164,8 +22168,13 @@
 +#define GRUB_LINUX_SETUP_MOVE_SIZE	0x9100
 +#define GRUB_LINUX_CL_MAGIC		0xA33F
 +
++#if 0 
 +#define GRUB_LINUX_EFI_SIGNATURE_X64	\
 +  ('4' << 24 | '6' << 16 | 'L' << 8 | 'E')
++#else
++#define GRUB_LINUX_EFI_SIGNATURE_X64	\
++  ('L' << 24 | 'I' << 16 | 'F' << 8 | 'E')
++#endif
 +
 +#ifndef ASM_FILE
 +
@@ -23658,13 +23667,13 @@
 +
 diff --git a/grub.spec b/grub.spec
 new file mode 100644
-index 0000000..b4bff30
+index 0000000..7e5982d
 --- /dev/null
 +++ b/grub.spec
 @@ -0,0 +1,438 @@
 +Name: grub
 +Version: 0.97
-+Release: 20.%{?dist}
++Release: 20%{?dist}
 +Summary: GRUB - the Grand Unified Boot Loader.
 +Group: System Environment/Base
 +License: GPLv2+
@@ -23751,7 +23760,7 @@
 +%{_mandir}/man*/*
 +%{_datadir}/grub
 +%ifarch x86_64
-+%{_datadir}/grub/grub.efi
++/sbin/grub-efi
 +%endif
 +
 +%changelog