On 19/03/2022 18.27, Adam D. Barratt wrote:
Please go ahead; thanks.
FTR, the incremental debdiff from 470.103.01-1 to 470.103.01-3~deb11u1
it contains the same additional changes also added with the tesla-450
upload and some preparations for phasing out tesla-460 in favor of
tesla-470.
Having these changes without adding tesla-470 driver and turning
tesla-460 into transitional packages at the same time does no harm
(some Suggests will be gone and nvidia-detect will no longer report
tesla-460 as a candidate while it might mention "you could also install
the tesla-470 driver").
There is also temporarily turning off libnidia-nvvm4 to avoid NEW, which
will be turned on again in ~deb11u2 going through NEW.
Andreas
diff --git a/debian/README.source b/debian/README.source
index 8c92df8a..d48a6fcf 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -17,21 +17,22 @@ Upstream support timeframes
https://nvidia.custhelp.com/app/answers/detail/a_id/3142
https://docs.nvidia.com/datacenter/tesla/drivers/
+ https://web.archive.org/web/20210522000916/https://docs.nvidia.com/datacenter/tesla/drivers/
Driver Series Supported until
- 71 EoL
- 96 EoL
- 173 EoL
+ 71 EoL
+ 96 EoL
+ 173 EoL
304 12/2017 EoL
340 12/2019 EoL
390 12/2022
- Tesla 410 EoL
+ Tesla 410 EoL
Tesla 418 (LTSB) 03/2022
- Tesla 440 11/2020
+ Tesla 440 11/2020 EoL
Tesla 450 (LTSB) 07/2023
- Tesla 460 (PB) 01/2022
+ Tesla 460 (PB) 01/2022 EoL
Tesla 470 (LTSB) 07/2024
- Tesla 510
+ Tesla 510 (PB) 01/2023
The branch structure in the GIT repository
@@ -60,9 +61,10 @@ The branch structure in the GIT repository
450 (bullseye) 460, 450-tesla
450-tesla (bullseye) 460-tesla, tesla-450/master
tesla-450/master bullseye,sid tesla-460/master
- 460 (bullseye) 470, 460-tesla
- 460-tesla (bullseye) 470-tesla, tesla-460/master
- tesla-460/master bullseye,sid tesla-470/master
+ 460 EoL (bullseye) 470, 460-tesla
+ 460-tesla EoL (bullseye) 470-tesla, tesla-460/master
+ tesla-460/master EoL (bullseye),(sid) tesla-470/master, tesla-460/transition-470
+ tesla-460/transition-470 bullseye,sid
470 (bullseye) 510, 470-tesla
470-tesla (bullseye) 510-tesla, tesla-470/master
tesla-470/master bullseye,sid tesla-510/master
diff --git a/debian/changelog b/debian/changelog
index cadd6b76..8f3d76ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+nvidia-graphics-drivers (470.103.01-3~deb11u1) bullseye; urgency=medium
+
+ * Rebuild for bullseye.
+ * Temporarily disable building libnvidia-nvvm4 to avoid NEW.
+
+ -- Andreas Beckmann <a...@debian.org> Sun, 20 Mar 2022 21:38:19 +0100
+
+nvidia-graphics-drivers (470.103.01-3) unstable; urgency=medium
+
+ * dkms.conf: Use a BUILD_EXCLUSIVE equivalent hack to skip building for -rt
+ kernels, not supported upstream (510.54-1).
+ * Declare Testsuite: autopkgtest-pkg-dkms (510.54-1).
+ * nvidia-detect: Drop support for Tesla 460 drivers (EoL).
+
+ -- Andreas Beckmann <a...@debian.org> Thu, 17 Mar 2022 10:27:06 +0100
+
+nvidia-graphics-drivers (470.103.01-2) unstable; urgency=medium
+
+ * Add xorg-video-abi-25 (Xorg Xserver 21) as alternative dependency.
+ (Closes: #1005311)
+ * nvidia-detect: Add support for (Tesla) 470 drivers in bullseye.
+
+ -- Andreas Beckmann <a...@debian.org> Sun, 13 Feb 2022 23:20:24 +0100
+
nvidia-graphics-drivers (470.103.01-1) unstable; urgency=medium
* New upstream production branch release 470.103.01 (2022-01-31).
@@ -62,7 +86,8 @@ nvidia-graphics-drivers (470.82.00-1) unstable; urgency=medium
* Refresh patches.
* bug-script: Show the nvidia and glx alternatives.
* nvidia-alternative: libnvidia-cfg.so.1 on its own is not
- sufficient to activate a nvidia alternative. (Closes: #996595)
+ sufficient to activate a nvidia alternative.
+ (Closes: #996595)
* Fix bashisms in upstream scripts.
* Drop the unusable leftover non-GLVND libegl1-nvidia package.
(Closes: #996763)
@@ -238,9 +263,6 @@ nvidia-graphics-drivers (470.42.01-1) experimental; urgency=medium
- Fixed handling of VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT for
variable size descriptor bindings.
* Fixed crash with certain DisplayPort devices. (Closes: #989069)
- * New upstream release 390 series.
- - Worked around a bug in Meson builds of libglvnd 1.3.0 that caused the
- nvidia_icd.json file to be installed in the wrong location.
[ Andreas Beckmann ]
* Update nv-readme.ids.
@@ -326,6 +348,15 @@ nvidia-graphics-drivers (465.24.02-1) experimental; urgency=medium
-- Andreas Beckmann <a...@debian.org> Tue, 27 Apr 2021 18:48:53 +0200
+nvidia-graphics-drivers (460.106.00-2) UNRELEASED; urgency=medium
+
+ * Backport stdarg.h and stddef.h changes from 495.44 to fix kernel module
+ build for Linux 5.16.
+ * Backport pde_data changes from 470.103.01 to fix kernel module build for
+ Linux 5.17.
+
+ -- Andreas Beckmann <a...@debian.org> Tue, 01 Mar 2022 21:31:18 +0100
+
nvidia-graphics-drivers (460.106.00-1) UNRELEASED; urgency=medium
* New upstream Tesla release 460.106.00 (2021-10-26).
@@ -668,6 +699,14 @@ nvidia-graphics-drivers (455.23.04-1) experimental; urgency=medium
-- Andreas Beckmann <a...@debian.org> Thu, 24 Sep 2020 21:52:54 +0200
+nvidia-graphics-drivers (450.172.01-2) UNRELEASED; urgency=medium
+
+ * Add xorg-video-abi-25 (Xorg Xserver 21) as alternative dependency.
+ * Backport pde_data changes from 470.103.01 to fix kernel module build for
+ Linux 5.17.
+
+ -- Andreas Beckmann <a...@debian.org> Mon, 28 Feb 2022 21:03:12 +0100
+
nvidia-graphics-drivers (450.172.01-1) UNRELEASED; urgency=medium
* New upstream Tesla release 450.172.01 (2022-01-31).
@@ -680,7 +719,7 @@ nvidia-graphics-drivers (450.172.01-1) UNRELEASED; urgency=medium
[ Andreas Beckmann ]
* Refresh patches.
- -- Andreas Beckmann <a...@debian.org> Tue, 01 Feb 2022 22:33:16 +0100
+ -- Andreas Beckmann <a...@debian.org> Thu, 03 Feb 2022 01:35:04 +0100
nvidia-graphics-drivers (450.156.00-1) UNRELEASED; urgency=medium
@@ -1477,6 +1516,15 @@ nvidia-graphics-drivers (430.14-1) experimental; urgency=medium
-- Andreas Beckmann <a...@debian.org> Sat, 25 May 2019 13:49:09 +0200
+nvidia-graphics-drivers (418.226.00-2) UNRELEASED; urgency=medium
+
+ * Backport stdarg.h and stddef.h changes from 495.44 to fix kernel module
+ build for Linux 5.16.
+ * Backport pde_data changes from 470.103.01 to fix kernel module build for
+ Linux 5.17.
+
+ -- Andreas Beckmann <a...@debian.org> Fri, 25 Feb 2022 13:48:18 +0100
+
nvidia-graphics-drivers (418.226.00-1) UNRELEASED; urgency=medium
* New upstream Tesla release 418.226.00 (2021-10-26).
@@ -2130,6 +2178,14 @@ nvidia-graphics-drivers (396.18-1) experimental; urgency=medium
-- Andreas Beckmann <a...@debian.org> Sun, 22 Apr 2018 13:59:45 +0200
+nvidia-graphics-drivers (390.147-2) UNRELEASED; urgency=medium
+
+ * Add xorg-video-abi-25 (Xorg Xserver 21) as alternative dependency.
+ * Backport pde_data changes from 470.103.01 to fix kernel module build for
+ Linux 5.17.
+
+ -- Andreas Beckmann <a...@debian.org> Wed, 16 Feb 2022 18:28:11 +0100
+
nvidia-graphics-drivers (390.147-1) UNRELEASED; urgency=medium
* New upstream legacy branch release 390.147 (2021-12-16).
@@ -4808,6 +4864,9 @@ nvidia-graphics-drivers (343.22-1) experimental; urgency=medium
nvidia-graphics-drivers (340.108-2) UNRELEASED; urgency=medium
+ * Backport pde_data changes from 470.103.01 to fix kernel module build for
+ Linux 5.17.
+
* Backport drm_driver_has_gem_prime_callbacks changes from 460.39 to fix drm
detection for Linux 5.11.
* Backport drm_driver_has_legacy_dev_list changes from 361.16 and disable
diff --git a/debian/control b/debian/control
index b5dd2572..92589d73 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Build-Depends:
Rules-Requires-Root: no
Standards-Version: 4.6.0
Homepage: https://www.nvidia.com
+Testsuite: autopkgtest-pkg-dkms
XS-Autobuild: yes
Package: nvidia-driver
@@ -477,7 +478,6 @@ Depends:
Suggests:
libegl-${nvidia-}0 [i386 amd64 ${arch:arm64} ${arch:ppc64el}]
| libegl-nvidia-tesla-470-0 [i386 amd64 arm64 ppc64el]
- | libegl-nvidia-tesla-460-0 [i386 amd64 arm64 ppc64el]
| libegl-nvidia-tesla-450-0 [i386 amd64 arm64 ppc64el]
| libegl-nvidia-tesla-418-0 [i386 amd64 ppc64el]
| libegl-nvidia-legacy-390xx0 [i386 amd64 armhf],
@@ -548,7 +548,6 @@ Depends:
Suggests:
${nvidia}-vulkan-icd [i386 amd64 ${arch:arm64} ${arch:ppc64el}]
| nvidia-tesla-470-vulkan-icd [i386 amd64 arm64 ppc64el]
- | nvidia-tesla-460-vulkan-icd [i386 amd64 arm64 ppc64el]
| nvidia-tesla-450-vulkan-icd [i386 amd64 arm64 ppc64el]
| nvidia-tesla-418-vulkan-icd [i386 amd64 ppc64el]
| nvidia-legacy-390xx-vulkan-icd [i386 amd64],
@@ -832,20 +831,6 @@ Description: NVIDIA PTX JIT Compiler library${nvidia:VariantDesc}
.
This package contains the runtime PTX JIT Compiler library.
-Package: libnvidia-nvvm4
-Architecture: amd64 arm64
-Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- ${shlibs:Depends}, ${misc:Depends}
-Description: NVIDIA NVVM Compiler library${nvidia:VariantDesc}
- The Compute Unified Device Architecture (CUDA) enables NVIDIA
- graphics processing units (GPUs) to be used for massively parallel
- general purpose computation.
- .
- This package contains the NVVM Compiler library.
-
Package: libnvcuvid1
Architecture: i386 amd64 arm64
Multi-Arch: same
@@ -975,7 +960,6 @@ Depends:
Suggests:
${nvidia}-opencl-icd [i386 amd64 ${arch:arm64} ${arch:ppc64el}]
| nvidia-tesla-470-opencl-icd [i386 amd64 arm64 ppc64el]
- | nvidia-tesla-460-opencl-icd [i386 amd64 arm64 ppc64el]
| nvidia-tesla-450-opencl-icd [i386 amd64 arm64 ppc64el]
| nvidia-tesla-418-opencl-icd [i386 amd64 ppc64el]
| nvidia-legacy-390xx-opencl-icd [i386 amd64],
@@ -1054,6 +1038,6 @@ Depends:
Description: NVIDIA GPU detection utility
The 'nvidia-detect' script in this package checks for an NVIDIA GPU in the
system and recommends one of the non-free accelerated driver meta-packages
- (nvidia-driver, nvidia-tesla-470-driver, nvidia-tesla-460-driver,
+ (nvidia-driver, nvidia-tesla-470-driver,
nvidia-tesla-450-driver, nvidia-tesla-418-driver,
or nvidia-legacy-390xx-driver) for installation.
diff --git a/debian/control.in b/debian/control.in
index ffea42e0..43aca5bf 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -21,6 +21,7 @@ Build-Depends:
Rules-Requires-Root: no
Standards-Version: 4.6.0
Homepage: https://www.nvidia.com
+Testsuite: autopkgtest-pkg-dkms
XS-Autobuild: yes
Package: ${nvidia}-driver
@@ -632,7 +633,6 @@ Depends:
Suggests:
libegl-${nvidia-}0 [i386 amd64 ${arch:arm64} ${arch:ppc64el}]
| libegl-nvidia-tesla-470-0 [i386 amd64 arm64 ppc64el]
- | libegl-nvidia-tesla-460-0 [i386 amd64 arm64 ppc64el]
| libegl-nvidia-tesla-450-0 [i386 amd64 arm64 ppc64el]
| libegl-nvidia-tesla-418-0 [i386 amd64 ppc64el]
| libegl-nvidia-legacy-390xx0 [i386 amd64 armhf],
@@ -703,7 +703,6 @@ Depends:
Suggests:
${nvidia}-vulkan-icd [i386 amd64 ${arch:arm64} ${arch:ppc64el}]
| nvidia-tesla-470-vulkan-icd [i386 amd64 arm64 ppc64el]
- | nvidia-tesla-460-vulkan-icd [i386 amd64 arm64 ppc64el]
| nvidia-tesla-450-vulkan-icd [i386 amd64 arm64 ppc64el]
| nvidia-tesla-418-vulkan-icd [i386 amd64 ppc64el]
| nvidia-legacy-390xx-vulkan-icd [i386 amd64],
@@ -989,7 +988,7 @@ Description: NVIDIA PTX JIT Compiler library${nvidia:VariantDesc}
This package contains the runtime PTX JIT Compiler library.
Package: lib${nvidia}-nvvm4
-Architecture: amd64 ${arch:arm64} ${arch:ppc64el}
+Architecture: #amd64 ${arch:arm64} ${arch:ppc64el}
Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends}
@@ -1131,7 +1130,6 @@ Depends:
Suggests:
${nvidia}-opencl-icd [i386 amd64 ${arch:arm64} ${arch:ppc64el}]
| nvidia-tesla-470-opencl-icd [i386 amd64 arm64 ppc64el]
- | nvidia-tesla-460-opencl-icd [i386 amd64 arm64 ppc64el]
| nvidia-tesla-450-opencl-icd [i386 amd64 arm64 ppc64el]
| nvidia-tesla-418-opencl-icd [i386 amd64 ppc64el]
| nvidia-legacy-390xx-opencl-icd [i386 amd64],
@@ -1210,6 +1208,6 @@ Depends:
Description: NVIDIA GPU detection utility
The 'nvidia-detect' script in this package checks for an NVIDIA GPU in the
system and recommends one of the non-free accelerated driver meta-packages
- (nvidia-driver, nvidia-tesla-470-driver, nvidia-tesla-460-driver,
+ (nvidia-driver, nvidia-tesla-470-driver,
nvidia-tesla-450-driver, nvidia-tesla-418-driver,
or nvidia-legacy-390xx-driver) for installation.
diff --git a/debian/control.md5sum b/debian/control.md5sum
index 63f661c1..e85f5975 100644
--- a/debian/control.md5sum
+++ b/debian/control.md5sum
@@ -1,5 +1,5 @@
-04be5ac4370cbcdb843193aefc738406 debian/control
-354ed319d6143ed13717578fcf0706c9 debian/control.in
+1b15b6d578bf004698b1cdd49012cfe7 debian/control
+b1f7cd5e8b23e3ee08365cd8fd61e04f debian/control.in
8489c83cfe0171c9de6d052c01a6d19b debian/gen-control.pl
-2e45e5465b973867ce6f1333e69300ab debian/rules
-68d05284975ff5ec1f786a8ba05b30ff debian/rules.defs
+5a54e482ae39ca84d9b0836de8c61a0a debian/rules
+3c3234ece7734c038dfa2d03900cbd23 debian/rules.defs
diff --git a/debian/copyright b/debian/copyright
index 524a82d1..b357ce9a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,7 +16,7 @@ Disclaimer:
Files:
amd64/*
arm64/*
-Copyright: 1993-2021 NVIDIA Corporation. All rights reserved.
+Copyright: 1993-2022 NVIDIA Corporation. All rights reserved.
License: NVIDIA-graphics-drivers
Files: supported-gpus/supported-gpus.json
@@ -36,7 +36,7 @@ License: GPL-2.0+
Files: debian/detect/nvidia-detect.in
Copyright: © 2008-2011 Filipus Klutiero <chea...@gmail.com>
- © 2011-2021 Andreas Beckmann <a...@debian.org>
+ © 2011-2022 Andreas Beckmann <a...@debian.org>
License: GPL-2.0+
Files: debian/module/debian/patches/* debian/patches/*
diff --git a/debian/detect/nvidia-470.ids b/debian/detect/nvidia-470.ids
new file mode 100644
index 00000000..5c4817cc
--- /dev/null
+++ b/debian/detect/nvidia-470.ids
@@ -0,0 +1,369 @@
+10DE0FC0
+10DE0FC1
+10DE0FC2
+10DE0FC6
+10DE0FC8
+10DE0FC9
+10DE0FD2
+10DE0FE3
+10DE0FF3
+10DE0FF9
+10DE0FFA
+10DE0FFD
+10DE0FFE
+10DE0FFF
+10DE1001
+10DE1004
+10DE1005
+10DE1007
+10DE1008
+10DE100A
+10DE100C
+10DE1021
+10DE1022
+10DE1023
+10DE1024
+10DE1026
+10DE1027
+10DE1028
+10DE1029
+10DE102A
+10DE102D
+10DE103A
+10DE103C
+10DE1180
+10DE1183
+10DE1184
+10DE1185
+10DE1187
+10DE1188
+10DE1189
+10DE118A
+10DE118E
+10DE118F
+10DE1193
+10DE1194
+10DE1195
+10DE1199
+10DE11B4
+10DE11BA
+10DE11C0
+10DE11C2
+10DE11C3
+10DE11C4
+10DE11C5
+10DE11C6
+10DE11C8
+10DE11CB
+10DE11E3
+10DE11FA
+10DE1280
+10DE1281
+10DE1282
+10DE1284
+10DE1286
+10DE1287
+10DE1288
+10DE1289
+10DE128B
+10DE1290
+10DE1292
+10DE1295
+10DE1299
+10DE1340
+10DE1341
+10DE1344
+10DE1346
+10DE1347
+10DE1348
+10DE1349
+10DE134B
+10DE134D
+10DE134E
+10DE134F
+10DE137A
+10DE137B
+10DE137D
+10DE1380
+10DE1381
+10DE1382
+10DE1390
+10DE1391
+10DE1392
+10DE1393
+10DE1398
+10DE1399
+10DE139A
+10DE139B
+10DE139C
+10DE139D
+10DE13B0
+10DE13B1
+10DE13B2
+10DE13B3
+10DE13B4
+10DE13B6
+10DE13B9
+10DE13BA
+10DE13BB
+10DE13BC
+10DE13C0
+10DE13C2
+10DE13D7
+10DE13D8
+10DE13D9
+10DE13DA
+10DE13F0
+10DE13F1
+10DE13F2
+10DE13F3
+10DE13F8
+10DE13F9
+10DE13FA
+10DE13FB
+10DE1401
+10DE1402
+10DE1406
+10DE1407
+10DE1427
+10DE1430
+10DE1431
+10DE1436
+10DE15F0
+10DE15F7
+10DE15F8
+10DE15F9
+10DE1617
+10DE1618
+10DE1619
+10DE161A
+10DE1667
+10DE174D
+10DE174E
+10DE179C
+10DE17C2
+10DE17C8
+10DE17F0
+10DE17F1
+10DE17FD
+10DE1B00
+10DE1B02
+10DE1B06
+10DE1B30
+10DE1B38
+10DE1B80
+10DE1B81
+10DE1B82
+10DE1B83
+10DE1B84
+10DE1B87
+10DE1BA0
+10DE1BA1
+10DE1BA2
+10DE1BB0
+10DE1BB1
+10DE1BB3
+10DE1BB4
+10DE1BB5
+10DE1BB6
+10DE1BB7
+10DE1BB8
+10DE1BB9
+10DE1BBB
+10DE1BC7
+10DE1BE0
+10DE1BE1
+10DE1C02
+10DE1C03
+10DE1C04
+10DE1C06
+10DE1C07
+10DE1C09
+10DE1C20
+10DE1C21
+10DE1C22
+10DE1C23
+10DE1C30
+10DE1C31
+10DE1C60
+10DE1C61
+10DE1C62
+10DE1C81
+10DE1C82
+10DE1C83
+10DE1C8C
+10DE1C8D
+10DE1C8F
+10DE1C90
+10DE1C91
+10DE1C92
+10DE1C94
+10DE1C96
+10DE1CB1
+10DE1CB2
+10DE1CB3
+10DE1CB6
+10DE1CBA
+10DE1CBB
+10DE1CBC
+10DE1CBD
+10DE1CFA
+10DE1CFB
+10DE1D01
+10DE1D02
+10DE1D10
+10DE1D11
+10DE1D12
+10DE1D13
+10DE1D16
+10DE1D33
+10DE1D34
+10DE1D52
+10DE1D81
+10DE1DB1
+10DE1DB3
+10DE1DB4
+10DE1DB5
+10DE1DB6
+10DE1DB7
+10DE1DB8
+10DE1DBA
+10DE1DF0
+10DE1DF2
+10DE1DF5
+10DE1DF6
+10DE1E02
+10DE1E04
+10DE1E07
+10DE1E09
+10DE1E30
+10DE1E36
+10DE1E78
+10DE1E81
+10DE1E82
+10DE1E84
+10DE1E87
+10DE1E89
+10DE1E90
+10DE1E91
+10DE1E93
+10DE1EB0
+10DE1EB1
+10DE1EB4
+10DE1EB5
+10DE1EB6
+10DE1EB8
+10DE1EC2
+10DE1EC7
+10DE1ED0
+10DE1ED1
+10DE1ED3
+10DE1EF5
+10DE1F02
+10DE1F03
+10DE1F06
+10DE1F07
+10DE1F08
+10DE1F09
+10DE1F0A
+10DE1F0B
+10DE1F10
+10DE1F11
+10DE1F12
+10DE1F14
+10DE1F15
+10DE1F36
+10DE1F42
+10DE1F47
+10DE1F50
+10DE1F51
+10DE1F54
+10DE1F55
+10DE1F76
+10DE1F82
+10DE1F91
+10DE1F95
+10DE1F96
+10DE1F97
+10DE1F98
+10DE1F99
+10DE1F9C
+10DE1F9D
+10DE1F9F
+10DE1FA0
+10DE1FB0
+10DE1FB1
+10DE1FB2
+10DE1FB8
+10DE1FB9
+10DE1FBA
+10DE1FBB
+10DE1FBC
+10DE1FDD
+10DE1FF0
+10DE1FF2
+10DE1FF9
+10DE20B0
+10DE20B1
+10DE20B2
+10DE20B3
+10DE20B5
+10DE20B6
+10DE20B7
+10DE20F0
+10DE20F1
+10DE20F2
+10DE2182
+10DE2184
+10DE2187
+10DE2188
+10DE2189
+10DE2191
+10DE2192
+10DE21C4
+10DE21D1
+10DE2204
+10DE2206
+10DE2208
+10DE220D
+10DE2216
+10DE2230
+10DE2231
+10DE2232
+10DE2235
+10DE2236
+10DE2237
+10DE2482
+10DE2484
+10DE2486
+10DE2487
+10DE2488
+10DE2489
+10DE248A
+10DE249C
+10DE249D
+10DE24B0
+10DE24B6
+10DE24B7
+10DE24B8
+10DE24DC
+10DE24DD
+10DE2503
+10DE2504
+10DE2520
+10DE2523
+10DE2531
+10DE2560
+10DE2563
+10DE2571
+10DE25A0
+10DE25A2
+10DE25A5
+10DE25A6
+10DE25A7
+10DE25A9
+10DE25B6
+10DE25B8
+10DE25E0
+10DE25E2
+10DE25E5
diff --git a/debian/detect/nvidia-detect.in b/debian/detect/nvidia-detect.in
index 3a67c845..28ae8947 100644
--- a/debian/detect/nvidia-detect.in
+++ b/debian/detect/nvidia-detect.in
@@ -2,7 +2,7 @@
# Based on https://wiki.debian.org/NvidiaGraphicsDrivers?action=AttachFile&do=view&target=nvidia-versions.sh
#
# Copyright © 2008-2011 Filipus Klutiero <chea...@gmail.com>
-# Copyright © 2011-2021 Andreas Beckmann <a...@debian.org>
+# Copyright © 2011-2022 Andreas Beckmann <a...@debian.org>
#
# This package is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -98,6 +98,11 @@ then
VERSIONS[461]=460.32.03
fi
+if grep -q -i $NVGA $IDLISTDIR/nvidia-470.ids 2>/dev/null
+then
+ VERSIONS[470]=470.103.01
+fi
+
if grep -q -i $NVGA $IDLISTDIR/nvidia-tesla-470.ids 2>/dev/null
then
VERSIONS[471]=470.57.02
@@ -195,10 +200,6 @@ fi
echo "Your card is supported by the Tesla 470 drivers series in buster-backports."
echo "See https://backports.debian.org for instructions how to use backports."
PACKAGE="nvidia-tesla-470-driver/buster-backports"
- elif [[ -n ${VERSIONS[461]} ]]; then
- echo "Your card is supported by the Tesla 460 drivers series in buster-backports."
- echo "See https://backports.debian.org for instructions how to use backports."
- PACKAGE="nvidia-tesla-460-driver/buster-backports"
elif [[ -n ${VERSIONS[451]} ]]; then
echo "Your card is supported by the Tesla 450 drivers series in buster-backports."
echo "See https://backports.debian.org for instructions how to use backports."
@@ -220,13 +221,17 @@ fi
fi
elif grep -q "bullseye\|^11" /etc/debian_version
then
- if [[ -n ${VERSIONS[999]} ]]; then
+ if [[ -n ${VERSIONS[470]} ]]; then
if [[ -n ${VERSIONS[390]} ]]; then
echo "Your card is supported by all driver versions."
else
echo "Your card is supported by the default drivers."
fi
PACKAGE="nvidia-driver"
+ elif [[ -n ${VERSIONS[999]} ]]; then
+ echo "Your card is only supported by the updated drivers from bullseye-backports."
+ echo "See https://backports.debian.org for instructions how to use backports."
+ PACKAGE="nvidia-driver/bullseye-backports"
elif [[ -n ${VERSIONS[390]} ]]; then
echo "Your card is only supported up to the 390 legacy drivers series."
PACKAGE="nvidia-legacy-390xx-driver"
@@ -237,9 +242,6 @@ fi
elif [[ -n ${VERSIONS[471]} ]]; then
echo "Your card is supported by the Tesla 470 drivers series."
PACKAGE="nvidia-tesla-470-driver"
- elif [[ -n ${VERSIONS[461]} ]]; then
- echo "Your card is supported by the Tesla 460 drivers series."
- PACKAGE="nvidia-tesla-460-driver"
elif [[ -n ${VERSIONS[451]} ]]; then
echo "Your card is supported by the Tesla 450 drivers series."
PACKAGE="nvidia-tesla-450-driver"
@@ -262,9 +264,6 @@ fi
if [ -n "$PACKAGE" ] && [ "$PACKAGE" != "nvidia-tesla-470-driver" ] && [[ -n ${VERSIONS[471]} ]]; then
echo "Your card is also supported by the Tesla 470 drivers series."
fi
- if [ -n "$PACKAGE" ] && [ "$PACKAGE" != "nvidia-tesla-460-driver" ] && [[ -n ${VERSIONS[461]} ]]; then
- echo "Your card is also supported by the Tesla 460 drivers series."
- fi
if [ -n "$PACKAGE" ] && [ "$PACKAGE" != "nvidia-tesla-450-driver" ] && [[ -n ${VERSIONS[451]} ]]; then
echo "Your card is also supported by the Tesla 450 drivers series."
fi
@@ -290,9 +289,6 @@ fi
elif [[ -n ${VERSIONS[471]} ]]; then
echo "Your card is supported by the Tesla 470 drivers series."
PACKAGE="nvidia-tesla-470-driver"
- elif [[ -n ${VERSIONS[461]} ]]; then
- echo "Your card is supported by the Tesla 460 drivers series."
- PACKAGE="nvidia-tesla-460-driver"
elif [[ -n ${VERSIONS[451]} ]]; then
echo "Your card is supported by the Tesla 450 drivers series."
PACKAGE="nvidia-tesla-450-driver"
@@ -315,9 +311,6 @@ fi
if [ -n "$PACKAGE" ] && [ "$PACKAGE" != "nvidia-tesla-470-driver" ] && [[ -n ${VERSIONS[471]} ]]; then
echo "Your card is also supported by the Tesla 470 drivers series."
fi
- if [ -n "$PACKAGE" ] && [ "$PACKAGE" != "nvidia-tesla-460-driver" ] && [[ -n ${VERSIONS[461]} ]]; then
- echo "Your card is also supported by the Tesla 460 drivers series."
- fi
if [ -n "$PACKAGE" ] && [ "$PACKAGE" != "nvidia-tesla-450-driver" ] && [[ -n ${VERSIONS[451]} ]]; then
echo "Your card is also supported by the Tesla 450 drivers series."
fi
diff --git a/debian/detect/nvidia-tesla-470.ids b/debian/detect/nvidia-tesla-470.ids
index f2552995..5c4817cc 100644
--- a/debian/detect/nvidia-tesla-470.ids
+++ b/debian/detect/nvidia-tesla-470.ids
@@ -260,6 +260,7 @@
10DE1ED3
10DE1EF5
10DE1F02
+10DE1F03
10DE1F06
10DE1F07
10DE1F08
@@ -288,6 +289,8 @@
10DE1F99
10DE1F9C
10DE1F9D
+10DE1F9F
+10DE1FA0
10DE1FB0
10DE1FB1
10DE1FB2
@@ -297,6 +300,8 @@
10DE1FBB
10DE1FBC
10DE1FDD
+10DE1FF0
+10DE1FF2
10DE1FF9
10DE20B0
10DE20B1
@@ -324,6 +329,7 @@
10DE2216
10DE2230
10DE2231
+10DE2232
10DE2235
10DE2236
10DE2237
@@ -349,9 +355,13 @@
10DE2531
10DE2560
10DE2563
+10DE2571
10DE25A0
10DE25A2
10DE25A5
+10DE25A6
+10DE25A7
+10DE25A9
10DE25B6
10DE25B8
10DE25E0
diff --git a/debian/module/debian/patches/nvidia-use-ARCH.o_binary.patch b/debian/module/debian/patches/nvidia-use-ARCH.o_binary.patch
index a20cb201..899f0d79 100644
--- a/debian/module/debian/patches/nvidia-use-ARCH.o_binary.patch
+++ b/debian/module/debian/patches/nvidia-use-ARCH.o_binary.patch
@@ -5,7 +5,7 @@ Description: Select the correct nv-kernel.o blob for the target architecture
--- a/nvidia/nvidia.Kbuild
+++ b/nvidia/nvidia.Kbuild
-@@ -37,7 +37,10 @@
+@@ -37,7 +37,10 @@ NVIDIA_KO = nvidia/nvidia.ko
# and needs to be re-executed.
#
diff --git a/debian/module/debian/patches/use-kbuild-flags.patch b/debian/module/debian/patches/use-kbuild-flags.patch
index 9d2d5775..af1345be 100644
--- a/debian/module/debian/patches/use-kbuild-flags.patch
+++ b/debian/module/debian/patches/use-kbuild-flags.patch
@@ -15,7 +15,7 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
NV_CONFTEST_COMPILE_TEST_HEADERS += $(obj)/conftest/functions.h
--- a/nvidia/nvidia.Kbuild
+++ b/nvidia/nvidia.Kbuild
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ always += $(NVIDIA_INTERFACE)
always-y += $(NVIDIA_INTERFACE)
$(obj)/$(NVIDIA_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_OBJECTS))
@@ -26,7 +26,7 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
#
--- a/Makefile
+++ b/Makefile
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ else
# cannot be defined in the *Kbuild files, which are only used during stage 1.
%-linux.o: modules
@@ -37,7 +37,7 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS
# Kbuild's "clean" rule won't clean up the conftest headers on its own, and
--- a/nvidia-modeset/nvidia-modeset.Kbuild
+++ b/nvidia-modeset/nvidia-modeset.Kbuild
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ always += $(NVIDIA_MODESET_INTERFACE)
always-y += $(NVIDIA_MODESET_INTERFACE)
$(obj)/$(NVIDIA_MODESET_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_MODESET_OBJECTS))
diff --git a/debian/module/debian/patches/use-kbuild-gcc-plugins.patch b/debian/module/debian/patches/use-kbuild-gcc-plugins.patch
index dfc3c2ca..18979f2d 100644
--- a/debian/module/debian/patches/use-kbuild-gcc-plugins.patch
+++ b/debian/module/debian/patches/use-kbuild-gcc-plugins.patch
@@ -4,7 +4,7 @@ Description: ignore GCC plugins
CONFIG_GCC_PLUGIN_STRUCTLEAK and CONFIG_GCC_PLUGIN_RANDSTRUCT.
--- a/Kbuild
+++ b/Kbuild
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST
NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags)
NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie
diff --git a/debian/not-installed.in b/debian/not-installed.in
index c73e5575..68839cfa 100644
--- a/debian/not-installed.in
+++ b/debian/not-installed.in
@@ -1,3 +1,4 @@
+# upstream packaging
.manifest
LICENSE
supported-gpus/LICENSE
@@ -8,15 +9,19 @@ nvidia-installer
nvidia-installer.1
pkg-history.txt
+# installed by dh_installchangelogs
NVIDIA_Changelog
+# built from src:nvidia-modprobe
nvidia-modprobe
nvidia-modprobe.1
+# built from src:nvidia-persistenced
nvidia-persistenced
nvidia-persistenced-init.tar.bz2
nvidia-persistenced.1
+# built from src:nvidia-settings*
nvidia-settings
nvidia-settings.1
nvidia-settings.desktop
@@ -24,16 +29,15 @@ nvidia-settings.png
libnvidia-gtk2.so.#VERSION#
libnvidia-gtk3.so.#VERSION#
+# built from src:nvidia-xconfig
nvidia-xconfig
nvidia-xconfig.1
-nvidia-ngx-updater
-
+# built from src:egl-wayland
libnvidia-egl-wayland.so.1.*.*
10_nvidia_wayland.json
-libEGL.so.#VERSION#
-
+# built from src:libglvnd
libEGL.so.1.1.0
libGL.so.1.7.0
libGLESv1_CM.so.1.2.0
@@ -41,3 +45,11 @@ libGLESv2.so.2.1.0
libGLX.so.0
libGLdispatch.so.0
libOpenGL.so.0
+
+# not shipped
+
+nvidia-ngx-updater
+
+libEGL.so.#VERSION#
+
+libnvidia-nvvm.so.4.0.0
diff --git a/debian/nvidia-detect.install b/debian/nvidia-detect.install
index 8b7afc5d..9a1d1cff 100755
--- a/debian/nvidia-detect.install
+++ b/debian/nvidia-detect.install
@@ -6,5 +6,6 @@ debian/detect/nvidia-tesla-418.ids usr/share/nvidia/ [amd64 ppc64el]
debian/detect/nvidia-tesla-440.ids usr/share/nvidia/ [amd64 ppc64el]
debian/detect/nvidia-tesla-450.ids usr/share/nvidia/ [amd64 arm64 ppc64el]
debian/detect/nvidia-tesla-460.ids usr/share/nvidia/ [amd64 arm64 ppc64el]
+debian/detect/nvidia-470.ids usr/share/nvidia/ [amd64 arm64]
debian/detect/nvidia-tesla-470.ids usr/share/nvidia/ [amd64 arm64 ppc64el]
nvidia.ids usr/share/nvidia/ [!ppc64el]
diff --git a/debian/nvidia-kernel-dkms.dkms.in b/debian/nvidia-kernel-dkms.dkms.in
index de7e3fe6..fb7899c7 100644
--- a/debian/nvidia-kernel-dkms.dkms.in
+++ b/debian/nvidia-kernel-dkms.dkms.in
@@ -3,6 +3,10 @@
PACKAGE_NAME="#MODULE#"
PACKAGE_VERSION="#VERSION#"
+# The NVIDIA driver does not support real-time kernels.
+# Can't easily set this via BUILD_EXCLUSIVE.
+[[ "$kernelver" =~ "-rt-" ]] && build_exclude="yes"
+
AUTOINSTALL=yes
PATCH=(#MODULE_PATCHES#)
diff --git a/debian/rules b/debian/rules
index 7ba683e5..20fec556 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,7 @@ ALL_CONTROL := $(wildcard $(patsubst %,debian/%*,$(CONTROL_PREFIXES)))
LEGACY_CONTROL := $(wildcard $(patsubst %,debian/%*,$(CONTROL_PREFIXES_RENAMED)))
RENAME_CONTROL = $(filter-out $(LEGACY_CONTROL),$(ALL_CONTROL))
RENAMED_CONTROL = $(foreach f,$(RENAME_CONTROL),$(call applyprefixrenamelist,$f,$(CONTROL_PREFIXES)))
-TEMPLATES := $(wildcard debian/*.in debian/module/debian/*.in debian/module/debian/patches/*.in debian/detect/*.in)
+TEMPLATES := $(wildcard debian/*.in debian/module/debian/*.in debian/module/debian/patches/*.in debian/detect/*.in debian/tests/*.in)
AUTOGEN += $(patsubst %.in,%,$(TEMPLATES))
AUTOGEN += debian/module/debian/changelog
AUTOGEN += debian/module/debian/bug-control
@@ -100,7 +100,9 @@ AUTOGEN += debian/bug-control
AUTOGEN += debian/substvars
AUTOGEN += $(if $(has_vulkan),nonglvnd/nvidia_icd.json)
AUTOGEN += $(AUTOKEEP)
-AUTOKEEP = debian/watch debian/control
+AUTOKEEP = debian/watch
+AUTOKEEP += debian/tests/autopkgtest-pkg-dkms.conf
+AUTOKEEP += debian/control
AUTOCLEAN = $(filter-out $(AUTOKEEP),$(AUTOGEN))
empty =
diff --git a/debian/rules.defs b/debian/rules.defs
index 384d31b3..2948735d 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -7,10 +7,10 @@ WATCH_VERSION = 470
NVIDIA_SETTINGS = nvidia-settings (>= $(version_major))
NVIDIA_LEGACY_CHECK = nvidia-legacy-check (>= 396) [amd64]
-XORG_ABI_LIST = 24 23 20 19 18 15 14 13 12 11 10 8 6.0
-XORG_BOUND = (<< 2:1.20.99)
+XORG_ABI_LIST = 25 24 23 20 19 18 15 14 13 12 11 10 8 6.0
+XORG_BOUND = (<< 2:21.99)
-LINUX_KMOD_TESTED = 5.16
+LINUX_KMOD_TESTED = 5.17
ARCH_LIST = amd64
ARCH_LIST += i386
diff --git a/debian/tests/autopkgtest-pkg-dkms.conf b/debian/tests/autopkgtest-pkg-dkms.conf
new file mode 100644
index 00000000..b9d4697a
--- /dev/null
+++ b/debian/tests/autopkgtest-pkg-dkms.conf
@@ -0,0 +1 @@
+architecture = amd64 arm64
diff --git a/debian/tests/autopkgtest-pkg-dkms.conf.in b/debian/tests/autopkgtest-pkg-dkms.conf.in
new file mode 100644
index 00000000..5062b82d
--- /dev/null
+++ b/debian/tests/autopkgtest-pkg-dkms.conf.in
@@ -0,0 +1 @@
+architecture = #ARCH_LIST#
diff --git a/debian/changelog b/debian/changelog
index 8f3d76ea..6200157b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers (470.103.01-3~deb11u2) UNRELEASED; urgency=medium
+
+ * Re-enable building libnvidia-nvvm4.
+
+ -- Andreas Beckmann <a...@debian.org> Mon, 21 Mar 2022 04:32:26 +0100
+
nvidia-graphics-drivers (470.103.01-3~deb11u1) bullseye; urgency=medium
* Rebuild for bullseye.
diff --git a/debian/control b/debian/control
index 92589d73..d4e69f14 100644
--- a/debian/control
+++ b/debian/control
@@ -831,6 +831,20 @@ Description: NVIDIA PTX JIT Compiler library${nvidia:VariantDesc}
.
This package contains the runtime PTX JIT Compiler library.
+Package: libnvidia-nvvm4
+Architecture: amd64 arm64
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
+Depends:
+ ${shlibs:Depends}, ${misc:Depends}
+Description: NVIDIA NVVM Compiler library${nvidia:VariantDesc}
+ The Compute Unified Device Architecture (CUDA) enables NVIDIA
+ graphics processing units (GPUs) to be used for massively parallel
+ general purpose computation.
+ .
+ This package contains the NVVM Compiler library.
+
Package: libnvcuvid1
Architecture: i386 amd64 arm64
Multi-Arch: same
diff --git a/debian/control.in b/debian/control.in
index 43aca5bf..524ca5c0 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -988,7 +988,7 @@ Description: NVIDIA PTX JIT Compiler library${nvidia:VariantDesc}
This package contains the runtime PTX JIT Compiler library.
Package: lib${nvidia}-nvvm4
-Architecture: #amd64 ${arch:arm64} ${arch:ppc64el}
+Architecture: amd64 ${arch:arm64} ${arch:ppc64el}
Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends}
diff --git a/debian/control.md5sum b/debian/control.md5sum
index e85f5975..4d033041 100644
--- a/debian/control.md5sum
+++ b/debian/control.md5sum
@@ -1,5 +1,5 @@
-1b15b6d578bf004698b1cdd49012cfe7 debian/control
-b1f7cd5e8b23e3ee08365cd8fd61e04f debian/control.in
+2545a2b30fc250a0054191467fc81012 debian/control
+2012c1284827c60a8320051e7dbe1a5a debian/control.in
8489c83cfe0171c9de6d052c01a6d19b debian/gen-control.pl
5a54e482ae39ca84d9b0836de8c61a0a debian/rules
3c3234ece7734c038dfa2d03900cbd23 debian/rules.defs
diff --git a/debian/not-installed.in b/debian/not-installed.in
index 68839cfa..d2806c03 100644
--- a/debian/not-installed.in
+++ b/debian/not-installed.in
@@ -51,5 +51,3 @@ libOpenGL.so.0
nvidia-ngx-updater
libEGL.so.#VERSION#
-
-libnvidia-nvvm.so.4.0.0
