From patchwork Tue Feb 5 10:32:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1037967 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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43wFsW1XTJz9sNH; Thu, 7 Feb 2019 22:07:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1grhX7-0006i1-OV; Thu, 07 Feb 2019 11:07:53 +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 1grhX4-0006gV-3v for kernel-team@lists.ubuntu.com; Thu, 07 Feb 2019 11:07:50 +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 1grhX3-0002WH-RL; Thu, 07 Feb 2019 11:07:49 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Config] resync flavour-control.stub Date: Tue, 5 Feb 2019 10:32:27 +0000 Message-Id: <20190205103227.6048-3-apw@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190205103227.6048-1-apw@canonical.com> References: <20190205103227.6048-1-apw@canonical.com> MIME-Version: 1.0 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 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Andy Whitcroft --- debian.xenial/control.d/flavour-control.stub | 47 +++++++++++++++----- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/debian.xenial/control.d/flavour-control.stub b/debian.xenial/control.d/flavour-control.stub index 29b9b296d6a2..8cd24d4ac0cf 100644 --- a/debian.xenial/control.d/flavour-control.stub +++ b/debian.xenial/control.d/flavour-control.stub @@ -21,19 +21,36 @@ # # 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 Priority: optional Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides} -Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools | linux-initramfs-tool, kmod -Recommends: BOOTLOADER -Suggests: fdutils, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base, linux-modules-PKGVER-ABINUM-FLAVOUR +Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool +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 + This package contains the=SIGN-ME-TXT= Linux kernel image for version PKGVER on DESC. . - Also includes the corresponding System.map file, the modules built by the + Supports SUPPORTED processors. + . + TARGET + . + You likely do not want to install this package directly. Instead, install + the linux-FLAVOUR meta-package, which will ensure that upgrades work + correctly, and that supporting packages are also installed. + +Package: linux-modules-PKGVER-ABINUM-FLAVOUR +Build-Profiles: +Architecture: ARCH +Section: kernel +Priority: optional +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Linux kernel extra modules for version PKGVER on DESC + Contains the corresponding System.map file, the modules built by the packager, and scripts that try to ensure that the system is not left in an unbootable state after an update. . @@ -45,11 +62,12 @@ Description: Linux kernel image for version PKGVER on DESC the linux-FLAVOUR meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-image-extra-PKGVER-ABINUM-FLAVOUR +Package: linux-modules-extra-PKGVER-ABINUM-FLAVOUR +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. @@ -67,10 +85,11 @@ Description: Linux kernel extra modules for version PKGVER on DESC correctly, and that supporting packages are also installed. Package: linux-headers-PKGVER-ABINUM-FLAVOUR +Build-Profiles: Architecture: ARCH Section: devel Priority: optional -Depends: ${misc:Depends}, linux-headers-PKGVER-ABINUM, ${shlibs:Depends} +Depends: ${misc:Depends}, SRCPKGNAME-headers-PKGVER-ABINUM, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version PKGVER on DESC This package provides kernel header files for version PKGVER on @@ -79,14 +98,15 @@ 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 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. @@ -96,6 +116,7 @@ Description: Linux kernel debug image for version PKGVER on DESC unstripped modules. Package: linux-tools-PKGVER-ABINUM-FLAVOUR +Build-Profiles: Architecture: ARCH Section: devel Priority: optional @@ -107,6 +128,7 @@ Description: Linux kernel version specific tools for version PKGVER-ABINUM =HUMAN=. Package: linux-cloud-tools-PKGVER-ABINUM-FLAVOUR +Build-Profiles: Architecture: ARCH Section: devel Priority: optional @@ -116,7 +138,8 @@ Description: Linux kernel version specific cloud tools for version PKGVER-ABINUM version locked tools for cloud for version PKGVER-ABINUM on =HUMAN=. -Package: SRCPKGNAME-udebs-FLAVOUR +Package: linux-udebs-FLAVOUR +Build-Profiles: XC-Package-Type: udeb Section: debian-installer Architecture: ARCH