rpms/grub/devel grub-fedora-9.patch,1.5,1.6 grub.spec,1.68,1.69

Peter Jones (pjones) fedora-extras-commits at redhat.com
Thu Mar 6 23:12:58 UTC 2008


Author: pjones

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

Modified Files:
	grub-fedora-9.patch grub.spec 
Log Message:
* Thu Mar 06 2008 Peter Jones <pjones at redhat.com> - 0.97-28
- Fix FAT/VFAT directory searching.
- Don't artificially limit the kernel's location to lowmem.


grub-fedora-9.patch:

Index: grub-fedora-9.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-9.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grub-fedora-9.patch	28 Feb 2008 00:17:17 -0000	1.5
+++ grub-fedora-9.patch	6 Mar 2008 23:12:47 -0000	1.6
@@ -24868,10 +24868,10 @@
 +
 diff --git a/efi/ia32/loader/linux.c b/efi/ia32/loader/linux.c
 new file mode 100644
-index 0000000..088b126
+index 0000000..36b6570
 --- /dev/null
 +++ b/efi/ia32/loader/linux.c
-@@ -0,0 +1,911 @@
+@@ -0,0 +1,906 @@
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 2006  Free Software Foundation, Inc.
@@ -25045,17 +25045,12 @@
 +       desc < mmap_end;
 +       desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))
 +    {
-+      /* Probably it is better to put the real mode code in the traditional
-+	 space for safety.  */
 +      if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY
-+	  && desc->physical_start <= 0x90000
 +	  && desc->num_pages >= real_mode_pages)
 +	{
 +	  grub_efi_physical_address_t physical_end;
 +
 +          physical_end = desc->physical_start + (desc->num_pages << 12);
-+          if (physical_end > 0x90000)
-+            physical_end = 0x90000;
 +
 +          grub_dprintf ("linux", "physical_start = %x, physical_end = %x\n",
 +                        (unsigned) desc->physical_start,
@@ -26620,10 +26615,10 @@
 +
 diff --git a/efi/x86_64/loader/linux.c b/efi/x86_64/loader/linux.c
 new file mode 100644
-index 0000000..b618ef3
+index 0000000..f0fa412
 --- /dev/null
 +++ b/efi/x86_64/loader/linux.c
-@@ -0,0 +1,827 @@
+@@ -0,0 +1,822 @@
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 2006  Free Software Foundation, Inc.
@@ -26797,17 +26792,12 @@
 +       desc < mmap_end;
 +       desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))
 +    {
-+      /* Probably it is better to put the real mode code in the traditional
-+	 space for safety.  */
 +      if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY
-+	  && desc->physical_start <= 0x90000
 +	  && desc->num_pages >= real_mode_pages)
 +	{
 +	  grub_efi_physical_address_t physical_end;
 +
 +          physical_end = desc->physical_start + (desc->num_pages << 12);
-+          if (physical_end > 0x90000)
-+            physical_end = 0x90000;
 +
 +          grub_dprintf ("linux", "physical_start = %x, physical_end = %x\n",
 +                        (unsigned) desc->physical_start,
@@ -38395,7 +38385,7 @@
        printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE);
        for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode;
 diff --git a/stage2/fsys_fat.c b/stage2/fsys_fat.c
-index f40e658..70a4614 100644
+index f40e658..57a556c 100644
 --- a/stage2/fsys_fat.c
 +++ b/stage2/fsys_fat.c
 @@ -54,8 +54,8 @@ struct fat_superblock
@@ -38430,6 +38420,16 @@
    
    /* Fill in info about super block */
    FAT_SUPER->num_sectors = FAT_CVT_U16 (bpb.short_sectors) 
+@@ -340,7 +342,8 @@ fat_dir (char *dirname)
+   /* Directories don't have a file size */
+   filemax = MAXINT;
+   
+-  for (rest = dirname; (ch = *rest) && !isspace (ch) && ch != '/'; rest++);
++  for (rest = dirname; (ch = *rest) && !isspace (ch) && ch != '/'; rest++)
++      *rest = tolower(*rest);
+   
+   *rest = 0;
+   
 diff --git a/stage2/fsys_iso9660.c b/stage2/fsys_iso9660.c
 index 90e4aa8..4d8a300 100644
 --- a/stage2/fsys_iso9660.c


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- grub.spec	5 Mar 2008 20:37:48 -0000	1.68
+++ grub.spec	6 Mar 2008 23:12:47 -0000	1.69
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 27%{?dist}
+Release: 28%{?dist}
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -77,7 +77,7 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog NEWS README COPYING TODO docs/menu.lst
 /boot/grub
-%attr(0755,root,root)/boot/efi/EFI/redhat/grub.efi
+%attr(0755,root,root)/boot/efi/EFI/redhat
 /sbin/grub
 /sbin/grub-install
 /sbin/grub-terminfo
@@ -89,6 +89,10 @@
 %{_datadir}/grub
 
 %changelog
+* Thu Mar 06 2008 Peter Jones <pjones at redhat.com> - 0.97-28
+- Fix FAT/VFAT directory searching.
+- Don't artificially limit the kernel's location to lowmem.
+
 * Wed Mar 05 2008 Peter Jones <pjones at redhat.com> - 0.97-27
 - Fix permissions on grub.efi so cpio doesn't error when it's on vfat.
 




More information about the fedora-extras-commits mailing list