From patchwork Tue Jul 16 16:56:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 1132874 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 45p64D38Qbz9sBt; Wed, 17 Jul 2019 02:56:28 +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 1hnQkZ-0004CE-PV; Tue, 16 Jul 2019 16:56:23 +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 1hnQkX-0004BN-Kc for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 16:56:21 +0000 Received: from 1.general.smb.uk.vpn ([10.172.193.28] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hnQkX-0001lc-8z for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 16:56:21 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [b/linux-aws-edge] UBUNTU: [Packaging] Start shipping modules-extra Date: Tue, 16 Jul 2019 18:56:13 +0200 Message-Id: <20190716165618.22684-4-stefan.bader@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190716165618.22684-1-stefan.bader@canonical.com> References: <20190716165618.22684-1-stefan.bader@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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1836706 To be consistent across derivatives and in order to allow out of tree modules to properly compile and giving a quick work-around to people needing additional modules by default, we re-enable shipping linux-modules-extra. Everything in there is always being compiled anyway. Signed-off-by: Stefan Bader --- debian.aws-edge/control.d/flavour-control.stub | 8 ++------ debian.aws-edge/rules.d/amd64.mk | 2 +- debian.aws-edge/rules.d/arm64.mk | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/debian.aws-edge/control.d/flavour-control.stub b/debian.aws-edge/control.d/flavour-control.stub index 7e96965fc37e..eb6556e25874 100644 --- a/debian.aws-edge/control.d/flavour-control.stub +++ b/debian.aws-edge/control.d/flavour-control.stub @@ -72,17 +72,13 @@ Description: Linux kernel extra modules for version PKGVER on DESC This package contains the Linux kernel extra modules for version PKGVER on DESC. . - Also includes 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. - . 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. + the linux-modules-extra-FLAVOUR meta-package, which will ensure that upgrades + work correctly, and that supporting packages are also installed. Package: linux-headers-PKGVER-ABINUM-FLAVOUR Build-Profiles: diff --git a/debian.aws-edge/rules.d/amd64.mk b/debian.aws-edge/rules.d/amd64.mk index 0273586a1d84..92862ec61cbc 100644 --- a/debian.aws-edge/rules.d/amd64.mk +++ b/debian.aws-edge/rules.d/amd64.mk @@ -16,7 +16,7 @@ do_tools_perf = true do_tools_x86 = true do_tools_hyperv = false do_extras_package = true -ship_extras_package = false +ship_extras_package = true do_tools_common = false do_tools_acpidbg = false do_zfs = true diff --git a/debian.aws-edge/rules.d/arm64.mk b/debian.aws-edge/rules.d/arm64.mk index a38f1bebf6bc..fa43e1706760 100644 --- a/debian.aws-edge/rules.d/arm64.mk +++ b/debian.aws-edge/rules.d/arm64.mk @@ -16,7 +16,7 @@ do_tools_perf = true do_tools_x86 = false do_tools_hyperv = true do_extras_package = true -ship_extras_package = false +ship_extras_package = true do_tools_common = true do_zfs = true do_libc_dev_package = false