Skip to content

Commit b0a5dcc

Browse files
committed
UBUNTU: [Packaging] nvidia-6.5: 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 <ian.may@canonical.com>
1 parent 1836b18 commit b0a5dcc

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ clean: debian/control debian/canonical-certs.pem debian/canonical-revoked-certs.
151151

152152
# SUBSTVARS: rprovides for all DKMS packages
153153
echo "linux:rprovides=$(foreach dkms,$(all_built-in_dkms_modules),$(foreach provides,$(dkms_$(dkms)_rprovides),$(provides)$(comma)))" >"debian/substvars"
154-
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"
154+
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"
155155

156156
.PHONY: distclean
157157
distclean: clean

debian/rules.d/0-common-vars.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ $(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DEBIAN)/dkms-ve
304304
, \
305305
$(eval dkms_$(_m)_archs = any) \
306306
) \
307-
$(eval dkms_$(_m)_rprovides = $(patsubst rprovides=%,%,$(filter rprovides=%,$(_params)))) \
307+
$(eval _rprovides_raw = $(filter rprovides=%,$(_params))) \
308+
$(eval dkms_$(_m)_rprovides = $(patsubst rprovides=%,%,$(_rprovides_raw))) \
308309
$(eval dkms_$(_m)_type = $(word 1,$(patsubst type=%,%,$(filter type=%,$(_params))) built-in)) \
309310
$(eval all_$(dkms_$(_m)_type)_dkms_modules += $(_m)) \
310311
$(if $(filter standalone,$(dkms_$(_m)_type)), \

0 commit comments

Comments
 (0)