[xenial/gcp/master 1/1] UBUNTU: [Configuration] enable EFI signing support

[Andy Whitcroft]

BugLink: http://bugs.launchpad.net/bugs/1782557
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian.gcp-xenial/control.d/flavour-control.stub | 13 +++++++------
 debian.gcp-xenial/rules.d/amd64.mk               |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian.gcp-xenial/control.d/flavour-control.stub b/debian.gcp-xenial/control.d/flavour-control.stub
index 0bf56dcc03c6..f790d4242649 100644
--- a/debian.gcp-xenial/control.d/flavour-control.stub
+++ b/debian.gcp-xenial/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
@@ -29,10 +29,11 @@ Priority: optional
 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
-Breaks: flash-kernel (<< 3.0~rc.4ubuntu62.2) [arm64]
+Breaks: flash-kernel (<< 3.0~rc.4ubuntu62.2) [arm64], s390-tools (<< 1.34.0-0ubuntu8.6) [s390x]
+Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR
 Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR, initramfs-tools | linux-initramfs-tool
 Description: Linux kernel image for version PKGVER on DESC
- This package contains the Linux kernel image for version PKGVER on
+ This package contains the=SIGN-ME-TXT= Linux kernel image for version PKGVER on
  DESC.
  .
  Supports SUPPORTED processors.
@@ -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-PKGVER-ABINUM-FLAVOUR | linux-image-unsigned-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.
@@ -98,7 +99,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
@@ -106,7 +107,7 @@ Priority: optional
 Depends: ${misc:Depends}
 Provides: linux-debug
 Description: Linux kernel debug image for version PKGVER on DESC
- This package provides a kernel debug image for version PKGVER on
+ This package provides the=SIGN-ME-TXT= kernel debug image for version PKGVER on
  DESC.
  .
  This is for sites that wish to debug the kernel.
diff --git a/debian.gcp-xenial/rules.d/amd64.mk b/debian.gcp-xenial/rules.d/amd64.mk
index 0f7b72b7ce49..3fd4ce36db3e 100644
--- a/debian.gcp-xenial/rules.d/amd64.mk
+++ b/debian.gcp-xenial/rules.d/amd64.mk
@@ -9,6 +9,7 @@ install_file	= vmlinuz
 loader		= grub
 vdso		= vdso_install
 no_dumpfile	= true
+uefi_signed     = true
 do_tools_usbip  = true
 do_tools_cpupower = true
 do_tools_perf   = true
-- 
2.17.1