From cff1facf80f327dbd43654221ea5704e24a0dc1d Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 29 Aug 2017 13:57:22 -0400 Subject: [PATCH] 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(-) diff --git a/debian/changelog b/debian/changelog index b9528e9..56ba2c4 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 f35661c..b03e2ee 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: