summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/fix_makefile_phony.patch22
-rw-r--r--debian/patches/series1
3 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 4afcdf19..6cd52d7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ shim (12+1503074702.5202f80-0ubuntu1) UNRELEASED; urgency=medium
* debian/patches/sbsigntool-no-pesign: dropped; no longer needed..
* debian/patches/0001-shim-fix-the-mirroring-MokSBState-fail.patch: dropped,
included upstream.
+ * debian/patches/fix_makefile_phony.patch: fix a makefile bug causing shim
+ to fail to build, because it gets confused about the .signed efi files.
-- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Tue, 29 Aug 2017 13:55:45 -0400
diff --git a/debian/patches/fix_makefile_phony.patch b/debian/patches/fix_makefile_phony.patch
new file mode 100644
index 00000000..8a8d4749
--- /dev/null
+++ b/debian/patches/fix_makefile_phony.patch
@@ -0,0 +1,22 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: Fix Makefile to successfully build for shim with cert and sbsign
+
+sbsign needs shim.key and shim.crt, but the only target that exists in
+makefile is shim.crt. shim.key is a side-effect building shim.crt.
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -362,6 +362,6 @@ archive: tag
+ @rm -rf /tmp/shim-$(VERSION)
+ @echo "The archive is in shim-$(VERSION).tar.bz2"
+
+-.PHONY : install-deps
++.PHONY : install-deps shim.key
+
+ export ARCH CC LD OBJCOPY EFI_INCLUDE
diff --git a/debian/patches/series b/debian/patches/series
index e69de29b..268dc0e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_makefile_phony.patch