[d+b/linux-aws] UBUNTU: [Packaging] Start shipping modules-extra

[Stefan Bader]

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 <stefan.bader at canonical.com>
---
 debian.aws/control.d/flavour-control.stub | 8 ++------
 debian.aws/rules.d/amd64.mk               | 2 +-
 debian.aws/rules.d/arm64.mk               | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian.aws/control.d/flavour-control.stub b/debian.aws/control.d/flavour-control.stub
index ee041f9f060a..9f5b12a8c665 100644
--- a/debian.aws/control.d/flavour-control.stub
+++ b/debian.aws/control.d/flavour-control.stub
@@ -74,17 +74,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: <!stage1>
diff --git a/debian.aws/rules.d/amd64.mk b/debian.aws/rules.d/amd64.mk
index 0273586a1d84..92862ec61cbc 100644
--- a/debian.aws/rules.d/amd64.mk
+++ b/debian.aws/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/rules.d/arm64.mk b/debian.aws/rules.d/arm64.mk
index a38f1bebf6bc..fa43e1706760 100644
--- a/debian.aws/rules.d/arm64.mk
+++ b/debian.aws/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
-- 
2.17.1