rpms/grub/devel grub-fedora-9.patch, 1.12, 1.13 grub.spec, 1.107, 1.108

Peter Jones pjones at fedoraproject.org
Wed Sep 16 21:22:41 UTC 2009


Author: pjones

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

Modified Files:
	grub-fedora-9.patch grub.spec 
Log Message:
* Wed Sep 16 2009 Peter Jones <pjones at redhat.com> - 0.97-60
- Fix a typo introduced in grub-fedora-9.patch that may effect UEFI
  Graphics Output Protocol.


grub-fedora-9.patch:
 b/ChangeLog                      |   48 
 b/Makefile.am                    |    3 
 b/Makefile.in                    |  175 
 b/acinclude.m4                   |    4 
 b/aclocal.m4                     |  555 --
 b/config.h.in                    |    5 
 b/configure.in                   |  757 +++
 b/docs/Makefile.in               |  260 -
 b/docs/grub-install.8            |    2 
 b/docs/grub.8                    |    2 
 b/docs/grub.info                 |  370 -
 b/docs/grub.texi                 |   24 
 b/docs/stamp-vti                 |    4 
 b/docs/version.texi              |    4 
 b/efi/Makefile.am                |   78 
 b/efi/efichainloader.c           |  265 +
 b/efi/eficon.c                   |  299 +
 b/efi/eficore.c                  |  626 +++
 b/efi/efidisk.c                  |  629 +++
 b/efi/efigraph.c                 | 1199 ++++++
 b/efi/efimain.c                  |  110 
 b/efi/efimisc.c                  |  603 +++
 b/efi/efimm.c                    |  438 ++
 b/efi/efiserial.c                |  265 +
 b/efi/efiuga.c                   |  945 ++++
 b/efi/font_8x16.c                | 4638 +++++++++++++++++++++++
 b/efi/graphics.c                 |  568 ++
 b/efi/graphics.h                 |   79 
 b/efi/grub/efi/api.h             | 1459 +++++++
 b/efi/grub/efi/console_control.h |   59 
 b/efi/grub/efi/efi.h             |   70 
 b/efi/grub/efi/eficall.h         |  161 
 b/efi/grub/efi/misc.h            |   46 
 b/efi/grub/efi/time.h            |   31 
 b/efi/grub/i386/linux.h          |  226 +
 b/efi/grub/i386/types.h          |   32 
 b/efi/grub/misc.h                |   66 
 b/efi/grub/symbol.h              |   34 
 b/efi/grub/types.h               |  158 
 b/efi/grub/x86_64/linux.h        |  228 +
 b/efi/grub/x86_64/types.h        |   32 
 b/efi/ia32/callwrap.c            |  131 
 b/efi/ia32/loader/bin_to_h.c     |   29 
 b/efi/ia32/loader/linux.c        |  711 +++
 b/efi/ia32/loader/switch.S       |  118 
 b/efi/ia32/loader/switch.h       |   19 
 b/efi/ia32/reloc.c               |   79 
 b/efi/ia32/setjmp.S              |   86 
 b/efi/ugadebug.h                 |  201 +
 b/efi/x86_64/callwrap.c          |  395 ++
 b/efi/x86_64/crt0-efi.S          |   63 
 b/efi/x86_64/elf_efi.lds         |   58 
 b/efi/x86_64/loader/bin_to_h.c   |   29 
 b/efi/x86_64/loader/linux.c      |  626 +++
 b/efi/x86_64/loader/switch.S     |   92 
 b/efi/x86_64/loader/switch.h     |   25 
 b/efi/x86_64/reloc.c             |   79 
 b/efi/x86_64/setjmp.S            |   56 
 b/efi/xpm.c                      |  231 +
 b/efi/xpm.h                      |   36 
 b/grub.spec                      |  438 ++
 b/grub/Makefile.in               |  117 
 b/grub/asmstub.c                 |  162 
 b/grub/main.c                    |    2 
 b/lib/Makefile.in                |  111 
 b/lib/device.c                   |  352 +
 b/netboot/Makefile.in            |  359 -
 b/netboot/etherboot.h            |   34 
 b/netboot/main.c                 |    6 
 b/netboot/misc.c                 |   58 
 b/netboot/osdep.h                |   24 
 b/stage1/Makefile.am             |   15 
 b/stage1/Makefile.in             |  169 
 b/stage2/Makefile.am             |   71 
 b/stage2/Makefile.in             | 1729 +++++---
 b/stage2/asm.S                   |  203 +
 b/stage2/boot.c                  |   24 
 b/stage2/builtins.c              | 1146 +++--
 b/stage2/char_io.c               |  375 +
 b/stage2/cmdline.c               |   15 
 b/stage2/common.c                |   14 
 b/stage2/disk_io.c               |  109 
 b/stage2/fat.h                   |    2 
 b/stage2/filesys.h               |    4 
 b/stage2/fsys_ext2fs.c           |   79 
 b/stage2/fsys_fat.c              |   13 
 b/stage2/fsys_iso9660.c          |    6 
 b/stage2/fsys_minix.c            |   10 
 b/stage2/fsys_reiserfs.c         |   18 
 b/stage2/fsys_vstafs.c           |   28 
 b/stage2/fsys_xfs.c              |   18 
 b/stage2/gpt.h                   |   68 
 b/stage2/graphics.c              |  573 ++
 b/stage2/graphics.h              |   42 
 b/stage2/gunzip.c                |   15 
 b/stage2/iso9660.h               |    4 
 b/stage2/mb_info.h               |    4 
 b/stage2/pc_slice.h              |   47 
 b/stage2/serial.c                |    4 
 b/stage2/shared.h                |   59 
 b/stage2/smp-imps.h              |    1 
 b/stage2/stage2.c                |  165 
 b/stage2/term.h                  |   26 
 b/stage2/tparm.c                 |   14 
 b/test                           |    1 
 b/util/Makefile.am               |   11 
 b/util/Makefile.in               |  131 
 b/util/grub-install.in           |  321 +
 configure                        | 7639 ---------------------------------------
 configure.ac                     |  670 ---
 110 files changed, 23056 insertions(+), 11071 deletions(-)

Index: grub-fedora-9.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-9.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- grub-fedora-9.patch	7 Apr 2008 17:19:51 -0000	1.12
+++ grub-fedora-9.patch	16 Sep 2009 21:22:38 -0000	1.13
@@ -14565,7 +14565,7 @@ index 0000000..0babe11
 +            if (!eg->modes[i])
 +                goto fail;
 +            memset(eg->modes, '\0', sizeof (eg->modes[0]));
-+            eg->modes[i]->number;
++            eg->modes[i]->number = i;
 +
 +            efi_status = Call_Service_4(eg->output_intf->query_mode,
 +                    eg->output_intf, i, &eg->modes[i]->size,


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- grub.spec	20 Aug 2009 14:34:19 -0000	1.107
+++ grub.spec	16 Sep 2009 21:22:39 -0000	1.108
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 59%{?dist}
+Release: 60%{?dist}
 Summary: Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -141,6 +141,10 @@ fi
 %{_datadir}/grub
 
 %changelog
+* Wed Sep 16 2009 Peter Jones <pjones at redhat.com> - 0.97-60
+- Fix a typo introduced in grub-fedora-9.patch that may effect UEFI
+  Graphics Output Protocol.
+
 * Thu Aug 20 2009 Peter Jones <pjones at redhat.com> - 0.97-59
 - Correctly link against gnuefi.
 




More information about the fedora-extras-commits mailing list