[PATCH V2 2/6][SRU][Jammy/OEM-5.17] UBUNTU: [Packaging] add debpath= in dkms-versions

You-Sheng Yang vicamo.yang at canonical.com
Fri Apr 22 17:10:08 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/dkms-versions            | 4 ++--
 debian/rules.d/0-common-vars.mk | 5 +++++
 debian/rules.d/2-binary-arch.mk | 7 +++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/dkms-versions b/debian/dkms-versions
index 4b1e7a794514..2a7648084e1a 100644
--- a/debian/dkms-versions
+++ b/debian/dkms-versions
@@ -1,2 +1,2 @@
-v4l2loopback 0.12.5-1ubuntu3 modulename=v4l2loopback
-zfs-linux 2.1.2-1ubuntu3 modulename=zfs
+v4l2loopback 0.12.5-1ubuntu3 modulename=v4l2loopback debpath=pool/universe/v/v4l2loopback/v4l2loopback-dkms_0.12.5-1ubuntu3_all.deb
+zfs-linux 2.1.2-1ubuntu3 modulename=zfs debpath=pool/universe/z/zfs-linux/zfs-dkms_2.1.2-1ubuntu3_all.deb
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index c617317fb54d..7cd84e4540bd 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -300,4 +300,9 @@ $(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DROOT)/dkms-ver
   ) \
   $(eval all_dkms_modules += $(_m)) \
   $(eval dkms_$(_m)_version = $(_deb_version)) \
+  $(if $(filter debpath=%,$(_params)), \
+    $(eval dkms_$(_m)_debpath = $(patsubst debpath=%,%,$(filter debpath=%,$(_params)))) \
+    , \
+    $(error debpath for $(_deb_pkgname) not specified.) \
+  ) \
 )
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 3bfc6abcdf35..5fe6f2a84169 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -413,8 +413,11 @@ endif
 	install -d $(dkms_dir) $(dkms_dir)/headers $(dkms_dir)/build $(dkms_dir)/source
 	cp -rp "$(hdrdir)" "$(indep_hdrdir)" "$(dkms_dir)/headers"
 
-	$(if $(enable_zfs),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, $(dbgpkgdir_dkms), zfs, pool/universe/z/zfs-linux/zfs-dkms_$(dkms_zfs_version)_all.deb))
-	$(if $(enable_v4l2loopback),$(call build_dkms, $(mods_pkg_name)-$*, $(pkgdir)/lib/modules/$(abi_release)-$*/kernel, $(dbgpkgdir_dkms), v4l2loopback, pool/universe/v/v4l2loopback/v4l2loopback-dkms_$(dkms_v4l2loopback_version)_all.deb))
+	$(foreach _m,$(all_dkms_modules), \
+	  $(if $(enable_$(_m)), \
+	    $(call build_dkms,$(mods_pkg_name)-$*,$(pkgdir)/lib/modules/$(abi_release)-$*/kernel,$(dbgpkgdir_dkms),$(_m),$(dkms_$(_m)_debpath)); \
+	  ) \
+	)
 
 
 ifneq ($(skipdbg),true)
-- 
2.34.1




More information about the kernel-team mailing list