The package rpms/shim.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/shim.git/commit/?id=f54022bf7f1edabf....
Change: +%ifarch aarch64
Thanks.
Full change: ============
commit f54022bf7f1edabf41f57c6f8c02cf88e4128ae5 Author: Peter Jones pjones@redhat.com Date: Fri May 4 15:07:21 2018 -0400
Make sure all of our macros always expand
Signed-off-by: Peter Jones pjones@redhat.com
diff --git a/shim.rpmmacros b/shim.rpmmacros index dece167..44d23ca 100644 --- a/shim.rpmmacros +++ b/shim.rpmmacros @@ -23,6 +23,11 @@ %global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64 #%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm
+%global unsignedaa64 shim-unsigned-aarch64 +%global unsignedia32 shim-unsigned-ia32 +%global unsignedx64 shim-unsigned-x64 +#%%global unsignedarm shim-unsigned-arm + %global bootcsv %{expand:%{bootcsv%{efi_arch}}} %global bootcsvalt %{expand:%{bootcsv%{?efi_alt_arch}}} %global shimefi %{expand:%{shimefi%{efi_arch}}} @@ -32,14 +37,9 @@ %global shimdir %{expand:%{shimdir%{efi_arch}}} %global shimdiralt %{expand:%{shimdir%{?efi_alt_arch}}}
-%ifarch aarch64 -%global unsignedarch aarch64 -%else -%global unsignedarch %{efi_arch} -%endif -%global unsignedarchalt %{?efi_alt_arch}%{nil} -%global unsigned shim-unsigned-%{?unsignedarch}%{nil} -%global unsignedalt shim-unsigned-%{?unsignedarchalt}%{nil} +%global unsignednone shim-unsigned-none +%global unsigned %{expand:%%{unsigned%{efi_arch}}} +%global unsignedalt %{expand:%%{unsigned%{efi_alt_arch}}}
%define define_pkg(a:p:) \ %{expand:%%package -n shim-%{-a*}} \ diff --git a/shim.spec b/shim.spec index 236d276..2d4a972 100644 --- a/shim.spec +++ b/shim.spec @@ -33,10 +33,21 @@ Source22: shimx64.efi %include %{SOURCE0}
BuildRequires: pesign >= 0.112-20.fc27 -BuildRequires: %{unsigned} = %{shimver} -%if %{efi_has_alt_arch} -BuildRequires: %{unsignedalt} = %{shimveralt} +# We need this because %%{efi} won't expand before choosing where to make +# the src.rpm in koji, and we could be on a non-efi architecture, in which +# case we won't have a valid expansion here... To be solved in the future +# (shim 16+) by making the unsigned packages all provide "shim-unsigned", so +# we can just BuildRequires that. +%ifarch x86_64 +BuildRequires: %{unsignedx64} = %{shimverx64} +BuildRequires: %{unsignedia32} = %{shimveria32} +%endif +%ifarch aarch64 +BuildRequires: %{unsignedaa64} = %{shimveraa64} %endif +#%%ifarch arm +#BuildRequires: %%{unsignedarm} = %%{shimverarm} +#%%endif
%description Initial UEFI bootloader that handles chaining to a trusted full bootloader
arch-excludes@lists.fedoraproject.org