diff --git a/shim-signed.spec b/shim-signed.spec index a07d7d9..a3ec123 100644 --- a/shim-signed.spec +++ b/shim-signed.spec @@ -2,9 +2,13 @@ %global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')) +# this is literally to make vim's \c not put a brace at the end. +%global _dist %{expand:%{?_module_build:%%{?dist}}} +%global dist %{expand:%%{_dist}} + Name: shim-signed Version: 13 -Release: 0.6%{?_module_build:%{?dist}} +Release: 0.7%{dist} Summary: First-stage UEFI bootloader License: BSD URL: http://github.com/rhboot/shim/ @@ -187,6 +191,7 @@ install -m 0644 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fbx64.efi $RPM_BUILD_ROOT/boot %endif %ifarch aarch64 %do_install -a aa64 -A AA64 -b %{SOURCE1} +install -m 0644 %{SOURCE10} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi %endif # -a @@ -210,9 +215,14 @@ install -m 0644 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fbx64.efi $RPM_BUILD_ROOT/boot %endif %ifarch aarch64 %define_files -a aa64 -A AA64 +/boot/efi/EFI/%{efidir}/shim.efi %endif %changelog +* Wed Oct 04 2017 Peter Jones - 13-0.7 +- Make /boot/efi/EFI/fedora/shim.efi still exist on aarch64 as well. + Resolves: rhbz#1497854 + * Tue Sep 19 2017 Peter Jones - 13-0.6 - Fix binary format issue on Aarch64 Resolves: rhbz#1489604