Attaching updated patches (also included in #836140).
From f270003bb7a4fab42884b4f373644cebdb51769e Mon Sep 17 00:00:00 2001 From: Linn Crosetto <l...@hp.com> Date: Mon, 17 Nov 2014 11:55:40 -0700 Subject: [PATCH 1/2] Build UEFI images using prefix from lsb_release
Change prefix in build-efi-images from hardcoded path to use lsb_release. Signed-off-by: Linn Crosetto <l...@hpe.com> --- debian/build-efi-images | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/build-efi-images b/debian/build-efi-images index 68802f0..2b417cb 100755 --- a/debian/build-efi-images +++ b/debian/build-efi-images @@ -147,13 +147,15 @@ NET_MODULES="$CD_MODULES tftp " +GRUB_IMAGE_PREFIX="/EFI/`(lsb_release -i -s 2> /dev/null || echo Debian) | tr A-Z a-z`" + "$grub_mkimage" -O "$platform" -o "$outdir/gcd$efi_name.efi" \ -d "$grub_core" \ -c "$workdir/grub-bootstrap.cfg" -m "$workdir/memdisk.fat" \ -p /boot/grub \ $CD_MODULES "$grub_mkimage" -O "$platform" -o "$outdir/grub$efi_name.efi" \ - -d "$grub_core" -p /EFI/ubuntu $GRUB_MODULES + -d "$grub_core" -p $GRUB_IMAGE_PREFIX $GRUB_MODULES "$grub_mkimage" -O "$platform" -o "$outdir/grubnet$efi_name.efi" \ -d "$grub_core" -c "$workdir/grub-bootstrap.cfg" \ -m "$workdir/memdisk-netboot.fat" -p /grub $NET_MODULES -- 2.6.4
From b6845d9d55777a3221ee63ddb29f64dab3088998 Mon Sep 17 00:00:00 2001 From: Linn Crosetto <l...@hpe.com> Date: Wed, 10 Aug 2016 14:31:56 -0600 Subject: [PATCH 2/2] Enable UEFI image builds for Secure Boot Signed-off-by: Linn Crosetto <l...@hpe.com> --- debian/rules | 2 -- 1 file changed, 2 deletions(-) diff --git a/debian/rules b/debian/rules index dea75ee..5863fb2 100755 --- a/debian/rules +++ b/debian/rules @@ -100,7 +100,6 @@ DEFAULT_HIDDEN_TIMEOUT_BOOL := false endif SB_PACKAGE := -ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) ifeq ($(DEB_HOST_ARCH),amd64) SB_PACKAGE := grub-efi-amd64 SB_PLATFORM := x86_64-efi @@ -111,7 +110,6 @@ SB_PACKAGE := grub-efi-arm64 SB_PLATFORM := arm64-efi SB_EFI_NAME := aa64 endif -endif %: dh $@ --parallel -- 2.6.4
signature.asc
Description: Digital signature
