rpms/grub/devel .cvsignore, 1.7, 1.8 grub-fedora-9.patch, 1.9, 1.10 grub.spec, 1.71, 1.72

Peter Jones (pjones) fedora-extras-commits at redhat.com
Thu Mar 20 17:29:31 UTC 2008


Author: pjones

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

Modified Files:
	.cvsignore grub-fedora-9.patch grub.spec 
Log Message:
* Thu Mar 20 2008 Peter Jones <pjones at redhat.com> - 0.97-31
- Fix efifb setup.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Dec 2005 22:50:23 -0000	1.7
+++ .cvsignore	20 Mar 2008 17:28:53 -0000	1.8
@@ -1 +1,2 @@
 grub-0.97.tar.gz
+clog

grub-fedora-9.patch:

Index: grub-fedora-9.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-9.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grub-fedora-9.patch	19 Mar 2008 23:51:38 -0000	1.9
+++ grub-fedora-9.patch	20 Mar 2008 17:28:53 -0000	1.10
@@ -24511,10 +24511,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..1545a7a
+index 0000000..65af9ee
 --- /dev/null
 +++ b/efi/grub/x86_64/linux.h
-@@ -0,0 +1,226 @@
+@@ -0,0 +1,228 @@
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 1999,2000,2001,2002,2003,2004  Free Software Foundation, Inc.
@@ -24603,6 +24603,7 @@
 +  grub_uint32_t kernel_alignment;
 +  grub_uint8_t relocatable_kernel;
 +  grub_uint8_t pad2[3];
++  grub_uint32_t cmdline_size;
 +  grub_uint32_t hardware_subarch;
 +  grub_uint64_t hardware_subarch_data;
 +} __attribute__ ((packed));
@@ -24653,8 +24654,9 @@
 +  grub_uint16_t vesapm_offset;	/* 30 */
 +  grub_uint16_t lfb_pages;	/* 32 */
 +  grub_uint16_t vesa_attrib;	/* 34 */
++  grub_uint32_t capabilities;   /* 36 */
 +
-+  grub_uint8_t padding3[0x40 - 0x36];
++  grub_uint8_t padding3[0x40 - 0x3a];
 +
 +  grub_uint16_t apm_version;	/* 40 */
 +  grub_uint16_t apm_code_segment;	/* 42 */
@@ -24934,10 +24936,10 @@
 +
 diff --git a/efi/ia32/loader/linux.c b/efi/ia32/loader/linux.c
 new file mode 100644
-index 0000000..36b6570
+index 0000000..d04fd89
 --- /dev/null
 +++ b/efi/ia32/loader/linux.c
-@@ -0,0 +1,906 @@
+@@ -0,0 +1,908 @@
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 2006  Free Software Foundation, Inc.
@@ -24968,6 +24970,8 @@
 +
 +#include <shared.h>
 +
++#define VIDEO_TYPE_EFI     0x70    /* EFI graphic mode */
++
 +#define grub_file_size()    filemax
 +
 +#define NEXT_MEMORY_DESCRIPTOR(desc, size)      \
@@ -25310,7 +25314,7 @@
 +    params->video_width = (grub_console_getwh () >> 8);
 +    params->video_ega_bx = 0;
 +    params->video_height = (grub_console_getwh () & 0xff);
-+    params->have_vga = 0;
++    params->have_vga = VIDEO_TYPE_EFI;
 +    params->font_size = 16; /* XXX */
 +  #endif
 +    return 0;
@@ -26681,10 +26685,10 @@
 +
 diff --git a/efi/x86_64/loader/linux.c b/efi/x86_64/loader/linux.c
 new file mode 100644
-index 0000000..b367305
+index 0000000..4ab4f64
 --- /dev/null
 +++ b/efi/x86_64/loader/linux.c
-@@ -0,0 +1,798 @@
+@@ -0,0 +1,800 @@
 +/*
 + *  GRUB  --  GRand Unified Bootloader
 + *  Copyright (C) 2006  Free Software Foundation, Inc.
@@ -26715,6 +26719,8 @@
 +
 +#include <shared.h>
 +
++#define VIDEO_TYPE_EFI     0x70    /* EFI graphic mode */
++
 +#define grub_file_size()    filemax
 +
 +#define NEXT_MEMORY_DESCRIPTOR(desc, size)      \
@@ -27036,7 +27042,7 @@
 +  params->video_width = (grub_console_getwh () >> 8);
 +  params->video_ega_bx = 0;
 +  params->video_height = (grub_console_getwh () & 0xff);
-+  params->have_vga = 0;
++  params->have_vga = VIDEO_TYPE_EFI;
 +  params->font_size = 16; /* XXX */
 +#endif
 +  return;
@@ -27049,7 +27055,7 @@
 +  params->video_width = (grub_console_getwh () >> 8);
 +  params->video_ega_bx = 0;
 +  params->video_height = (grub_console_getwh () & 0xff);
-+  params->have_vga = 0;
++  params->have_vga = VIDEO_TYPE_EFI;
 +  params->font_size = 16; /* XXX */
 +
 +  /* No VBE.  */


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- grub.spec	19 Mar 2008 23:51:38 -0000	1.71
+++ grub.spec	20 Mar 2008 17:28:53 -0000	1.72
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 30%{?dist}
+Release: 31%{?dist}
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -89,6 +89,9 @@
 %{_datadir}/grub
 
 %changelog
+* Thu Mar 20 2008 Peter Jones <pjones at redhat.com> - 0.97-31
+- Fix efifb setup.
+
 * 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.
 




More information about the fedora-extras-commits mailing list