This commit is contained in:
Peter Jones 2018-05-03 16:47:35 -04:00
parent de58e0d74e
commit 35825dbe33
2 changed files with 15 additions and 15 deletions

View File

@ -23,21 +23,21 @@
%global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64 %global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64
#%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm #%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm
%global bootcsv %{expand:%%{bootcsv%{efi_arch}}} %{expand:
%global bootcsvalt %{expand:%%{bootcsv%{?efi_alt_arch}}} %%global bootcsv %%{expand:%%{bootcsv%%{efi_arch}}}
%global shimefi %{expand:%%{shimefi%{efi_arch}}} %%global bootcsvalt %%{expand:%%{bootcsv%%{?efi_alt_arch}}}
%global shimefialt %{expand:%%{shimefi%{?efi_alt_arch}}} %%global shimefi %%{expand:%%{shimefi%%{efi_arch}}}
%global shimver %{expand:%%{shimver%{efi_arch}}} %%global shimefialt %%{expand:%%{shimefi%%{?efi_alt_arch}}}
%global shimveralt %{expand:%%{shimver%{?efi_alt_arch}}} %%global shimver %%{expand:%%{shimver%%{efi_arch}}}
%global shimdir %{expand:%%{shimdir%{efi_arch}}} %%global shimveralt %%{expand:%%{shimver%%{?efi_alt_arch}}}
%global shimdiralt %{expand:%%{shimdir%{?efi_alt_arch}}} %%global shimdir %%{expand:%%{shimdir%%{efi_arch}}}
%%global shimdiralt %%{expand:%%{shimdir%%{?efi_alt_arch}}}
%ifarch aarch64 %%global unsigned%{efi_arch} %{efi_arch}
%global unsigned shim-unsigned-aarch64 %%global unsignedaa64 aarch64
%else %%global unsigned shim-unsigned-%%{expand:%%{unsigned%{efi_arch}}}
%global unsigned shim-unsigned-%{efi_arch} %%global unsignedalt shim-unsigned-%{?efi_alt_arch}
%endif }
%global unsignedalt shim-unsigned-%{?efi_alt_arch}
%define define_pkg(a:p:) \ %define define_pkg(a:p:) \
%{expand:%%package -n shim-%{-a*}} \ %{expand:%%package -n shim-%{-a*}} \

View File

@ -18,7 +18,7 @@ ExcludeArch: %{ix86}
# and we don't have shim-unsigned-arm builds yet # and we don't have shim-unsigned-arm builds yet
ExcludeArch: %{arm} ExcludeArch: %{arm}
Source0: macros.shim Source0: shim.rpmmacros
# keep these two lists of sources synched up arch-wise. That is 0 and 10 # keep these two lists of sources synched up arch-wise. That is 0 and 10
# match, 1 and 11 match, ... # match, 1 and 11 match, ...