[PATCH 3/4][SRU][OEM-5.14/Jammy/OEM-5.17/unstable] UBUNTU: [Packaging] support building backport-iwlwifi-dkms as standalone modules

You-Sheng Yang vicamo.yang at canonical.com
Tue Apr 19 17:23:07 UTC 2022


From: "You-Sheng Yang (vicamo)" <vicamo.yang at canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1969434

Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang at canonical.com>
---
 debian/rules.d/0-common-vars.mk | 5 +++--
 debian/scripts/control-create   | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index eba261a68b64..58c0165429fb 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -288,12 +288,13 @@ ubuntu_selftests = breakpoints cpu-hotplug efivarfs memfd memory-hotplug mount n
 
 # DKMS
 _all_dkms_versions = $(shell gawk '{ print $$1 ":" $$2 }' debian/dkms-versions)
-dkms_srcpkg_to_module = $(if $(filter zfs-linux,$(1)),zfs,$(1))
+dkms_srcpkg_to_module = $(if $(filter zfs-linux,$(1)),zfs,$(if $(filter backport-iwlwifi-dkms,$(1)),iwlwifi,$(1)))
 $(foreach _v,$(_all_dkms_versions),$(eval dkms_$(call dkms_srcpkg_to_module,$(firstword $(subst :, ,$(_v))))_version = $(word 2,$(subst :, ,$(_v)))))
 all_dkms_modules = $(foreach _v,$(_all_dkms_versions),$(call dkms_srcpkg_to_module,$(firstword $(subst :, ,$(_v)))))
+dkms_iwlwifi_deb_path = pool/universe/b/backport-iwlwifi-dkms/backport-iwlwifi-dkms_$(dkms_iwlwifi_version)_all.deb
 dkms_v4l2loopback_deb_path = pool/universe/v/v4l2loopback/v4l2loopback-dkms_$(dkms_v4l2loopback_version)_all.deb
 dkms_zfs_deb_path = pool/universe/z/zfs-linux/zfs-dkms_$(dkms_zfs_version)_all.deb
-_known_standalone_dkms_modules =
+_known_standalone_dkms_modules = iwlwifi
 all_standalone_dkms_modules = $(filter $(_known_standalone_dkms_modules),$(all_dkms_modules))
 $(foreach _m,$(all_dkms_modules),\
   $(if $(filter $(_m),$(all_standalone_dkms_modules)),\
diff --git a/debian/scripts/control-create b/debian/scripts/control-create
index 73ec00f941ec..7cb48a940da3 100755
--- a/debian/scripts/control-create
+++ b/debian/scripts/control-create
@@ -42,6 +42,9 @@ cat $stub | grep -v '^#' | sed \
 while read package version
 do
 	case "$package" in
+	backport-iwlwifi-dkms)
+		module=iwlwifi
+		;;
 	*) continue ;;
 	esac
 
-- 
2.34.1




More information about the kernel-team mailing list