From patchwork Mon Jul 30 12:16:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 950852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41fJT20z4tz9s1R; Mon, 30 Jul 2018 22:16:22 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fk75y-0000j8-95; Mon, 30 Jul 2018 12:16:14 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fk75w-0000ip-Vz for kernel-team@lists.ubuntu.com; Mon, 30 Jul 2018 12:16:12 +0000 Received: from 1.general.apw.uk.vpn ([10.172.192.78] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1fk75w-0005cN-Na; Mon, 30 Jul 2018 12:16:12 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [xenial/gcp/master 1/1] UBUNTU: [Configuration] enable EFI signing support Date: Mon, 30 Jul 2018 13:16:11 +0100 Message-Id: <20180730121611.10488-3-apw@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730121611.10488-1-apw@canonical.com> References: <20180730121611.10488-1-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andy Whitcroft MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: http://bugs.launchpad.net/bugs/1782557 Signed-off-by: Andy Whitcroft Acked-by: Stefan Bader --- 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: 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: 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: 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