diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2017-09-13 12:11:21 -0700 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2017-09-13 12:11:21 -0700 |
| commit | 544696f3ade15d70a5d8389c481e964a164cd3de (patch) | |
| tree | 9b542fa7093fb28bc8bdcc10b6f69b133e12d064 | |
| parent | 8de1d1dc3a96fec12e97eff6ca5b728e606764b1 (diff) | |
| download | efi-boot-shim-544696f3ade15d70a5d8389c481e964a164cd3de.tar.gz efi-boot-shim-544696f3ade15d70a5d8389c481e964a164cd3de.zip | |
Drop PHONY fix patch; merged upstream.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/fix_makefile_phony.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 0 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog index e7cfd4f1..bef19f35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,6 @@ shim (12+1503074702.5202f80-0ubuntu1~test4) 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. * debian/rules: clean up after *.signed files. * debian/shim.install: update paths in light of using shim's upstream install target. diff --git a/debian/patches/fix_makefile_phony.patch b/debian/patches/fix_makefile_phony.patch deleted file mode 100644 index 8a8d4749..00000000 --- a/debian/patches/fix_makefile_phony.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 0f0fda43..db9eed12 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -fix_makefile_phony.patch buildid_write_return.patch |