debian/patches/sbsigntool-no-pesign: refreshed.

diff --git a/debian/changelog b/debian/changelog
index e697abf179ca2b1c75c35816f2092990e05b082e..e54306d1574f4b1ee41e51b4f8470a24726d12d5 100644 (file)
--- 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 9629cb12d1624137a14c2cb940a5c978f1ca5890..1220cabd85fa8c17f2304362b8782e0ab4e841dc 100644 (file)
--- 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