The package rpms/grub2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/grub2.git/commit/?id=9efcf4d355db....
Change:
+%ifarch %{arm} \
Thanks.
Full change:
============
commit 9efcf4d355db84030ed3e13376cfa1fc63b46085
Author: Javier Martinez Canillas <javierm(a)redhat.com>
Date: Fri Jun 5 12:52:02 2020 +0200
Install GRUB as \EFI\BOOT\BOOTARM.EFI in armv7hl
The Default Boot Behavior for EFI if no BootOrder and Boot#### variables
are found is to look for an ESP and start \EFI\BOOT\BOOT{$arch}.efi.
This is usually fallback.efi installed by the shim package, but since shim
isn't used on armv7, there's no \EFI\BOOT\BOOTARM.EFI installed in the ESP.
So install GRUB as \EFI\BOOT\BOOTARM.EFI for armv7 so there is a default
EFI binary to be started.
Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com>
diff --git a/grub.macros b/grub.macros
index 9c87491..56d6bbd 100644
--- a/grub.macros
+++ b/grub.macros
@@ -496,6 +496,9 @@ ln -sf ..%{efi_esp_dir}/grub.cfg \\\
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \
install -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_dir}/%{2} \
install -m 700 %{3} $RPM_BUILD_ROOT%{efi_esp_dir}/%{3} \
+%ifarch %{arm} \
+install -D -m 700 %{2} $RPM_BUILD_ROOT%{efi_esp_boot}/BOOTARM.EFI \
+%endif \
install -D -m 700 unicode.pf2 \\\
$RPM_BUILD_ROOT%{efi_esp_dir}/fonts/unicode.pf2 \
${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv \\\
@@ -590,6 +593,9 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
%defattr(0700,root,root,-) \
%config(noreplace) %{_sysconfdir}/%{name}-efi.cfg \
%attr(0700,root,root)%{efi_esp_dir}/%{2} \
+%ifarch %{arm} \
+%attr(0700,root,root)%{efi_esp_boot}/BOOTARM.EFI \
+%endif \
%dir %attr(0700,root,root)%{efi_esp_dir}/fonts \
%dir %attr(0700,root,root)/boot/loader/entries \
%ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg \
diff --git a/grub2.spec b/grub2.spec
index b20d04d..4d6aa0b 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -9,7 +9,7 @@
Name: grub2
Epoch: 1
Version: 2.04
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL:
http://www.gnu.org/software/grub/
@@ -509,6 +509,9 @@ rm -r /boot/grub2.tmp/ || :
%endif
%changelog
+* Fri Jun 05 2020 Javier Martinez Canillas <javierm(a)redhat.com> - 2.04-20
+- Install GRUB as \EFI\BOOT\BOOTARM.EFI in armv7hl
+
* Tue May 26 2020 Javier Martinez Canillas <javierm(a)redhat.com> - 2.04-19
- Fix an out of memory error when loading large initrd images
Resolves: rhbz#1838633