From fff232c35507ccce43fd5bf3786d6b99df5c45a8 Mon Sep 17 00:00:00 2001 From: Joseph Salisbury Date: Thu, 12 Oct 2023 20:54:00 +0200 Subject: [PATCH] UBUNTU: [Packaging] Make WWAN driver loadable modules BugLink: https://bugs.launchpad.net/bugs/2033406 The CONFIG_WWAN config is set to 'Y' for the generic and most derivative kernels. This is affecting custom driver development for some partners. Change this config to be a loadable module and include it in linux-modules-*. Make this change to -generic kernels, so all derivatives will inherit it. Signed-off-by: Joseph Salisbury Acked-by: Tim Gardner Acked-by: Stefan Bader Signed-off-by: Stefan Bader [roxanan: Removed the duplicated config option] Signed-off-by: Roxana Nicolescu Signed-off-by: Andrea Righi --- debian.master/config/annotations | 4 +++- debian.master/control.d/generic.inclusion-list | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index bd8aca816ffc..2d20b045b81e 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -798,6 +798,9 @@ CONFIG_ZLIB_DFLTCC note<'LP: #1830208'> CONFIG_ZONE_DMA policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 's390x': 'y'}> CONFIG_ZONE_DMA note<'LP: #1628523'> +CONFIG_WWAN policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'm', 's390x': 'n'}> +CONFIG_WWAN note<'LP: #2033406'> + # ---- Annotations without notes ---- @@ -15147,7 +15150,6 @@ CONFIG_WPCM450_SOC policy<{'amd64': 'm', 'arm64': ' CONFIG_WQ_CPU_INTENSIVE_REPORT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_WQ_POWER_EFFICIENT_DEFAULT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'n'}> CONFIG_WQ_WATCHDOG policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> -CONFIG_WWAN policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'm', 's390x': 'n'}> CONFIG_WWAN_DEBUGFS policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}> CONFIG_WWAN_HWSIM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': '-'}> CONFIG_WW_MUTEX_SELFTEST policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list index 9b9bd7c35ae0..b0a9d896fd7f 100644 --- a/debian.master/control.d/generic.inclusion-list +++ b/debian.master/control.d/generic.inclusion-list @@ -147,6 +147,7 @@ drivers/net/virtio_net.ko drivers/net/vmxnet3/vmxnet3.ko drivers/net/vxlan.ko drivers/net/wireguard/wireguard.ko +drivers/net/wwan/* drivers/net/xen-netback/* drivers/net/xen-netfront.ko drivers/nvme/host/nvme.ko