From d38088ed67f02570a4e1dce23d19ae19e48a7fc8 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 23 Aug 2012 11:12:09 -0400 Subject: [PATCH 1/4] Only require pesign on EFI architectures (#851215) --- grub2.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/grub2.spec b/grub2.spec index db591e1..bca7077 100644 --- a/grub2.spec +++ b/grub2.spec @@ -41,7 +41,7 @@ Name: grub2 Epoch: 1 Version: 2.00 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -83,7 +83,9 @@ BuildRequires: autoconf automake autogen device-mapper-devel BuildRequires: freetype-devel gettext-devel git BuildRequires: texinfo BuildRequires: dejavu-sans-fonts +%ifarch %{efiarchs} BuildRequires: pesign >= 0.10-3 +%endif Requires: gettext os-prober which file system-logos Requires: %{name}-tools = %{epoch}:%{version}-%{release} @@ -416,6 +418,9 @@ fi %doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0 %changelog +* Thu Aug 23 2012 David Cantrell - 2.00-6 +- Only require pesign on EFI architectures (#851215) + * Tue Aug 14 2012 Peter Jones - 2.00-5 - Work around AHCI firmware bug in efidisk driver. - Move to newer pesign macros From 62fd5b9b37f10ef70b03870482c9d542e74319d2 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 5 Sep 2012 17:58:48 -0400 Subject: [PATCH 2/4] Add Apple partition map support for EFI --- grub2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grub2.spec b/grub2.spec index bca7077..54e33e8 100644 --- a/grub2.spec +++ b/grub2.spec @@ -41,7 +41,7 @@ Name: grub2 Epoch: 1 Version: 2.00 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -173,7 +173,7 @@ cd grub-efi-%{tarversion} make %{?_smp_mflags} CD_MODULES=" all_video boot btrfs cat chain configfile echo efifwsetup \ efinet ext2 fat font gfxmenu gfxterm gzio halt hfsplus iso9660 \ - jpeg linuxefi minicmd normal part_msdos part_gpt \ + jpeg linuxefi minicmd normal part_apple part_msdos part_gpt \ password_pbkdf2 png reboot search search_fs_uuid \ search_fs_file search_label test video" ./grub-mkimage -O %{grubefiarch} -o %{grubeficdname}.orig -p /EFI/BOOT \ @@ -418,6 +418,9 @@ fi %doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0 %changelog +* Wed Sep 05 2012 Matthew Garrett - 2.00-7 +- Add Apple partition map support for EFI + * Thu Aug 23 2012 David Cantrell - 2.00-6 - Only require pesign on EFI architectures (#851215) From 6ce6b37eb63893b37b9261dc440edcc329b36d3f Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 14 Sep 2012 15:40:52 -0700 Subject: [PATCH 3/4] theme.tar.bz2: use unicode font for console, makes edit screen better (850783) --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index e02ad33..0522594 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -8c28087c5fcb3188f1244b390efffdbe unifont-5.1.20080820.pcf.gz -5e5c7bae1211f558e3c0a3011fef8609 theme.tar.bz2 a1043102fbc7bcedbf53e7ee3d17ab91 grub-2.00.tar.xz +566c4668b90b610c1f6c0c402cbd6ab0 theme.tar.bz2 +8c28087c5fcb3188f1244b390efffdbe unifont-5.1.20080820.pcf.gz From 37d2c4a417e7549a69bfa60b261743989ca5a46c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Sep 2012 18:02:52 -0400 Subject: [PATCH 4/4] Use grub2-owner@ instead of pjones@ to apply patches. Ninjas all the way down. Signed-off-by: Peter Jones --- grub2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub2.spec b/grub2.spec index 54e33e8..d53f651 100644 --- a/grub2.spec +++ b/grub2.spec @@ -133,7 +133,7 @@ cp %{SOURCE3} . # place unifont in the '.' from which configure is run cp %{SOURCE4} unifont.pcf.gz git init -git config user.email "pjones@fedoraproject.org" +git config user.email "grub2-owner@fedoraproject.org" git config user.name "Fedora Ninjas" git add . git commit -a -q -m "%{tarversion} baseline." @@ -147,7 +147,7 @@ cp %{SOURCE3} . # place unifont in the '.' from which configure is run cp %{SOURCE4} unifont.pcf.gz git init -git config user.email "pjones@fedoraproject.org" +git config user.email "grub2-owner@fedoraproject.org" git config user.name "Fedora Ninjas" git add . git commit -a -q -m "%{tarversion} baseline."