[PATCH 2/7][RFC][LRM][Unstable] debian: rename deb-substvar nvk to a module neutral name

You-Sheng Yang vicamo.yang at canonical.com
Thu Apr 14 21:21:18 UTC 2022


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

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

Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang at canonical.com>
---
 debian/scripts/gen-rules.lrm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/scripts/gen-rules.lrm b/debian/scripts/gen-rules.lrm
index d4c6593..42f72ce 100755
--- a/debian/scripts/gen-rules.lrm
+++ b/debian/scripts/gen-rules.lrm
@@ -143,7 +143,7 @@ EOL
 dkms_nvidia_${suffix_under}_version=\$(shell gawk '/^${package} / { print \$\$2; }' debian/dkms-versions)
 nvidia_${suffix_under}_upstream_version=\$(shell echo "\$(dkms_nvidia_${suffix_under}_version)" | cut -d '-' -f 1)
 gencontrol_flags += -Vdkms:nvidia-${suffix_minus}-modules="nvidia-dkms-${suffix_minus} (= \$(dkms_nvidia_${suffix_under}_version))"
-gencontrol_flags += -Vnvk:nvidia-${suffix_minus}="nvidia-kernel-common-${suffix_minus} (<= \$(nvidia_${suffix_under}_upstream_version)-1), nvidia-kernel-common-${suffix_minus} (>= \$(nvidia_${suffix_under}_upstream_version))"
+gencontrol_flags += -Vadditional-deps:nvidia-${suffix_minus}="nvidia-kernel-common-${suffix_minus} (<= \$(nvidia_${suffix_under}_upstream_version)-1), nvidia-kernel-common-${suffix_minus} (>= \$(nvidia_${suffix_under}_upstream_version))"
 test::
 	@echo $package $version $suffix_minus $suffix_under $suffix_short $targets
 $targets::
@@ -167,7 +167,7 @@ Provides: \${dkms:nvidia-${suffix_minus}-modules}, nvidia-prebuilt-kernel
 Depends:
  \${misc:Depends},
  linux-modules-nvidia-${suffix_minus}-${src_abi}-${flavour} (= \${binary:Version}),
- \${nvk:nvidia-${suffix_minus}},
+ \${additional-deps:nvidia-${suffix_minus}},
 Description: Extra drivers for nvidia-${suffix_minus} for the ${flavour}\${variant:suffix} flavour
  Install extra signed nvidia-${suffix_minus} modules compatible with the ${flavour}\${variant:suffix} flavour.
 EOL
@@ -205,7 +205,7 @@ Depends:
  linux-image-${src_abi}-${flavour} | linux-image-unsigned-${src_abi}-${flavour},
  linux-signatures-nvidia-${src_abi}-${flavour} (= ${src_sigs_version}),
  linux-objects-nvidia-${suffix_minus}-${src_abi}-${flavour} (= \${binary:Version}),
- \${nvk:nvidia-${suffix_minus}},
+ \${additional-deps:nvidia-${suffix_minus}},
 Description: Linux kernel nvidia modules for version ${src_abi}
  This package pulls together the Linux kernel nvidia modules for
  version ${src_abi} with the appropriate signatures.
-- 
2.34.1




More information about the kernel-team mailing list