[shim-signed/f22] Don't dual-sign shim-%{efidir}.efi either.
Peter Jones
pjones at fedoraproject.org
Tue Feb 17 18:31:41 UTC 2015
commit a094d63d8a6a63ec9b61d3047e1db2d76ad1d707
Author: Peter Jones <pjones at redhat.com>
Date: Tue Feb 17 13:31:14 2015 -0500
Don't dual-sign shim-%{efidir}.efi either.
Resolves: rhbz#1184765
Signed-off-by: Peter Jones <pjones at redhat.com>
shim-signed.spec | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/shim-signed.spec b/shim-signed.spec
index 08e7f63..60d8116 100644
--- a/shim-signed.spec
+++ b/shim-signed.spec
@@ -5,9 +5,9 @@ Summary: First-stage UEFI bootloader
Requires: dbxtool >= 0.6-3
Provides: shim = %{version}-%{release}
%ifarch aarch64
-%define unsignedver 0.8-2%{?dist}
+%define unsignedver 0.8-2.fc22
%else
-%define unsignedver 0.8-1%{?dist}
+%define unsignedver 0.8-1.fc22
%endif
License: BSD
@@ -85,10 +85,10 @@ if ! cmp shim.hash %{_datadir}/shim/shim.hash ; then
fi
%endif
cp %{shimsrc} shim.efi
+cp %{_datadir}/shim/shim.efi shim-unsigned.efi
+
%ifarch %{rh_signed_arches}
-%pesign -s -i shim.efi -o shim-%{efidir}.efi
-%endif
-%ifarch %{rh_signed_arches}
+%pesign -s -i shim-unsigned.efi -o shim-%{efidir}.efi
%ifnarch %{ca_signed_arches}
cp shim-%{efidir}.efi shim.efi
%endif
@@ -98,7 +98,7 @@ cp %{_datadir}/shim/MokManager.efi MokManager-unsigned.efi
cp %{_datadir}/shim/fallback.efi fallback-unsigned.efi
%pesign -s -i MokManager-unsigned.efi -o MokManager.efi
%pesign -s -i fallback-unsigned.efi -o fallback.efi
-rm -vf MokManager-unsigned.efi fallback-unsigned.efi
+rm -vf MokManager-unsigned.efi fallback-unsigned.efi shim-unsigned.efi
%install
rm -rf $RPM_BUILD_ROOT
@@ -123,6 +123,10 @@ install -m 0644 fallback.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fallback.efi
%changelog
* Tue Feb 17 2015 Peter Jones <pjones at redhat.com> - 0.8-8
+- Don't dual-sign shim-%{efidir}.efi either.
+ Resolves: rhbz#1184765
+
+* Tue Feb 17 2015 Peter Jones <pjones at redhat.com> - 0.8-8
- Require dbxtool
* Wed Dec 17 2014 Peter Jones <pjones at redhat.com> - 0.8-7
More information about the scm-commits
mailing list