[PATCH 1/1] UBUNTU: [Packaging]: wdat_wdt.ko is moved from linux-modules-extra to linux-modules for amd64

[Mehmet Basaran]

BugLink: http://bugs.launchpad.net/bugs/2098554

Linux supports the virtual watchdog timer through the "wdat_wdt" module.
In Ubuntu 24.04 LTS on amd64, this module is in the "linux-modules-extra-*"
series of packages. These are depended on by the "linux-image-generic"
package, but not by the "linux-image-virtual" package. The latter is what
is included in Ubuntu Official Cloud Images.

Installing "linux-image-virtual" on amd64 should get the "wdat_wdt" module
because it's necessary to fully support a common hypervisor.

Signed-off-by: Mehmet Basaran <mehmet.basaran at canonical.com>
---
 debian.master/control.d/generic.inclusion-list |  1 +
 debian/scripts/module-inclusion                | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list
index e414985ad12f..029ff7c8d30b 100644
--- a/debian.master/control.d/generic.inclusion-list
+++ b/debian.master/control.d/generic.inclusion-list
@@ -220,6 +220,7 @@ drivers/video/vgastate.ko
 drivers/virt/vboxguest/vboxguest.ko
 drivers/virtio/*
 drivers/watchdog/softdog.ko
+! include_if_matches_host_architecture drivers/watchdog/wdat_wdt.ko amd64
 drivers/xen/*
 fs/9p/*
 fs/aufs/aufs.ko
diff --git a/debian/scripts/module-inclusion b/debian/scripts/module-inclusion
index ccec0f215e08..3be5b08c305b 100755
--- a/debian/scripts/module-inclusion
+++ b/debian/scripts/module-inclusion
@@ -9,6 +9,16 @@
 #       debian/build/build-virtual-ALL debian/build/build-virtual \
 #	debian.master/control.d/virtual.inclusion-list \
 #	virtual.depmap
+
+function include_if_matches_host_architecture()
+{
+	local module="$1"
+	shift
+	local archs="$@"
+	local host_arch="$(dpkg-architecture -q DEB_HOST_ARCH)"
+	[[ $archs = *$host_arch* ]] && echo "${module}"
+}
+
 master=0
 if [ "$1" = "--master" ]; then
 	master=1
-- 
2.43.0