summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2017-08-07 17:42:12 -0400
committerMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2017-08-07 17:42:12 -0400
commitea54c7675ffc8f9d435206db8798a3428c15734f (patch)
tree8219cdfe23490cb542a31bada701bb8055808b0c
parent94190a1cd8faa7217ac9c83f0b3e6bcad302ca53 (diff)
downloadefi-boot-shim-ea54c7675ffc8f9d435206db8798a3428c15734f.tar.gz
efi-boot-shim-ea54c7675ffc8f9d435206db8798a3428c15734f.zip
debian/patches/sbsigntool-no-pesign: refreshed.
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/sbsigntool-not-pesign6
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index e697abf1..e54306d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ shim (12+1501864225.b586175-0) UNRELEASED; urgency=medium
MAKELEVEL.
- Set DEFAULT_LOADER; this makes second-stage-path unnecessary.
* debian/patches/second-stage-path: dropped.
-
+ * debian/patches/sbsigntool-no-pesign: refreshed.
-- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Fri, 04 Aug 2017 12:33:22 -0400
diff --git a/debian/patches/sbsigntool-not-pesign b/debian/patches/sbsigntool-not-pesign
index 9629cb12..1220cabd 100644
--- a/debian/patches/sbsigntool-not-pesign
+++ b/debian/patches/sbsigntool-not-pesign
@@ -13,14 +13,14 @@ Index: b/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
-@@ -158,8 +158,8 @@ endif
+@@ -206,8 +206,8 @@ endif
-j .note.gnu.build-id \
$(FORMAT) $^ $@.debug
-%.efi.signed: %.efi certdb/secmod.db
-- pesign -n certdb -i $< -c "shim" -s -o $@ -f
+- $(PESIGN) -n certdb -i $< -c "shim" -s -o $@ -f
+%.efi.signed: %.efi shim.crt
+ sbsign --key shim.key --cert shim.crt $<
clean:
- $(MAKE) -C Cryptlib clean
+ $(MAKE) -C Cryptlib -f $(TOPDIR)/Cryptlib/Makefile clean