Bug#986824: unblock: nvidia-graphics-drivers-legacy-390xx/390.141-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package nvidia-graphics-drivers-legacy-390xx
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.
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.
Andreas
unblock nvidia-graphics-drivers-legacy-390xx/390.141-3
diff -Nru nvidia-graphics-drivers-legacy-390xx-390.141/debian/changelog nvidia-graphics-drivers-legacy-390xx-390.141/debian/changelog
--- nvidia-graphics-drivers-legacy-390xx-390.141/debian/changelog 2021-01-12 02:08:48.000000000 +0100
+++ nvidia-graphics-drivers-legacy-390xx-390.141/debian/changelog 2021-03-13 22:39:29.000000000 +0100
@@ -1,3 +1,16 @@
+nvidia-graphics-drivers-legacy-390xx (390.141-3) unstable; urgency=medium
+
+ * nvidia-legacy-390xx-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 22:39:29 +0100
+
+nvidia-graphics-drivers-legacy-390xx (390.141-2~deb10u1) buster; urgency=medium
+
+ * Rebuild for buster.
+
+ -- Andreas Beckmann <anbe@debian.org> Sat, 23 Jan 2021 18:04:20 +0100
+
nvidia-graphics-drivers-legacy-390xx (390.141-2) unstable; urgency=medium
* Really re-enable building the nvidia-uvm module.
@@ -15,11 +28,12 @@
- Fixed a driver installation failure on Linux kernel 5.8 release
candidates, where the NVIDIA kernel module failed to build with error
"too many arguments to function '__vmalloc'".
+ * Improved compatibility with recent Linux kernels.
[ Andreas Beckmann ]
* Re-enable building the nvidia-uvm module.
* Refresh patches.
- * Update symbols files.
+ * Update glvnd symbols files.
* Update lintian overrides.
-- Andreas Beckmann <anbe@debian.org> Sun, 10 Jan 2021 03:31:58 +0100
@@ -73,15 +87,6 @@
* Backport nv_vmalloc changes from 450.57
and work around mmap_{sem=>lock} rename
to fix kernel module build for Linux 5.8. (Partly addresses #969085)
- * Note: The nvidia-uvm kernel module will fail to build for Linux 5.8 due to
- licence incompatibility unless cfa6705d89b6562f79c40c249f8d94073c4276e4
- "radix-tree: Use local_lock for protection" (which effectively made
- radix_tree_preloads GPL-only) gets reverted in Linux 5.8 or NVIDIA
- switches the nvidia-uvm module license to "Dual MIT/GPL" as in 415.18.
- * Note: Building the nvidia-uvm module can be temporarily disabled by
- a) commenting the last paragraph in dkms.conf and
- b) building with NV_EXCLUDE_KERNEL_MODULES=nvidia-uvm set in the
- environment.
* Update lintian overrides.
[ Vincent Cheng ]
diff -Nru nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgl1-glvnd-nvidia-glx.symbols nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgl1-glvnd-nvidia-glx.symbols
--- nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgl1-glvnd-nvidia-glx.symbols 2021-01-12 02:08:48.000000000 +0100
+++ nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgl1-glvnd-nvidia-glx.symbols 2021-03-13 22:39:29.000000000 +0100
@@ -7,7 +7,7 @@
SplitString@Base 375
UnionExtensionStrings@Base 375.20
#MISSING: 384.111# __glXWrapperInit@Base 361
-#MISSING: 390.141# entry_generate_default_code@Base 361
+ (arch=ppc64el)entry_generate_default_code@Base 361
entry_get_patch_address@Base 390.141
#MISSING: 390.141# entry_get_patch_addresses@Base 361
entry_get_public@Base 361
diff -Nru nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgles1-glvnd-nvidia.symbols nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgles1-glvnd-nvidia.symbols
--- nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgles1-glvnd-nvidia.symbols 2021-01-12 02:08:48.000000000 +0100
+++ nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgles1-glvnd-nvidia.symbols 2021-03-13 22:39:29.000000000 +0100
@@ -7,7 +7,7 @@
#MISSING: 361# NvGlEsInit@Base 331
SplitString@Base 390.59
UnionExtensionStrings@Base 390.59
-#MISSING: 390.141# entry_generate_default_code@Base 390.59
+ (arch=ppc64el)entry_generate_default_code@Base 390.59
entry_get_patch_address@Base 390.141
#MISSING: 390.141# entry_get_patch_addresses@Base 390.59
entry_get_public@Base 390.59
diff -Nru nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgles2-glvnd-nvidia.symbols nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgles2-glvnd-nvidia.symbols
--- nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgles2-glvnd-nvidia.symbols 2021-01-12 02:08:48.000000000 +0100
+++ nvidia-graphics-drivers-legacy-390xx-390.141/debian/libgles2-glvnd-nvidia.symbols 2021-03-13 22:39:29.000000000 +0100
@@ -8,7 +8,7 @@
#MISSING: 361# NvGlEs2Init@Base 331
SplitString@Base 390.59
UnionExtensionStrings@Base 390.59
-#MISSING: 390.141# entry_generate_default_code@Base 390.59
+ (arch=ppc64el)entry_generate_default_code@Base 390.59
entry_get_patch_address@Base 390.141
#MISSING: 390.141# entry_get_patch_addresses@Base 390.59
entry_get_public@Base 390.59
diff -Nru nvidia-graphics-drivers-legacy-390xx-390.141/debian/libopengl0-glvnd-nvidia.symbols nvidia-graphics-drivers-legacy-390xx-390.141/debian/libopengl0-glvnd-nvidia.symbols
--- nvidia-graphics-drivers-legacy-390xx-390.141/debian/libopengl0-glvnd-nvidia.symbols 2021-01-12 02:08:48.000000000 +0100
+++ nvidia-graphics-drivers-legacy-390xx-390.141/debian/libopengl0-glvnd-nvidia.symbols 2021-03-13 22:39:29.000000000 +0100
@@ -6,7 +6,7 @@
IsTokenInString@Base 390.59
SplitString@Base 390.59
UnionExtensionStrings@Base 390.59
-#MISSING: 390.141# entry_generate_default_code@Base 390.59
+ (arch=ppc64el)entry_generate_default_code@Base 390.59
entry_get_patch_address@Base 390.141
#MISSING: 390.141# entry_get_patch_addresses@Base 390.59
entry_get_public@Base 390.59
diff -Nru nvidia-graphics-drivers-legacy-390xx-390.141/debian/nvidia-alternative.postinst.in nvidia-graphics-drivers-legacy-390xx-390.141/debian/nvidia-alternative.postinst.in
--- nvidia-graphics-drivers-legacy-390xx-390.141/debian/nvidia-alternative.postinst.in 2021-01-12 02:08:48.000000000 +0100
+++ nvidia-graphics-drivers-legacy-390xx-390.141/debian/nvidia-alternative.postinst.in 2021-03-13 22:39:29.000000000 +0100
@@ -80,10 +80,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-legacy-390xx-390.141/debian/nvidia-alternative.triggers.in nvidia-graphics-drivers-legacy-390xx-390.141/debian/nvidia-alternative.triggers.in
--- nvidia-graphics-drivers-legacy-390xx-390.141/debian/nvidia-alternative.triggers.in 2021-01-12 02:08:48.000000000 +0100
+++ nvidia-graphics-drivers-legacy-390xx-390.141/debian/nvidia-alternative.triggers.in 2021-03-13 22:39:29.000000000 +0100
@@ -5,3 +5,5 @@
interest-await /usr/lib/i386-linux-gnu/#PRIVATE#
interest-await /usr/lib/x86_64-linux-gnu/#PRIVATE#
interest-await /usr/lib/arm-linux-gnueabihf/#PRIVATE#
+
+interest-await /usr/include/nvml.h
diff -Nru nvidia-graphics-drivers-legacy-390xx-390.141/debian/watch nvidia-graphics-drivers-legacy-390xx-390.141/debian/watch
--- nvidia-graphics-drivers-legacy-390xx-390.141/debian/watch 2021-01-12 02:08:48.000000000 +0100
+++ nvidia-graphics-drivers-legacy-390xx-390.141/debian/watch 2021-03-13 22:39:29.000000000 +0100
@@ -1,12 +1,16 @@
+version=4
+
# https://download.nvidia.com/XFree86/Linux-x86/190.36/NVIDIA-Linux-x86-190.36-pkg0.run
# https://download.nvidia.com/XFree86/Linux-x86/256.29/NVIDIA-Linux-x86-256.29.run
# https://download.nvidia.com/XFree86/Linux-x86_64/190.36/NVIDIA-Linux-x86_64-190.36-pkg2.run
# https://download.nvidia.com/XFree86/Linux-x86_64/256.29/NVIDIA-Linux-x86_64-256.29.run
# https://download.nvidia.com/XFree86/Linux-32bit-ARM/319.32/NVIDIA-Linux-armv7l-gnueabihf-319.32.run
-version=4
+
opts=component=i386 \
https://download.nvidia.com/XFree86/Linux-x86/(390(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86-(\d[\d\.\-]*)(?:-pkg0)?\.run
+
opts=component=amd64 \
https://download.nvidia.com/XFree86/Linux-x86_64/(390(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86_64-(\d[\d\.\-]*)(?:-pkg2)?\.run
+
opts=component=armhf \
https://download.nvidia.com/XFree86/Linux-32bit-ARM/(390(?:\.[\d\.\-]+)?)/NVIDIA-Linux-armv7l-gnueabihf-(\d[\d\.\-]*).run
diff -Nru nvidia-graphics-drivers-legacy-390xx-390.141/debian/watch.in nvidia-graphics-drivers-legacy-390xx-390.141/debian/watch.in
--- nvidia-graphics-drivers-legacy-390xx-390.141/debian/watch.in 2021-01-12 02:08:48.000000000 +0100
+++ nvidia-graphics-drivers-legacy-390xx-390.141/debian/watch.in 2021-03-13 22:39:29.000000000 +0100
@@ -1,12 +1,16 @@
+version=4
+
# https://download.nvidia.com/XFree86/Linux-x86/190.36/NVIDIA-Linux-x86-190.36-pkg0.run
# https://download.nvidia.com/XFree86/Linux-x86/256.29/NVIDIA-Linux-x86-256.29.run
# https://download.nvidia.com/XFree86/Linux-x86_64/190.36/NVIDIA-Linux-x86_64-190.36-pkg2.run
# https://download.nvidia.com/XFree86/Linux-x86_64/256.29/NVIDIA-Linux-x86_64-256.29.run
# https://download.nvidia.com/XFree86/Linux-32bit-ARM/319.32/NVIDIA-Linux-armv7l-gnueabihf-319.32.run
-version=4
+
opts=component=i386 \
https://download.nvidia.com/XFree86/Linux-x86/(#WATCH_PATTERN#)/NVIDIA-Linux-x86-(\d[\d\.\-]*)(?:-pkg0)?\.run
+
opts=component=amd64 \
https://download.nvidia.com/XFree86/Linux-x86_64/(#WATCH_PATTERN#)/NVIDIA-Linux-x86_64-(\d[\d\.\-]*)(?:-pkg2)?\.run
+
opts=component=armhf \
https://download.nvidia.com/XFree86/Linux-32bit-ARM/(#WATCH_PATTERN#)/NVIDIA-Linux-armv7l-gnueabihf-(\d[\d\.\-]*).run
Reply to: