diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/second-stage-path | 24 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 1 |
4 files changed, 4 insertions, 25 deletions
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 <cyphermox@ubuntu.com> 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 <steve.langasek@ubuntu.com> - ---- - 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: |