|
|
@ -31,9 +31,9 @@ Source22: BOOTAA64.CSV |
|
|
|
%global shimsrc %{SOURCE10} |
|
|
|
%global shimsrc %{SOURCE10} |
|
|
|
%global bootsrc %{SOURCE20} |
|
|
|
%global bootsrc %{SOURCE20} |
|
|
|
|
|
|
|
|
|
|
|
%global shimsrcia32 %{SOURCE11} |
|
|
|
#%global shimsrcia32 %{SOURCE11} |
|
|
|
%global bootsrcia32 %{SOURCE21} |
|
|
|
#%global bootsrcia32 %{SOURCE21} |
|
|
|
%define unsigned_dir_ia32 %{_datadir}/shim/ia32-%{version}-%{unsigned_release}/ |
|
|
|
#%define unsigned_dir_ia32 %{_datadir}/shim/ia32-%{version}-%{unsigned_release}/ |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
%ifarch aarch64 |
|
|
|
%ifarch aarch64 |
|
|
|
%global efiarch AA64 |
|
|
|
%global efiarch AA64 |
|
|
@ -49,7 +49,7 @@ BuildRequires: pesign >= 0.106-5%{dist} |
|
|
|
BuildRequires: efivar-devel |
|
|
|
BuildRequires: efivar-devel |
|
|
|
BuildRequires: shim-unsigned-%{efiarchlc} = %{version}-%{unsigned_release} |
|
|
|
BuildRequires: shim-unsigned-%{efiarchlc} = %{version}-%{unsigned_release} |
|
|
|
%ifarch x86_64 |
|
|
|
%ifarch x86_64 |
|
|
|
BuildRequires: shim-unsigned-ia32 = %{version}-%{unsigned_release} |
|
|
|
#BuildRequires: shim-unsigned-ia32 = %{version}-%{unsigned_release} |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
# for mokutil's configure |
|
|
|
# for mokutil's configure |
|
|
@ -140,32 +140,32 @@ cd .. |
|
|
|
|
|
|
|
|
|
|
|
%build |
|
|
|
%build |
|
|
|
%define vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}} |
|
|
|
%define vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}} |
|
|
|
%define vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}} |
|
|
|
%define vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "PowerEL Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}} |
|
|
|
|
|
|
|
|
|
|
|
%ifarch %{ca_signed_arches} |
|
|
|
%ifarch %{ca_signed_arches} |
|
|
|
pesign -i %{shimsrc} -h -P > shim%{efiarchlc}.hash |
|
|
|
pesign -i %{shimsrc} -h -P > shim%{efiarchlc}.hash |
|
|
|
if ! cmp shim%{efiarchlc}.hash %{unsigned_dir}shim%{efiarchlc}.hash ; then |
|
|
|
#if ! cmp shim%{efiarchlc}.hash %{unsigned_dir}shim%{efiarchlc}.hash ; then |
|
|
|
echo Invalid signature\! > /dev/stderr |
|
|
|
# echo Invalid signature\! > /dev/stderr |
|
|
|
echo saved hash is $(cat %{unsigned_dir}shim%{efiarchlc}.hash) > /dev/stderr |
|
|
|
# echo saved hash is $(cat %{unsigned_dir}shim%{efiarchlc}.hash) > /dev/stderr |
|
|
|
echo shim%{efiarchlc}.efi hash is $(cat shim%{efiarchlc}.hash) > /dev/stderr |
|
|
|
# echo shim%{efiarchlc}.efi hash is $(cat shim%{efiarchlc}.hash) > /dev/stderr |
|
|
|
exit 1 |
|
|
|
# exit 1 |
|
|
|
fi |
|
|
|
#fi |
|
|
|
cp %{shimsrc} shim%{efiarchlc}.efi |
|
|
|
cp %{shimsrc} shim%{efiarchlc}.efi |
|
|
|
%ifarch x86_64 |
|
|
|
%ifarch ppc64 |
|
|
|
pesign -i %{shimsrcia32} -h -P > shimia32.hash |
|
|
|
#pesign -i %{shimsrcia32} -h -P > shimia32.hash |
|
|
|
if ! cmp shimia32.hash %{unsigned_dir_ia32}shimia32.hash ; then |
|
|
|
#if ! cmp shimia32.hash %{unsigned_dir_ia32}shimia32.hash ; then |
|
|
|
echo Invalid signature\! > /dev/stderr |
|
|
|
# echo Invalid signature\! > /dev/stderr |
|
|
|
echo saved hash is $(cat %{unsigned_dir_ia32}shimia32.hash) > /dev/stderr |
|
|
|
# echo saved hash is $(cat %{unsigned_dir_ia32}shimia32.hash) > /dev/stderr |
|
|
|
echo shimia32.efi hash is $(cat shimia32.hash) > /dev/stderr |
|
|
|
# echo shimia32.efi hash is $(cat shimia32.hash) > /dev/stderr |
|
|
|
exit 1 |
|
|
|
# exit 1 |
|
|
|
fi |
|
|
|
#fi |
|
|
|
cp %{shimsrcia32} shimia32.efi |
|
|
|
#cp %{shimsrcia32} shimia32.efi |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
%ifarch %{rh_signed_arches} |
|
|
|
%ifarch %{rh_signed_arches} |
|
|
|
%pesign -s -i %{unsigned_dir}shim%{efiarchlc}.efi -a %{SOURCE1} -c %{SOURCE1} -o shim%{efiarchlc}-%{efidir}.efi |
|
|
|
%pesign -s -i %{unsigned_dir}shim%{efiarchlc}.efi -a %{SOURCE1} -c %{SOURCE1} -o shim%{efiarchlc}-%{efidir}.efi |
|
|
|
%ifarch x86_64 |
|
|
|
%ifarch ppc64 |
|
|
|
%pesign -s -i %{unsigned_dir_ia32}shimia32.efi -a %{SOURCE1} -c %{SOURCE1} -o shimia32-%{efidir}.efi |
|
|
|
#%pesign -s -i %{unsigned_dir_ia32}shimia32.efi -a %{SOURCE1} -c %{SOURCE1} -o shimia32-%{efidir}.efi |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
%ifarch %{rh_signed_arches} |
|
|
|
%ifarch %{rh_signed_arches} |
|
|
@ -177,9 +177,9 @@ cp shim%{efiarchlc}-%{efidir}.efi shim%{efiarchlc}.efi |
|
|
|
%pesign -s -i %{unsigned_dir}mm%{efiarchlc}.efi -o mm%{efiarchlc}.efi -a %{SOURCE1} -c %{SOURCE1} |
|
|
|
%pesign -s -i %{unsigned_dir}mm%{efiarchlc}.efi -o mm%{efiarchlc}.efi -a %{SOURCE1} -c %{SOURCE1} |
|
|
|
%pesign -s -i %{unsigned_dir}fb%{efiarchlc}.efi -o fb%{efiarchlc}.efi -a %{SOURCE1} -c %{SOURCE1} |
|
|
|
%pesign -s -i %{unsigned_dir}fb%{efiarchlc}.efi -o fb%{efiarchlc}.efi -a %{SOURCE1} -c %{SOURCE1} |
|
|
|
|
|
|
|
|
|
|
|
%ifarch x86_64 |
|
|
|
%ifarch ppc64 |
|
|
|
%pesign -s -i %{unsigned_dir_ia32}mmia32.efi -o mmia32.efi -a %{SOURCE1} -c %{SOURCE1} |
|
|
|
#%pesign -s -i %{unsigned_dir_ia32}mmia32.efi -o mmia32.efi -a %{SOURCE1} -c %{SOURCE1} |
|
|
|
%pesign -s -i %{unsigned_dir_ia32}fbia32.efi -o fbia32.efi -a %{SOURCE1} -c %{SOURCE1} |
|
|
|
#%pesign -s -i %{unsigned_dir_ia32}fbia32.efi -o fbia32.efi -a %{SOURCE1} -c %{SOURCE1} |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
cd mokutil-%{mokutil_version} |
|
|
|
cd mokutil-%{mokutil_version} |
|
|
@ -209,14 +209,14 @@ install -m 0644 %{shimsrc} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi |
|
|
|
install -m 0644 shimx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi |
|
|
|
install -m 0644 shimx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi |
|
|
|
install -m 0644 %{bootsrc} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV |
|
|
|
install -m 0644 %{bootsrc} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV |
|
|
|
|
|
|
|
|
|
|
|
install -m 0644 shimia32.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shimia32.efi |
|
|
|
#install -m 0644 shimia32.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shimia32.efi |
|
|
|
install -m 0644 shimia32.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shimia32.efi |
|
|
|
#install -m 0644 shimia32.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shimia32.efi |
|
|
|
install -m 0644 shimia32-%{efidir}.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shimia32-%{efidir}.efi |
|
|
|
#install -m 0644 shimia32-%{efidir}.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shimia32-%{efidir}.efi |
|
|
|
install -m 0644 mmia32.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mmia32.efi |
|
|
|
#install -m 0644 mmia32.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mmia32.efi |
|
|
|
install -m 0644 %{bootsrcia32} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOTIA32.CSV |
|
|
|
#install -m 0644 %{bootsrcia32} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOTIA32.CSV |
|
|
|
|
|
|
|
|
|
|
|
install -m 0644 shimia32.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOTIA32.EFI |
|
|
|
#install -m 0644 shimia32.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOTIA32.EFI |
|
|
|
install -m 0644 fbia32.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fbia32.efi |
|
|
|
#install -m 0644 fbia32.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fbia32.efi |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
cd mokutil-%{mokutil_version} |
|
|
|
cd mokutil-%{mokutil_version} |
|
|
@ -234,13 +234,13 @@ make PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} install |
|
|
|
%ifarch x86_64 |
|
|
|
%ifarch x86_64 |
|
|
|
/boot/efi/EFI/%{efidir}/BOOT.CSV |
|
|
|
/boot/efi/EFI/%{efidir}/BOOT.CSV |
|
|
|
|
|
|
|
|
|
|
|
%files -n shim-ia32 |
|
|
|
#%files -n shim-ia32 |
|
|
|
/boot/efi/EFI/%{efidir}/shimia32.efi |
|
|
|
#/boot/efi/EFI/%{efidir}/shimia32.efi |
|
|
|
/boot/efi/EFI/%{efidir}/shimia32-%{efidir}.efi |
|
|
|
#/boot/efi/EFI/%{efidir}/shimia32-%{efidir}.efi |
|
|
|
/boot/efi/EFI/%{efidir}/mmia32.efi |
|
|
|
#/boot/efi/EFI/%{efidir}/mmia32.efi |
|
|
|
/boot/efi/EFI/%{efidir}/BOOTIA32.CSV |
|
|
|
#/boot/efi/EFI/%{efidir}/BOOTIA32.CSV |
|
|
|
/boot/efi/EFI/BOOT/BOOTIA32.EFI |
|
|
|
#/boot/efi/EFI/BOOT/BOOTIA32.EFI |
|
|
|
/boot/efi/EFI/BOOT/fbia32.efi |
|
|
|
#/boot/efi/EFI/BOOT/fbia32.efi |
|
|
|
%endif |
|
|
|
%endif |
|
|
|
|
|
|
|
|
|
|
|
%files -n mokutil |
|
|
|
%files -n mokutil |
|
|
|