UBUNTU: [Packaging] add versioning to dkms standalone rprovides

When nvidia-fs-dkms is available as a dkms package, we want to default to using the signed modules if possible. Adding a version number for the nvidia-fs modules package enables the inbox modules to be selected over an equivalent dkms version. Ignore: yes Signed-off-by: Ian May <[email protected]>
NVIDIA · Dec 9, 2024 · 34a7d34 · 34a7d34
1 parent 3a6a867
commit 34a7d34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/debian/rules b/debian/rules
@@ -155,7 +155,7 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs.
 
 	# SUBSTVARS: rprovides for all DKMS packages
 	echo "linux:rprovides=$(foreach dkms,$(all_built-in_dkms_modules),$(foreach provides,$(dkms_$(dkms)_rprovides),$(provides)$(comma)))" >"debian/substvars"
-	echo "$(foreach dkms,$(all_standalone_dkms_modules),$(dkms):rprovides=$(foreach provides,$(dkms_$(dkms)_rprovides),$(provides)$(comma))=NL=)" | sed -e "s/=NL= */\n/g" >>"debian/substvars"
+	echo "$(foreach dkms,$(all_standalone_dkms_modules),$(dkms):rprovides=$(strip $(foreach provides,$(dkms_$(dkms)_rprovides),$(provides)$(comma)))=NL=)" | sed -e 's/~(/ (/g' -e 's/, (/ (/g' -e 's/=NL= */\n/g' >>"debian/substvars"
 
 .PHONY: distclean
 distclean: clean

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
@@ -256,7 +256,8 @@ $(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DEBIAN)/dkms-ve
     , \
     $(eval dkms_$(_m)_archs = any) \
   ) \
-  $(eval dkms_$(_m)_rprovides = $(patsubst rprovides=%,%,$(filter rprovides=%,$(_params)))) \
+  $(eval _rprovides_raw = $(filter rprovides=%,$(_params))) \
+  $(eval dkms_$(_m)_rprovides = $(patsubst rprovides=%,%,$(_rprovides_raw))) \
   $(eval dkms_$(_m)_type = $(word 1,$(patsubst type=%,%,$(filter type=%,$(_params))) built-in)) \
   $(eval all_$(dkms_$(_m)_type)_dkms_modules += $(_m)) \
   $(if $(filter standalone,$(dkms_$(_m)_type)), \