diff --git a/SOURCES/efibootmgr-0.5.4-default-to-grub.patch b/SOURCES/efibootmgr-0.5.4-default-to-grub.patch deleted file mode 100644 index 5e8525b..0000000 --- a/SOURCES/efibootmgr-0.5.4-default-to-grub.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 836e58668167e82c5ffcb66f3f390d2c52217f6a Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 14 Apr 2010 16:06:48 -0400 -Subject: [PATCH] Make \EFI\redhat\grub.efi the default bootloader (#579665) - -Make \EFI\redhat\grub.efi the default bootloader instead of \elilo.efi . ---- - src/efibootmgr/efibootmgr.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c -index 5db0d9e..b984143 100644 ---- a/src/efibootmgr/efibootmgr.c -+++ b/src/efibootmgr/efibootmgr.c -@@ -18,7 +18,7 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -- This must tie the EFI_DEVICE_PATH to /boot/efi/elilo.efi -+ This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/redhat/grub.efi - The EFI_DEVICE_PATH will look something like: - ACPI device path, length 12 bytes - Hardware Device Path, PCI, length 6 bytes -@@ -779,7 +779,7 @@ usage() - printf("\t-g | --gpt force disk with invalid PMBR to be treated as GPT\n"); - printf("\t-H | --acpi_hid XXXX set the ACPI HID (used with -i)\n"); - printf("\t-i | --iface name create a netboot entry for the named interface\n"); -- printf("\t-l | --loader name (defaults to \\elilo.efi)\n"); -+ printf("\t-l | --loader name (defaults to \\EFI\\redhat\\grub.efi)\n"); - printf("\t-L | --label label Boot manager display label (defaults to \"Linux\")\n"); - printf("\t-n | --bootnext XXXX set BootNext to XXXX (hex)\n"); - printf("\t-N | --delete-bootnext delete BootNext\n"); -@@ -807,7 +807,7 @@ set_default_opts() - opts.active = -1; /* Don't set it */ - opts.timeout = -1; /* Don't set it */ - opts.edd10_devicenum = 0x80; -- opts.loader = "\\elilo.efi"; -+ opts.loader = "\\EFI\\redhat\\grub.efi"; - opts.label = "Linux"; - opts.disk = "/dev/sda"; - opts.iface = NULL; --- -1.7.0.1 - diff --git a/SOURCES/efibootmgr-0.5.4-default-to-shim.patch b/SOURCES/efibootmgr-0.5.4-default-to-shim.patch new file mode 100644 index 0000000..538166d --- /dev/null +++ b/SOURCES/efibootmgr-0.5.4-default-to-shim.patch @@ -0,0 +1,44 @@ +From 836e58668167e82c5ffcb66f3f390d2c52217f6a Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 14 Apr 2010 16:06:48 -0400 +Subject: [PATCH] Make \EFI\redhat\shim.efi the default bootloader (#1036022) + +Make \EFI\redhat\shim.efi the default bootloader instead of \elilo.efi . +--- + src/efibootmgr/efibootmgr.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c +index 5db0d9e..b984143 100644 +--- a/src/efibootmgr/efibootmgr.c ++++ b/src/efibootmgr/efibootmgr.c +@@ -18,7 +18,7 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +- This must tie the EFI_DEVICE_PATH to /boot/efi/elilo.efi ++ This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/redhat/shim.efi + The EFI_DEVICE_PATH will look something like: + ACPI device path, length 12 bytes + Hardware Device Path, PCI, length 6 bytes +@@ -779,7 +779,7 @@ usage() + printf("\t-g | --gpt force disk with invalid PMBR to be treated as GPT\n"); + printf("\t-H | --acpi_hid XXXX set the ACPI HID (used with -i)\n"); + printf("\t-i | --iface name create a netboot entry for the named interface\n"); +- printf("\t-l | --loader name (defaults to \\elilo.efi)\n"); ++ printf("\t-l | --loader name (defaults to \\EFI\\redhat\\shim.efi)\n"); + printf("\t-L | --label label Boot manager display label (defaults to \"Linux\")\n"); + printf("\t-n | --bootnext XXXX set BootNext to XXXX (hex)\n"); + printf("\t-N | --delete-bootnext delete BootNext\n"); +@@ -807,7 +807,7 @@ set_default_opts() + opts.active = -1; /* Don't set it */ + opts.timeout = -1; /* Don't set it */ + opts.edd10_devicenum = 0x80; +- opts.loader = "\\elilo.efi"; ++ opts.loader = "\\EFI\\redhat\\shim.efi"; + opts.label = "Linux"; + opts.disk = "/dev/sda"; + opts.iface = NULL; +-- +1.7.0.1 + diff --git a/SPECS/efibootmgr.spec b/SPECS/efibootmgr.spec index 32f90c3..4464dae 100644 --- a/SPECS/efibootmgr.spec +++ b/SPECS/efibootmgr.spec @@ -1,21 +1,21 @@ Summary: EFI Boot Manager Name: efibootmgr Version: 0.5.4 -Release: 15%{?dist} +Release: 18%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://linux.dell.com/%{name}/ BuildRequires: pciutils-devel, zlib-devel, git BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXXX) # EFI/UEFI don't exist on PPC -ExclusiveArch: %{ix86} x86_64 ia64 +ExclusiveArch: %{ix86} x86_64 ia64 aarch64 # for RHEL / Fedora when efibootmgr was part of the elilo package Conflicts: elilo <= 3.6-5 Obsoletes: elilo <= 3.6-5 Source0: http://linux.dell.com/%{name}/permalink/%{name}-%{version}.tar.gz -Patch0: efibootmgr-0.5.4-default-to-grub.patch +Patch0: efibootmgr-0.5.4-default-to-shim.patch Patch1: efibootmgr-0.5.4-support-4k-sectors.patch Patch2: efibootmgr-0.5.4-Work-around-broken-Apple-firmware.patch Patch3: efibootmgr-0.5.4-Remove-device-path-padding-on-non-Itanium.patch @@ -57,8 +57,18 @@ rm -rf %{buildroot} %{_sbindir}/%{name} %{_mandir}/man8/%{name}.8.gz %doc README INSTALL COPYING - + %changelog +* Tue Feb 18 2014 David Cantrell - 0.5.4-18 +- Enable efibootmgr on aarch64 platforms + Resolves: rhbz#1055728 + +* Mon Jan 20 2014 Peter Jones - 0.5.4-17 +- Make \EFI\redhat\shim.efi the default bootloader + Resolves: rhbz#1036022 + +* Fri Dec 27 2013 Daniel Mach - 0.5.4-16 +- Mass rebuild 2013-12-27 * Thu Apr 25 2013 Matthew Garrett - 0.5.4-15 - efibootmgr-0.5.4-Work-around-broken-Apple-firmware.patch