Bug#986827: unblock: nvidia-graphics-drivers-tesla-460/460.32.03-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package nvidia-graphics-drivers-tesla-460
This is essentially the same diff as for
nvidia-graphics-drivers-tesla-{418,450}.
Let's synchronize the packaging with src:nvidia-graphics-drivers to ease
future stable updates.
These changes are already in src:nvidia-graphics-drivers in testing.
I've waited with the corresponding unblocks in case we would get another
new upstream release (with CVE fixes).
The missing libnvidia-ml.so symlink was spotted by enabling the nvml
plugin in hwloc-contrib and needs to be fixed in all driver packages.
The dkms changes are making my life easier and were in
src:nvidia-graphics-drivers early enough to migrate on their own.
Andreas
unblock nvidia-graphics-drivers-tesla-460/460.32.03-3
diff -Nru nvidia-graphics-drivers-tesla-460-460.32.03/debian/changelog nvidia-graphics-drivers-tesla-460-460.32.03/debian/changelog
--- nvidia-graphics-drivers-tesla-460-460.32.03/debian/changelog 2021-01-26 11:51:14.000000000 +0100
+++ nvidia-graphics-drivers-tesla-460-460.32.03/debian/changelog 2021-03-13 21:31:33.000000000 +0100
@@ -1,3 +1,12 @@
+nvidia-graphics-drivers-tesla-460 (460.32.03-3) unstable; urgency=medium
+
+ * Switch to dh-sequence-dkms (460.56-1).
+ * Simplify dh_dkms usage (460.56-1).
+ * nvidia-tesla-460-alternative: Add libnvidia-ml.so slave alternative if
+ libnvidia-ml-dev is installed (460.56-2). (Closes: #984881)
+
+ -- Andreas Beckmann <anbe@debian.org> Sat, 13 Mar 2021 21:31:33 +0100
+
nvidia-graphics-drivers-tesla-460 (460.32.03-2) unstable; urgency=medium
* Rebuild as Tesla 460 driver.
@@ -226,6 +235,15 @@
-- Andreas Beckmann <anbe@debian.org> Thu, 24 Sep 2020 21:52:54 +0200
+nvidia-graphics-drivers-tesla-450 (450.102.04-2) unstable; urgency=medium
+
+ * Switch to dh-sequence-dkms (460.56-1).
+ * Simplify dh_dkms usage (460.56-1).
+ * nvidia-tesla-450-alternative: Add libnvidia-ml.so slave alternative if
+ libnvidia-ml-dev is installed (460.56-2). (Closes: #984881)
+
+ -- Andreas Beckmann <anbe@debian.org> Sat, 13 Mar 2021 18:43:15 +0100
+
nvidia-graphics-drivers-tesla-450 (450.102.04-1) unstable; urgency=medium
* New upstream long lived branch release 450.102.04 (2021-01-07).
@@ -499,6 +517,15 @@
-- Andreas Beckmann <anbe@debian.org> Wed, 01 Jul 2020 00:02:18 +0200
+nvidia-graphics-drivers-tesla-440 (440.118.02-4) unstable; urgency=medium
+
+ * Switch to dh-sequence-dkms (460.56-1).
+ * Simplify dh_dkms usage (460.56-1).
+ * nvidia-tesla-440-alternative: Add libnvidia-ml.so slave alternative if
+ libnvidia-ml-dev is installed (460.56-2). (Closes: #984881)
+
+ -- Andreas Beckmann <anbe@debian.org> Fri, 12 Mar 2021 21:03:13 +0100
+
nvidia-graphics-drivers-tesla-440 (440.118.02-3) unstable; urgency=medium
* Metadata updates.
@@ -1026,6 +1053,15 @@
-- Andreas Beckmann <anbe@debian.org> Sat, 25 May 2019 13:49:09 +0200
+nvidia-graphics-drivers-tesla-418 (418.181.07-2) unstable; urgency=medium
+
+ * Switch to dh-sequence-dkms (460.56-1).
+ * Simplify dh_dkms usage (460.56-1).
+ * nvidia-tesla-418-alternative: Add libnvidia-ml.so slave alternative if
+ libnvidia-ml-dev is installed (460.56-2). (Closes: #984881)
+
+ -- Andreas Beckmann <anbe@debian.org> Fri, 12 Mar 2021 20:11:00 +0100
+
nvidia-graphics-drivers-tesla-418 (418.181.07-1) unstable; urgency=medium
* New upstream Tesla release 418.181.07 (2021-01-19).
diff -Nru nvidia-graphics-drivers-tesla-460-460.32.03/debian/control nvidia-graphics-drivers-tesla-460-460.32.03/debian/control
--- nvidia-graphics-drivers-tesla-460-460.32.03/debian/control 2021-01-26 11:51:14.000000000 +0100
+++ nvidia-graphics-drivers-tesla-460-460.32.03/debian/control 2021-03-13 21:31:33.000000000 +0100
@@ -11,9 +11,9 @@
Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers.git -b tesla-450/master
Build-Depends:
debhelper-compat (= 13),
+ dh-sequence-dkms,
dh-exec,
xz-utils,
- dkms,
libvulkan1 (>= 1.0.42),
libxext6,
quilt,
diff -Nru nvidia-graphics-drivers-tesla-460-460.32.03/debian/control.in nvidia-graphics-drivers-tesla-460-460.32.03/debian/control.in
--- nvidia-graphics-drivers-tesla-460-460.32.03/debian/control.in 2021-01-26 11:51:14.000000000 +0100
+++ nvidia-graphics-drivers-tesla-460-460.32.03/debian/control.in 2021-03-13 21:31:33.000000000 +0100
@@ -9,9 +9,9 @@
Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers.git -b tesla-450/master
Build-Depends:
debhelper-compat (= 13),
+ dh-sequence-dkms,
dh-exec,
xz-utils,
- dkms,
libvulkan1 (>= 1.0.42),
libxext6,
quilt,
diff -Nru nvidia-graphics-drivers-tesla-460-460.32.03/debian/control.md5sum nvidia-graphics-drivers-tesla-460-460.32.03/debian/control.md5sum
--- nvidia-graphics-drivers-tesla-460-460.32.03/debian/control.md5sum 2021-01-26 11:51:14.000000000 +0100
+++ nvidia-graphics-drivers-tesla-460-460.32.03/debian/control.md5sum 2021-03-13 21:31:33.000000000 +0100
@@ -1,5 +1,5 @@
-52988eeaff5a78a224e8d20f2702d8cc debian/control
-6f49c15af2db68fd8fb68c3c681cdaf4 debian/control.in
+47e50c38210eecf62d3c0fce1da4b9a6 debian/control
+90da2424e40c605c9a321a0c6df09731 debian/control.in
db12f898b07cdaf431ad34bd68a1662e debian/gen-control.pl
-eaaef48c70a92feb84b82864317c628c debian/rules
+ad9f17f1238e39b61a4819e1455f329d debian/rules
4ffe2180d86093ce6cf421063a86517e debian/rules.defs
diff -Nru nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-alternative.postinst.in nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-alternative.postinst.in
--- nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-alternative.postinst.in 2021-01-26 11:51:14.000000000 +0100
+++ nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-alternative.postinst.in 2021-03-13 21:31:33.000000000 +0100
@@ -84,10 +84,14 @@
$(add_slave /etc/nvidia/nvidia-modprobe.conf nvidia-modprobe.conf /etc/#PRIVATE#/nvidia-modprobe.conf)
$(add_slave /etc/nvidia/nvidia-load.conf nvidia-load.conf /etc/#PRIVATE#/nvidia-load.conf)
"
+ libnvidia_ml_so_slave=
+ if [ -f /usr/include/nvml.h ]; then
+ libnvidia_ml_so_slave="$(add_multiarch_slave /usr/lib "" libnvidia-ml.so /usr/lib #PRIVATE#/)"
+ fi
if echo "$slaves" | grep -q "slave" ; then
- update-alternatives --install /usr/lib/nvidia/nvidia nvidia /usr/lib/#PRIVATE# #MAJOR# $slaves $conf_slaves
+ update-alternatives --install /usr/lib/nvidia/nvidia nvidia /usr/lib/#PRIVATE# #MAJOR# $slaves $conf_slaves $libnvidia_ml_so_slave
# work around #916799 and re-register the alternative to clean-up leftover slaves
- update-alternatives --install /usr/lib/nvidia/nvidia nvidia /usr/lib/#PRIVATE# #MAJOR# $slaves $conf_slaves
+ update-alternatives --install /usr/lib/nvidia/nvidia nvidia /usr/lib/#PRIVATE# #MAJOR# $slaves $conf_slaves $libnvidia_ml_so_slave
else
update-alternatives --remove nvidia /usr/lib/#PRIVATE#
fi
diff -Nru nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-alternative.triggers.in nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-alternative.triggers.in
--- nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-alternative.triggers.in 2021-01-26 11:51:14.000000000 +0100
+++ nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-alternative.triggers.in 2021-03-13 21:31:33.000000000 +0100
@@ -4,3 +4,5 @@
interest-await /usr/lib/#PRIVATE#
interest-await /usr/lib/i386-linux-gnu/#PRIVATE#
interest-await /usr/lib/x86_64-linux-gnu/#PRIVATE#
+
+interest-await /usr/include/nvml.h
diff -Nru nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-kernel-dkms.dkms.in nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-kernel-dkms.dkms.in
--- nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-kernel-dkms.dkms.in 2021-01-26 11:51:14.000000000 +0100
+++ nvidia-graphics-drivers-tesla-460-460.32.03/debian/nvidia-kernel-dkms.dkms.in 2021-03-13 21:31:33.000000000 +0100
@@ -2,7 +2,7 @@
# The version is replaced at build time by dh_dkms invoked in debian/rules.
PACKAGE_NAME="#MODULE#"
-PACKAGE_VERSION="#MODULE_VERSION#"
+PACKAGE_VERSION="#VERSION#"
AUTOINSTALL=yes
PATCH=(#MODULE_PATCHES#)
diff -Nru nvidia-graphics-drivers-tesla-460-460.32.03/debian/rules nvidia-graphics-drivers-tesla-460-460.32.03/debian/rules
--- nvidia-graphics-drivers-tesla-460-460.32.03/debian/rules 2021-01-26 11:51:14.000000000 +0100
+++ nvidia-graphics-drivers-tesla-460-460.32.03/debian/rules 2021-03-13 21:31:33.000000000 +0100
@@ -194,7 +194,7 @@
.PHONY: binary binary-arch binary-indep build clean install
binary binary-arch binary-indep build clean install:
- dh $@ --with dkms
+ dh $@
override_dh_auto_clean:
$(RM) -r .pc
@@ -290,9 +290,6 @@
override_dh_installchangelogs:
dh_installchangelogs debian/tmp/NVIDIA_Changelog
-override_dh_dkms:
- dh_dkms -V $(version)
-
override_dh_bugfiles:
dh_bugfiles -A
Reply to: