From 62a4fa2d312ab6964812e5641a74aa6d4cfeec2c Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 7 Aug 2017 17:39:07 -0400 Subject: * debian/rules: - Update dh_auto_build/dh_auto_clean for new upstream options: set MAKELEVEL. --- debian/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f368a197..db3ca61f 100755 --- a/debian/rules +++ b/debian/rules @@ -13,8 +13,13 @@ endif %: dh $@ --parallel +override_dh_auto_clean: + dh_auto_clean -- MAKELEVEL=0 override_dh_auto_build: - dh_auto_build -- EFI_PATH=/usr/lib VENDOR_CERT_FILE=$(cert) + dh_auto_build -- \ + MAKELEVEL=0 \ + EFI_PATH=/usr/lib \ + VENDOR_CERT_FILE=$(cert) override_dh_fixperms: dh_fixperms -- cgit v1.2.3 From 94190a1cd8faa7217ac9c83f0b3e6bcad302ca53 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 7 Aug 2017 17:39:45 -0400 Subject: Set DEFAULT_LOADER; this makes second-stage-path unnecessary. --- debian/changelog | 3 +++ debian/patches/second-stage-path | 24 ------------------------ debian/patches/series | 1 - debian/rules | 1 + 4 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 debian/patches/second-stage-path (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index d59d15cb..e697abf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ shim (12+1501864225.b586175-0) UNRELEASED; urgency=medium * debian/rules: - Update dh_auto_build/dh_auto_clean for new upstream options: set MAKELEVEL. + - Set DEFAULT_LOADER; this makes second-stage-path unnecessary. + * debian/patches/second-stage-path: dropped. + -- Mathieu Trudel-Lapierre Fri, 04 Aug 2017 12:33:22 -0400 diff --git a/debian/patches/second-stage-path b/debian/patches/second-stage-path deleted file mode 100644 index da53af8e..00000000 --- a/debian/patches/second-stage-path +++ /dev/null @@ -1,24 +0,0 @@ -Description: Chainload grubx64.efi, not grub.efi - We qualify the second stage bootloader image with the architecture name, - so we're forwards-compatible with any future 32-bit implementations. - (Non-SB grub doesn't conflict, since the image will be named bootia32.efi - anyway, not grub.efi.) -Author: Steve Langasek - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -25,7 +25,7 @@ EFI_LIBS = -lefi -lgnuefi --start-group - EFI_CRT_OBJS = $(EFI_PATH)/crt0-efi-$(ARCH).o - EFI_LDS = elf_$(ARCH)_efi.lds - --DEFAULT_LOADER := \\\\grub.efi -+DEFAULT_LOADER := \\\\grubx64.efi - CFLAGS = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \ - -fshort-wchar -Wall -Wsign-compare -Werror -fno-builtin \ - -Werror=sign-compare -ffreestanding -std=gnu89 \ diff --git a/debian/patches/series b/debian/patches/series index 34c3f92b..20fe73c2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -second-stage-path sbsigntool-not-pesign 0001-shim-fix-the-mirroring-MokSBState-fail.patch diff --git a/debian/rules b/debian/rules index db3ca61f..e51de0b7 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,7 @@ override_dh_auto_build: dh_auto_build -- \ MAKELEVEL=0 \ EFI_PATH=/usr/lib \ + DEFAULT_LOADER=\\\grubx64.efi \ VENDOR_CERT_FILE=$(cert) override_dh_fixperms: -- cgit v1.2.3 From 5d42729fe393fc11b20730b86aac7f4f861ca68e Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 7 Aug 2017 17:42:42 -0400 Subject: Define an EFI_ARCH variable, and use that for paths to shim. This makes it possible to build a shim for other architectures than amd64. --- debian/changelog | 2 ++ debian/rules | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index e54306d1..147cdbc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ shim (12+1501864225.b586175-0) UNRELEASED; urgency=medium - Update dh_auto_build/dh_auto_clean for new upstream options: set MAKELEVEL. - Set DEFAULT_LOADER; this makes second-stage-path unnecessary. + - Define an EFI_ARCH variable, and use that for paths to shim. This + makes it possible to build a shim for other architectures than amd64. * debian/patches/second-stage-path: dropped. * debian/patches/sbsigntool-no-pesign: refreshed. diff --git a/debian/rules b/debian/rules index e51de0b7..7edcae3b 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,10 @@ else cert=debian/debian-uefi-ca.der endif +ifeq ($(DEB_HOST_ARCH),amd64) +export EFI_ARCH := x64 +endif + %: dh $@ --parallel @@ -19,9 +23,9 @@ override_dh_auto_build: dh_auto_build -- \ MAKELEVEL=0 \ EFI_PATH=/usr/lib \ - DEFAULT_LOADER=\\\grubx64.efi \ + DEFAULT_LOADER=\\\grub$(EFI_ARCH).efi \ VENDOR_CERT_FILE=$(cert) override_dh_fixperms: dh_fixperms - chmod a-x debian/shim/usr/lib/shim/shimx64.efi + chmod a-x debian/shim/usr/lib/shim/shim$(EFI_ARCH).efi -- cgit v1.2.3 From 33da8726b4035061190266e3e0c25d87f95d646a Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 7 Aug 2017 17:43:53 -0400 Subject: Fix typo for DEFAULT_LOADER: missing a backslash, also needs quoting. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 7edcae3b..f35661c1 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ override_dh_auto_build: dh_auto_build -- \ MAKELEVEL=0 \ EFI_PATH=/usr/lib \ - DEFAULT_LOADER=\\\grub$(EFI_ARCH).efi \ + DEFAULT_LOADER='\\\\grub$(EFI_ARCH).efi' \ VENDOR_CERT_FILE=$(cert) override_dh_fixperms: -- cgit v1.2.3 From cff1facf80f327dbd43654221ea5704e24a0dc1d Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 29 Aug 2017 13:57:22 -0400 Subject: debian/patches/second-stage-path: dropped; the default loader path now includes an arch suffix. --- debian/changelog | 4 ++-- debian/rules | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index b9528e99..56ba2c4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,10 +5,10 @@ shim (12+1503074702.5202f80-0ubuntu1) UNRELEASED; urgency=medium * debian/rules: - Update dh_auto_build/dh_auto_clean for new upstream options: set MAKELEVEL. - - Set DEFAULT_LOADER; this makes second-stage-path unnecessary. - Define an EFI_ARCH variable, and use that for paths to shim. This makes it possible to build a shim for other architectures than amd64. - * debian/patches/second-stage-path: dropped. + * debian/patches/second-stage-path: dropped; the default loader path now + includes an arch suffix. * debian/patches/sbsigntool-no-pesign: refreshed. * debian/patches/0001-shim-fix-the-mirroring-MokSBState-fail.patch: dropped, included upstream. diff --git a/debian/rules b/debian/rules index f35661c1..b03e2ee2 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,6 @@ override_dh_auto_build: dh_auto_build -- \ MAKELEVEL=0 \ EFI_PATH=/usr/lib \ - DEFAULT_LOADER='\\\\grub$(EFI_ARCH).efi' \ VENDOR_CERT_FILE=$(cert) override_dh_fixperms: -- cgit v1.2.3 From 661d3ea1dc23ebe589593dd9cc772a1d436c417b Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 29 Aug 2017 13:57:47 -0400 Subject: Set ENABLE_SHIM_CERT, to keep using ephemeral self-signed certs built at compile-time for MokManager and fallback. --- debian/changelog | 2 ++ debian/rules | 1 + 2 files changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 56ba2c4d..79d7966e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ shim (12+1503074702.5202f80-0ubuntu1) UNRELEASED; urgency=medium MAKELEVEL. - Define an EFI_ARCH variable, and use that for paths to shim. This makes it possible to build a shim for other architectures than amd64. + - Set ENABLE_SHIM_CERT, to keep using ephemeral self-signed certs built + at compile-time for MokManager and fallback. * debian/patches/second-stage-path: dropped; the default loader path now includes an arch suffix. * debian/patches/sbsigntool-no-pesign: refreshed. diff --git a/debian/rules b/debian/rules index b03e2ee2..b5f21367 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,7 @@ override_dh_auto_build: dh_auto_build -- \ MAKELEVEL=0 \ EFI_PATH=/usr/lib \ + ENABLE_SHIM_CERT=1 \ VENDOR_CERT_FILE=$(cert) override_dh_fixperms: -- cgit v1.2.3 From 402fafb47564efc2281966aa39f9d2d25d73aec4 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 29 Aug 2017 13:58:39 -0400 Subject: Set ENABLE_SBSIGN, to use sbsign instead of pesign for signing fallback and MokManager. Also drop debian/patches/sbsigntool-no-pesign: with this change from upstream it is no longer needed.. --- debian/changelog | 4 +++- debian/patches/sbsigntool-not-pesign | 26 -------------------------- debian/patches/series | 1 - debian/rules | 1 + 4 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 debian/patches/sbsigntool-not-pesign (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 79d7966e..4afcdf19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,9 +9,11 @@ shim (12+1503074702.5202f80-0ubuntu1) UNRELEASED; urgency=medium makes it possible to build a shim for other architectures than amd64. - Set ENABLE_SHIM_CERT, to keep using ephemeral self-signed certs built at compile-time for MokManager and fallback. + - Set ENABLE_SBSIGN, to use sbsign instead of pesign for signing fallback + and MokManager. * debian/patches/second-stage-path: dropped; the default loader path now includes an arch suffix. - * debian/patches/sbsigntool-no-pesign: refreshed. + * debian/patches/sbsigntool-no-pesign: dropped; no longer needed.. * debian/patches/0001-shim-fix-the-mirroring-MokSBState-fail.patch: dropped, included upstream. diff --git a/debian/patches/sbsigntool-not-pesign b/debian/patches/sbsigntool-not-pesign deleted file mode 100644 index 1220cabd..00000000 --- a/debian/patches/sbsigntool-not-pesign +++ /dev/null @@ -1,26 +0,0 @@ -Description: Sign MokManager with sbsigntool instead of pesign - Ubuntu infrastructure uses sbsigntool for all other EFI signing, so we use - the same thing for signing MokManager with our ephemeral key. This also - avoids an additional build dependency on libnss3-tools. -Author: Steve Langasek -Forwarded: not-needed - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -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 -+%.efi.signed: %.efi shim.crt -+ sbsign --key shim.key --cert shim.crt $< - - clean: - $(MAKE) -C Cryptlib -f $(TOPDIR)/Cryptlib/Makefile clean diff --git a/debian/patches/series b/debian/patches/series index b8e0e105..e69de29b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -sbsigntool-not-pesign diff --git a/debian/rules b/debian/rules index b5f21367..3dc47aee 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,7 @@ override_dh_auto_build: MAKELEVEL=0 \ EFI_PATH=/usr/lib \ ENABLE_SHIM_CERT=1 \ + ENABLE_SBSIGN=1 \ VENDOR_CERT_FILE=$(cert) override_dh_fixperms: -- cgit v1.2.3 From ee22d4255df975c59181e9258c1919cff227d68b Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 29 Aug 2017 21:33:03 -0400 Subject: debian/rules: clean up after *.signed files. --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 6cd52d7f..bbfa72b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ shim (12+1503074702.5202f80-0ubuntu1) UNRELEASED; urgency=medium 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. -- Mathieu Trudel-Lapierre Tue, 29 Aug 2017 13:55:45 -0400 diff --git a/debian/rules b/debian/rules index 3dc47aee..0403988b 100755 --- a/debian/rules +++ b/debian/rules @@ -19,6 +19,8 @@ endif override_dh_auto_clean: dh_auto_clean -- MAKELEVEL=0 + rm -f *.signed + override_dh_auto_build: dh_auto_build -- \ MAKELEVEL=0 \ -- cgit v1.2.3 From f841331ca35ec67599457bb1cd102a0f6a195025 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 29 Aug 2017 22:21:11 -0400 Subject: Update dh_auto_build/dh_auto_clean/dh_auto_install for new upstream options: set MAKELEVEL. --- debian/changelog | 4 ++-- debian/rules | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index bbfa72b7..55f902e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,8 @@ shim (12+1503074702.5202f80-0ubuntu1) UNRELEASED; urgency=medium * New upstream snapshot: 12+1503074702.5202f80. * debian/control: add a Build-Depends on libnss3-tools for pk12-util. * debian/rules: - - Update dh_auto_build/dh_auto_clean for new upstream options: set - MAKELEVEL. + - Update dh_auto_build/dh_auto_clean/dh_auto_install for new upstream + options: set MAKELEVEL. - Define an EFI_ARCH variable, and use that for paths to shim. This makes it possible to build a shim for other architectures than amd64. - Set ENABLE_SHIM_CERT, to keep using ephemeral self-signed certs built diff --git a/debian/rules b/debian/rules index 0403988b..179d09a8 100755 --- a/debian/rules +++ b/debian/rules @@ -29,6 +29,9 @@ override_dh_auto_build: ENABLE_SBSIGN=1 \ VENDOR_CERT_FILE=$(cert) +override_dh_auto_install: + dh_auto_install -- MAKELEVEL=0 + override_dh_fixperms: dh_fixperms chmod a-x debian/shim/usr/lib/shim/shim$(EFI_ARCH).efi -- cgit v1.2.3 From 3f5806e428da5992390aca796d8cbaa72879337d Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 29 Aug 2017 22:38:38 -0400 Subject: Set EFIDIR=ubuntu for dh_auto_install; that will let files be installed in the "right" final directories, and makes boot.csv for us. --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 55f902e3..0c33fcb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ shim (12+1503074702.5202f80-0ubuntu1) UNRELEASED; urgency=medium options: set MAKELEVEL. - Define an EFI_ARCH variable, and use that for paths to shim. This makes it possible to build a shim for other architectures than amd64. + - Set EFIDIR=ubuntu for dh_auto_install; that will let files be installed + in the "right" final directories, and makes boot.csv for us. - Set ENABLE_SHIM_CERT, to keep using ephemeral self-signed certs built at compile-time for MokManager and fallback. - Set ENABLE_SBSIGN, to use sbsign instead of pesign for signing fallback diff --git a/debian/rules b/debian/rules index 179d09a8..d863ab7d 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,7 @@ override_dh_auto_build: VENDOR_CERT_FILE=$(cert) override_dh_auto_install: - dh_auto_install -- MAKELEVEL=0 + dh_auto_install -- MAKELEVEL=0 EFIDIR=ubuntu override_dh_fixperms: dh_fixperms -- cgit v1.2.3 From c3fa7299807746320f6b6bbe7779a77152856c08 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 31 Aug 2017 19:10:10 -0400 Subject: debian/rules, debian/shim.install: make sure the 'make install' step does what it's meant to do by upstream: we can easily make use of the end result to have the files we need. --- debian/changelog | 3 +++ debian/rules | 20 +++++++++++++------- debian/shim.install | 7 ++++--- 3 files changed, 20 insertions(+), 10 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 806465b0..086a2d20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ shim (12+1503074702.5202f80-0ubuntu1~test3) artful; urgency=medium target. * debian/patches/buildid_write_return.patch: workaround our strict compile rules failing the build: make sure write calls check the return value. + * debian/rules, debian/shim.install: make sure the 'make install' step does + what it's meant to do by upstream: we can easily make use of the end result + to have the files we need. -- Mathieu Trudel-Lapierre Tue, 29 Aug 2017 22:45:30 -0400 diff --git a/debian/rules b/debian/rules index d863ab7d..cf799825 100755 --- a/debian/rules +++ b/debian/rules @@ -6,14 +6,25 @@ # should be building the other binaries also. ifeq ($(shell dpkg-vendor --is ubuntu && echo yes),yes) cert=debian/canonical-uefi-ca.der + distributor=ubuntu else cert=debian/debian-uefi-ca.der + distributor=debian endif ifeq ($(DEB_HOST_ARCH),amd64) export EFI_ARCH := x64 endif +COMMON_OPTIONS = \ + MAKELEVEL=0 \ + EFI_PATH=/usr/lib \ + ENABLE_SHIM_CERT=1 \ + ENABLE_SBSIGN=1 \ + VENDOR_CERT_FILE=$(cert) \ + EFIDIR=$(distributor) \ + $(NULL) + %: dh $@ --parallel @@ -22,15 +33,10 @@ override_dh_auto_clean: rm -f *.signed override_dh_auto_build: - dh_auto_build -- \ - MAKELEVEL=0 \ - EFI_PATH=/usr/lib \ - ENABLE_SHIM_CERT=1 \ - ENABLE_SBSIGN=1 \ - VENDOR_CERT_FILE=$(cert) + dh_auto_build -- $(COMMON_OPTIONS) override_dh_auto_install: - dh_auto_install -- MAKELEVEL=0 EFIDIR=ubuntu + dh_auto_install --destdir=debian/tmp -- $(COMMON_OPTIONS) override_dh_fixperms: dh_fixperms diff --git a/debian/shim.install b/debian/shim.install index 0f5a04b4..268df256 100644 --- a/debian/shim.install +++ b/debian/shim.install @@ -1,3 +1,4 @@ -/boot/efi/EFI/ubuntu/shim*.efi /usr/lib/shim -/boot/efi/EFI/ubuntu/mm*.efi.signed /usr/lib/shim -/boot/efi/EFI/ubuntu/fb*.efi.signed /usr/lib/shim +/boot/efi/EFI/*/shim*.efi /usr/lib/shim +/boot/efi/EFI/*/mm*.efi /usr/lib/shim +/boot/efi/EFI/*/fb*.efi /usr/lib/shim +/boot/efi/EFI/*/BOOT*.CSV /usr/lib/shim -- cgit v1.2.3 From 52b46c08f66fb2c5525b7b6efe6c89e0455bdb34 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 27 Sep 2017 12:46:14 -0400 Subject: Ignore unused-variable errors. --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index e9fd3ba5..d439d761 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ shim (13~git1505328971.0780644a-0ubuntu1~test1) UNRELEASED; urgency=medium at compile-time for MokManager and fallback. - Set ENABLE_SBSIGN, to use sbsign instead of pesign for signing fallback and MokManager. + - Ignore unused-variable errors. * debian/patches/second-stage-path: dropped; the default loader path now includes an arch suffix. * debian/patches/sbsigntool-no-pesign: dropped; no longer needed.. diff --git a/debian/rules b/debian/rules index cf799825..3ea5da40 100755 --- a/debian/rules +++ b/debian/rules @@ -25,6 +25,8 @@ COMMON_OPTIONS = \ EFIDIR=$(distributor) \ $(NULL) +CPPFLAGS += -Wno-error=unused-variable + %: dh $@ --parallel -- cgit v1.2.3 From 04acbb3ee336d40822a47045308045872abd7cb8 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 29 Sep 2017 11:24:56 -0400 Subject: Don't need to set -Wno-error=unused-variable anymore Signed-off-by: Mathieu Trudel-Lapierre --- debian/changelog | 1 - debian/rules | 2 -- 2 files changed, 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 6ad19edf..a849dca5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,6 @@ shim (13-0ubuntu1) UNRELEASED; urgency=medium at compile-time for MokManager and fallback. - Set ENABLE_SBSIGN, to use sbsign instead of pesign for signing fallback and MokManager. - - Ignore unused-variable errors. * debian/patches/second-stage-path: dropped; the default loader path now includes an arch suffix. * debian/patches/sbsigntool-no-pesign: dropped; no longer needed.. diff --git a/debian/rules b/debian/rules index 3ea5da40..cf799825 100755 --- a/debian/rules +++ b/debian/rules @@ -25,8 +25,6 @@ COMMON_OPTIONS = \ EFIDIR=$(distributor) \ $(NULL) -CPPFLAGS += -Wno-error=unused-variable - %: dh $@ --parallel -- cgit v1.2.3 From dbbe142c747516748dc05be595e3a06f791cc2c1 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 29 Sep 2017 11:29:25 -0400 Subject: Don't need to clean after .signed files, upstream Makefile does it now. Signed-off-by: Mathieu Trudel-Lapierre --- debian/changelog | 1 - debian/rules | 1 - 2 files changed, 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 7048958f..3175b19c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,6 @@ shim (13-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/rules: clean up after *.signed files. * debian/shim.install: update paths in light of using shim's upstream install target. * debian/rules, debian/shim.install: make sure the 'make install' step does diff --git a/debian/rules b/debian/rules index cf799825..8c3863ef 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,6 @@ COMMON_OPTIONS = \ override_dh_auto_clean: dh_auto_clean -- MAKELEVEL=0 - rm -f *.signed override_dh_auto_build: dh_auto_build -- $(COMMON_OPTIONS) -- cgit v1.2.3 From 3802e1ad5adf91f955b9f1408950e28bad10d830 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Tue, 24 Apr 2018 12:40:56 -0600 Subject: Enable arm64 build. --- debian/changelog | 4 ++++ debian/control | 2 +- debian/rules | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 81f39670..57cbf847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ shim (13-0ubuntu3) UNRELEASED; urgency=medium + [ Steve Langasek ] * Fix Vcs link. + [ dann frazier ] + * Enable arm64 build. + -- Steve Langasek Mon, 23 Apr 2018 18:08:31 -0700 shim (13-0ubuntu2) bionic; urgency=medium diff --git a/debian/control b/debian/control index 12df554b..c8b8ffa0 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9), gnu-efi (>= 3.0u), sbsigntool, openssl, libelf- Vcs-Git: https://git.launchpad.net/~ubuntu-core-dev/shim/+git/shim Package: shim -Architecture: amd64 +Architecture: amd64 arm64 Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: shim-signed (<< 1.33~) Description: boot loader to chain-load signed boot loaders under Secure Boot diff --git a/debian/rules b/debian/rules index 8c3863ef..6c2cef1e 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,8 @@ endif ifeq ($(DEB_HOST_ARCH),amd64) export EFI_ARCH := x64 +else ($(DEB_HOST_ARCH),arm64) +export EFI_ARCH := aa64 endif COMMON_OPTIONS = \ -- cgit v1.2.3 From f42b58fc50c5906a61f2f949f526d56f4cfc48d9 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 24 Jul 2018 16:39:07 -0400 Subject: * debian/rules: - define RELEASE and COMMIT_ID for the snapshot. - Set ENABLE_HTTPBOOT to enable the HTTP Boot feature. --- debian/changelog | 3 +++ debian/rules | 3 +++ 2 files changed, 6 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 5ea26c7d..5630d819 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ shim (15+1531942534.dd3230d-0ubuntu1) UNRELEASED; urgency=medium [ Mathieu Trudel-Lapierre ] * New upstream snapshot. * debian/patches/abort_abort_abort.patch: dropped patch, included upstream. + * debian/rules: + - define RELEASE and COMMIT_ID for the snapshot. + - Set ENABLE_HTTPBOOT to enable the HTTP Boot feature. -- Mathieu Trudel-Lapierre Tue, 24 Jul 2018 16:24:51 -0400 diff --git a/debian/rules b/debian/rules index 6c2cef1e..35668dfe 100755 --- a/debian/rules +++ b/debian/rules @@ -19,8 +19,11 @@ export EFI_ARCH := aa64 endif COMMON_OPTIONS = \ + RELEASE=15 \ + COMMIT_ID=dd3230d07f369cc39caaa7eb23558a64586d2713 \ MAKELEVEL=0 \ EFI_PATH=/usr/lib \ + ENABLE_HTTPBOOT=true \ ENABLE_SHIM_CERT=1 \ ENABLE_SBSIGN=1 \ VENDOR_CERT_FILE=$(cert) \ -- cgit v1.2.3 From d2b378f8a44da21274bdb425406b27cc416e5666 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 22 Aug 2018 10:06:32 -0400 Subject: Make sure we pass the right COMMIT_ID to build --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 35668dfe..4c92c804 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ endif COMMON_OPTIONS = \ RELEASE=15 \ - COMMIT_ID=dd3230d07f369cc39caaa7eb23558a64586d2713 \ + COMMIT_ID=3beb971b10659cf78144ddc5eeea83501384440c \ MAKELEVEL=0 \ EFI_PATH=/usr/lib \ ENABLE_HTTPBOOT=true \ -- cgit v1.2.3