[PATCH][bionic/linux-aws] UBUNTU: [Packaging] aws: Enable signed kernel

[Tim Gardner]

BugLink: https://bugs.launchpad.net/bugs/1951011

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.aws/control.d/flavour-control.stub | 7 ++++---
 debian.aws/rules.d/amd64.mk               | 2 +-
 debian.aws/rules.d/arm64.mk               | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian.aws/control.d/flavour-control.stub b/debian.aws/control.d/flavour-control.stub
index 0bb756b4ec0a8..bd22e3549ef13 100644
--- a/debian.aws/control.d/flavour-control.stub
+++ b/debian.aws/control.d/flavour-control.stub
@@ -21,7 +21,7 @@
 #
 # XXX: Leave the blank line before the first package!!
 
-Package: linux-image-PKGVER-ABINUM-FLAVOUR
+Package: linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR
 Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: kernel
@@ -30,6 +30,7 @@ Provides: linux-image, fuse-module, aufs-dkms, =PROVIDES=${linux:rprovides}
 Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-PKGVER-ABINUM-FLAVOUR
 Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool
 Breaks: flash-kernel (<< 3.0~rc.4ubuntu64) [arm64]
+Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR
 Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR
 Description: Linux kernel image for version PKGVER on DESC
  This package contains the Linux kernel image for version PKGVER on
@@ -67,7 +68,7 @@ Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: kernel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-PKGVER-ABINUM-FLAVOUR, crda | wireless-crda
+Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR, crda | wireless-crda
 Description: Linux kernel extra modules for version PKGVER on DESC
  This package contains the Linux kernel extra modules for version PKGVER on
  DESC.
@@ -94,7 +95,7 @@ Description: Linux kernel headers for version PKGVER on DESC
  This is for sites that want the latest kernel headers.  Please read
  /usr/share/doc/linux-headers-PKGVER-ABINUM/debian.README.gz for details.
 
-Package: linux-image-PKGVER-ABINUM-FLAVOUR-dbgsym
+Package: linux-image=SIGN-ME-PKG=-PKGVER-ABINUM-FLAVOUR-dbgsym
 Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: devel
diff --git a/debian.aws/rules.d/amd64.mk b/debian.aws/rules.d/amd64.mk
index 32ef2351bb3d7..69c2b53802ead 100644
--- a/debian.aws/rules.d/amd64.mk
+++ b/debian.aws/rules.d/amd64.mk
@@ -9,7 +9,7 @@ install_file	= vmlinuz
 loader		= grub
 vdso		= vdso_install
 no_dumpfile	= true
-uefi_signed     = false
+uefi_signed     = true
 do_tools_usbip  = true
 do_tools_cpupower = true
 do_tools_perf   = true
diff --git a/debian.aws/rules.d/arm64.mk b/debian.aws/rules.d/arm64.mk
index 4a986236a4800..2f2c29af0b67c 100644
--- a/debian.aws/rules.d/arm64.mk
+++ b/debian.aws/rules.d/arm64.mk
@@ -28,3 +28,4 @@ do_source_package = false
 do_dtbs                = false
 do_common_headers_indep = false
 do_tools_perf_jvmti = true
+uefi_signed     = true
-- 
2.34.1