Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock the nvidia package stack. I've just finished uploading a bunch of new upstream releases of the nvidia driver packages to non-free (and supporting packages to contrib) fixing CVE-2021-1093, CVE-2021-1094, CVE-2021-1095. Further packaging changes: * adding Recommends on the libnvidia*-encode1 library. Several multimedia applications are built with nvidia encode support and can dlopen the library at runtime (if available) to use hardware acceleration for video encoding * computing the Vcs-Git branch while generating debian/control, something I usually forgot to update when forking off a new driver source package The nvidia-settings updates are mostly version bumps. I'm only attaching git diffs for nvidia-graphics-drivers/460.91.03-1 and nvidia-settings/460.91.03-1, the other ones are very similar. unblock nvidia-graphics-drivers/460.91.03-1 unblock nvidia-settings/460.91.03-1 unblock nvidia-graphics-drivers-tesla-460/460.91.03-1 unblock nvidia-settings-tesla-460/460.91.03-1 unblock nvidia-graphics-drivers-tesla-450/450.142.00-1 unblock nvidia-graphics-drivers-tesla-418/418.211.00-1 unblock nvidia-graphics-drivers-legacy-390xx/390.144-1 unblock nvidia-settings-legacy-390xx/390.144-1 Andreas
diff --git a/debian/changelog b/debian/changelog index 1d10198f..28614181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,55 @@ +nvidia-graphics-drivers (460.91.03-1) unstable; urgency=medium + + * New upstream production branch release 460.91.03 (2021-07-20). + * Fixed CVE-2021-1093, CVE-2021-1094, CVE-2021-1095. (Closes: #991351) + https://nvidia.custhelp.com/app/answers/detail/a_id/5211 + - Added support for the following GPUs: GeForce RTX 3070 Ti, CMP 50HX. + * Fixed crash with certain DisplayPort devices. (Closes: #989069) + + [ Andreas Beckmann ] + * Update nv-readme.ids. + * Drop manually added Depends: libcuda1 from libraries not referencing it. + * nvidia-driver-libs: Add Recommends: libnvidia-encode1. (Closes: #989885) + * debian/gen-control.pl: Support substitutions in the Vcs-Git field. + * Compute and substitute the Git branch instead of hardcoding it. + + -- Andreas Beckmann <a...@debian.org> Sat, 24 Jul 2021 01:25:40 +0200 + +nvidia-graphics-drivers (460.84-1) unstable; urgency=medium + + * New upstream production branch release 460.84 (2021-06-03). + - Added support for the following GPU: GeForce RTX 3080 Ti. + + [ Andreas Beckmann ] + * Update nv-readme.ids. + * Update lintian overrides. + + -- Andreas Beckmann <a...@debian.org> Sat, 05 Jun 2021 03:30:17 +0200 + +nvidia-graphics-drivers (460.80-1) unstable; urgency=medium + + * New upstream production branch release 460.80 (2021-05-11). + - Fixed a bug that could cause AddressSanitizer to report a + heap-buffer-overflow during initialization of the OpenGL and Vulkan + libraries. + - Added support for the following GPUs: GeForce RTX 3050 Ti Laptop GPU, + GeForce RTX 3050 Laptop GPU, T600 Laptop GPU, T1200 Laptop GPU, + RTX A5000 Laptop GPU, RTX A4000 Laptop GPU, RTX A3000 Laptop GPU, + RTX A2000 Laptop GPU. + - Fixed a bug that could prevent a system from resuming from suspend + when DisplayPort activity occurred while the system was suspended. + - Fixed a regression that prevented eglQueryDevicesEXT from correctly + enumerating GPUs on systems with multiple GPUs where access to the + GPU device files was restricted for some GPUs. + - Fixed a regression that could cause system hangs when changing display + resolution on SLI Mosaic configurations. + + [ Luca Boccassi ] + * Update nv-readme.ids. + * Refresh kmods patches to remove fuzz. + + -- Andreas Beckmann <a...@debian.org> Fri, 21 May 2021 22:21:31 +0200 + nvidia-graphics-drivers (460.73.01-1) unstable; urgency=medium * New upstream production branch release 460.73.01 (2021-04-14). @@ -27,8 +79,8 @@ nvidia-graphics-drivers (460.67-1) unstable; urgency=medium nvidia-graphics-drivers (460.56-2) unstable; urgency=medium - * Add libnvidia-ml.so slave alternative if libnvidia-ml-dev is installed. - (Closes: #984881) + * nvidia-alternative: Add libnvidia-ml.so slave alternative if + libnvidia-ml-dev is installed. (Closes: #984881) -- Andreas Beckmann <a...@debian.org> Wed, 10 Mar 2021 21:03:59 +0100 @@ -275,6 +327,25 @@ 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.142.00-1) UNRELEASED; urgency=medium + + * New upstream Tesla release 450.142.00 (2021-07-20). + * Fixed CVE-2021-1093, CVE-2021-1094, CVE-2021-1095. + https://nvidia.custhelp.com/app/answers/detail/a_id/5211 + - Fixed a bug that could result in blank displays when driving multiple + displays at the same resolution using active DisplayPort dongles. + + [ Andreas Beckmann ] + * Refresh patches. + + -- Andreas Beckmann <a...@debian.org> Fri, 23 Jul 2021 22:54:44 +0200 + +nvidia-graphics-drivers (450.119.04-1) UNRELEASED; urgency=medium + + * New upstream Tesla release 450.119.04 (2021-05-04). + + -- Andreas Beckmann <a...@debian.org> Thu, 20 May 2021 13:53:07 +0200 + nvidia-graphics-drivers (450.119.03-1) UNRELEASED; urgency=medium * New upstream Tesla release 450.119.03 (2021-04-19). @@ -1034,6 +1105,24 @@ 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.211.00-1) buster; urgency=medium + + * New upstream Tesla release 418.211.00 (2021-07-20). + * Fixed CVE-2021-1093, CVE-2021-1094, CVE-2021-1095. (Closes: #991351) + https://nvidia.custhelp.com/app/answers/detail/a_id/5211 + + [ Andreas Beckmann ] + * Refresh patches. + * nvidia-driver-libs: Add Recommends: libnvidia-encode1 + (460.91.03-1). (Closes: #989885) + * debian/gen-control.pl: Support substitutions in the Vcs-Git field + (460.91.03-1). + * Compute and substitute the Git branch instead of hardcoding it + (460.91.03-1). + * Upload to buster. + + -- Andreas Beckmann <a...@debian.org> Wed, 21 Jul 2021 22:06:09 +0200 + nvidia-graphics-drivers (418.197.02-1) buster; urgency=medium * New upstream Tesla release 418.197.02 (2021-04-19). @@ -1043,8 +1132,9 @@ nvidia-graphics-drivers (418.197.02-1) buster; urgency=medium [ Andreas Beckmann ] * nvidia-alternative: Add libnvidia-ml.so slave alternative if libnvidia-ml-dev is installed (460.56-2). (Closes: #984881) + * Upload to buster. - -- Andreas Beckmann <a...@debian.org> Tue, 20 Apr 2021 15:01:59 +0200 + -- Andreas Beckmann <a...@debian.org> Mon, 31 May 2021 11:40:00 +0200 nvidia-graphics-drivers (418.181.07-1) buster; urgency=medium @@ -1655,6 +1745,19 @@ 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.144-1) UNRELEASED; urgency=medium + + * New upstream legacy branch release 390.144 (2021-07-20). + * Fixed CVE-2021-1093, CVE-2021-1094, CVE-2021-1095. + https://nvidia.custhelp.com/app/answers/detail/a_id/5211 + - 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 ] + * Refresh patches. + + -- Andreas Beckmann <a...@debian.org> Wed, 21 Jul 2021 18:15:32 +0200 + nvidia-graphics-drivers (390.143-1) UNRELEASED; urgency=medium * New upstream legacy branch release 390.143 (2021-04-19). @@ -1666,7 +1769,7 @@ nvidia-graphics-drivers (390.143-1) UNRELEASED; urgency=medium candidates, where the NVIDIA kernel module failed to build with error "fatal error: asm/kmap_types.h: No such file or directory". - -- Andreas Beckmann <a...@debian.org> Mon, 19 Apr 2021 22:38:56 +0200 + -- Andreas Beckmann <a...@debian.org> Tue, 20 Apr 2021 02:04:19 +0200 nvidia-graphics-drivers (390.141-1) UNRELEASED; urgency=medium diff --git a/debian/control b/debian/control index 2fcf0f04..de272cf8 100644 --- a/debian/control +++ b/debian/control @@ -286,6 +286,7 @@ Recommends: libgles-${nvidia-}1 (= ${binary:Version}), libgles-${nvidia-}2 (= ${binary:Version}), lib${nvidia}-cfg1 (= ${binary:Version}) [${nvidia:arch:has-driver}], + lib${nvidia}-encode1 (= ${binary:Version}), ${nvidia}-vulkan-icd (= ${binary:Version}), Provides: nvidia-driver-libs-any, @@ -832,12 +833,12 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: NVIDIA PTX JIT Compiler${nvidia:VariantDesc} +Description: NVIDIA PTX JIT 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 runtime PTX JIT compiler library. + This package contains the runtime PTX JIT Compiler library. Package: libnvcuvid1 Architecture: i386 amd64 arm64 @@ -863,7 +864,6 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: - ${libcuda1} (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: NVENC Video Encoding runtime library${nvidia:VariantDesc} The NVENC Video Encoding library provides an interface to video encoder @@ -925,7 +925,6 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: - ${libcuda1} (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Homepage: https://developer.nvidia.com/opticalflow-sdk Description: NVIDIA Optical Flow runtime library${nvidia:VariantDesc} @@ -940,7 +939,6 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: - ${libcuda1} (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: NVIDIA allocator runtime library${nvidia:VariantDesc} The NVIDIA binary driver provides optimized hardware acceleration of @@ -955,7 +953,6 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: - ${libcuda1} (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: NVIDIA NGX runtime library${nvidia:VariantDescShort} The NVIDIA binary driver provides optimized hardware acceleration of diff --git a/debian/control.in b/debian/control.in index e7763bc2..25cc7bc7 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,7 +6,7 @@ Uploaders: Andreas Beckmann <a...@debian.org>, Luca Boccassi <bl...@debian.org>, Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers -Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers.git +Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-graphics-drivers.git${Vcs-Git:Branch} Build-Depends: debhelper-compat (= 13), dh-sequence-dkms, @@ -285,6 +285,7 @@ Recommends: libgles-${nvidia-}1 (= ${binary:Version}), libgles-${nvidia-}2 (= ${binary:Version}), lib${nvidia}-cfg1 (= ${binary:Version}) [${nvidia:arch:has-driver}], + lib${nvidia}-encode1 (= ${binary:Version}), ${nvidia}-vulkan-icd (= ${binary:Version}), Provides: nvidia-driver-libs-any, @@ -988,12 +989,12 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: NVIDIA PTX JIT Compiler${nvidia:VariantDesc} +Description: NVIDIA PTX JIT 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 runtime PTX JIT compiler library. + This package contains the runtime PTX JIT Compiler library. Package: lib${nvidia-if-variant}nvcuvid1 Architecture: i386 amd64 ${arch:arm64} ${arch:ppc64el} @@ -1019,7 +1020,6 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: - ${libcuda1} (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: NVENC Video Encoding runtime library${nvidia:VariantDesc} The NVENC Video Encoding library provides an interface to video encoder @@ -1081,7 +1081,6 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: - ${libcuda1} (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Homepage: https://developer.nvidia.com/opticalflow-sdk Description: NVIDIA Optical Flow runtime library${nvidia:VariantDesc} @@ -1096,7 +1095,6 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: - ${libcuda1} (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: NVIDIA allocator runtime library${nvidia:VariantDesc} The NVIDIA binary driver provides optimized hardware acceleration of @@ -1111,7 +1109,6 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: - ${libcuda1} (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: NVIDIA NGX runtime library${nvidia:VariantDescShort} The NVIDIA binary driver provides optimized hardware acceleration of diff --git a/debian/control.md5sum b/debian/control.md5sum index 261a97d8..23ada745 100644 --- a/debian/control.md5sum +++ b/debian/control.md5sum @@ -1,5 +1,5 @@ -914ae3291e6bc00eb144031fa24760e6 debian/control -cca8534b0eb0491c30b6b657e127b1d0 debian/control.in -db12f898b07cdaf431ad34bd68a1662e debian/gen-control.pl -de7c9eee1eb720f20919408f850af51a debian/rules +87741851159d8c9d6b79147ce02249eb debian/control +4676dd1223708e7459845fca32b3b4bb debian/control.in +8489c83cfe0171c9de6d052c01a6d19b debian/gen-control.pl +935002a204ce223dbfaec1e97d30ff8d debian/rules 65a302e51a0a1b628058be29ad1f384e debian/rules.defs diff --git a/debian/copyright b/debian/copyright index 9895030a..35922b2f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -14,7 +14,7 @@ Disclaimer: permitted, and the binaries are not distributed with source code. Files: * -Copyright: 1993-2020 NVIDIA Corporation. All rights reserved. +Copyright: 1993-2021 NVIDIA Corporation. All rights reserved. License: NVIDIA-graphics-drivers Files: supported-gpus/supported-gpus.json diff --git a/debian/detect/nvidia-tesla-460.ids b/debian/detect/nvidia-tesla-460.ids index 85d66140..be3bab0f 100644 --- a/debian/detect/nvidia-tesla-460.ids +++ b/debian/detect/nvidia-tesla-460.ids @@ -235,6 +235,7 @@ 10DE1E02 10DE1E04 10DE1E07 +10DE1E09 10DE1E30 10DE1E36 10DE1E78 @@ -291,7 +292,9 @@ 10DE1FB2 10DE1FB8 10DE1FB9 +10DE1FBA 10DE1FBB +10DE1FBC 10DE1FDD 10DE1FF9 10DE20B0 @@ -311,18 +314,36 @@ 10DE21D1 10DE2204 10DE2206 +10DE2208 +10DE2216 10DE2230 10DE2231 10DE2235 10DE2236 10DE2237 +10DE2482 10DE2484 10DE2486 +10DE2488 +10DE2489 10DE249C 10DE249D 10DE24B0 +10DE24B6 +10DE24B7 +10DE24B8 10DE24DC 10DE24DD 10DE2503 +10DE2504 10DE2520 +10DE2523 10DE2560 +10DE2563 +10DE25A0 +10DE25A2 +10DE25A5 +10DE25B8 +10DE25E0 +10DE25E2 +10DE25E5 diff --git a/debian/gen-control.pl b/debian/gen-control.pl index 1e84b6bd..37e42484 100755 --- a/debian/gen-control.pl +++ b/debian/gen-control.pl @@ -62,6 +62,7 @@ print "# run \`make -f debian/rules debian/control'.\n"; my $src_fields = $control->get_source(); $src_fields->{'Source'} = $substvars->substvars($src_fields->{'Source'}); +$src_fields->{'Vcs-Git'} = $substvars->substvars($src_fields->{'Vcs-Git'}); $src_fields->output(\*STDOUT); foreach my $pkg_fields ($control->get_packages()) { diff --git a/debian/module/debian/patches/cc_version_check-gcc5.patch b/debian/module/debian/patches/cc_version_check-gcc5.patch index 6c9cad51..39d1104d 100644 --- a/debian/module/debian/patches/cc_version_check-gcc5.patch +++ b/debian/module/debian/patches/cc_version_check-gcc5.patch @@ -5,7 +5,7 @@ Description: ignore __GNUC_MINOR__ from GCC 5 onwards --- a/conftest.sh +++ b/conftest.sh -@@ -4440,7 +4440,7 @@ case "$5" in +@@ -4566,7 +4566,7 @@ kernel_cc_minor=`echo ${kernel_cc_version} | cut -d '.' -f 2` echo " diff --git a/debian/module/debian/patches/conftest-verbose.patch b/debian/module/debian/patches/conftest-verbose.patch index 8aa52906..07ef0275 100644 --- a/debian/module/debian/patches/conftest-verbose.patch +++ b/debian/module/debian/patches/conftest-verbose.patch @@ -3,7 +3,7 @@ Description: dump the generated conftest headers --- a/Kbuild +++ b/Kbuild -@@ -124,6 +124,16 @@ NV_CONFTEST_HEADERS += $(obj)/conftest/h +@@ -121,6 +121,16 @@ NV_CONFTEST_HEADERS += $(NV_CONFTEST_COMPILE_TEST_HEADERS) @@ -20,7 +20,7 @@ Description: dump the generated conftest headers # # Generate a header file for a single conftest compile test. Each compile test # header depends on conftest.sh, as well as the generated conftest/headers.h -@@ -148,6 +158,8 @@ define NV_GENERATE_COMPILE_TEST_HEADER +@@ -145,6 +155,8 @@ @mkdir -p $(obj)/conftest @# concatenate /dev/null to prevent cat from hanging when $$^ is empty @cat $$^ /dev/null > $$@ @@ -29,7 +29,7 @@ Description: dump the generated conftest headers endef # -@@ -167,13 +179,17 @@ $(eval $(call NV_GENERATE_COMPILE_TEST_H +@@ -164,13 +176,17 @@ $(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,symbols,$(NV_CONFTEST_SYMBOL_COMPILE_TESTS))) $(eval $(call NV_GENERATE_COMPILE_TEST_HEADER,types,$(NV_CONFTEST_TYPE_COMPILE_TESTS))) diff --git a/debian/module/debian/patches/nvidia-modeset-use-ARCH.o_binary.patch b/debian/module/debian/patches/nvidia-modeset-use-ARCH.o_binary.patch index 50e37519..f5c0e8da 100644 --- a/debian/module/debian/patches/nvidia-modeset-use-ARCH.o_binary.patch +++ b/debian/module/debian/patches/nvidia-modeset-use-ARCH.o_binary.patch @@ -3,13 +3,14 @@ Description: select the correct nv-modeset-kernel.o blob for the target architec --- a/nvidia-modeset/nvidia-modeset.Kbuild +++ b/nvidia-modeset/nvidia-modeset.Kbuild -@@ -37,7 +37,9 @@ NV_KERNEL_MODULE_TARGETS += $(NVIDIA_MOD +@@ -37,7 +37,10 @@ NV_KERNEL_MODULE_TARGETS += $(NVIDIA_MOD # But, the target for the symlink rule should be prepended with $(obj). # -NVIDIA_MODESET_BINARY_OBJECT := $(src)/nvidia-modeset/nv-modeset-kernel.o_binary +NVIDIA_MODESET_BINARY_OBJECT-$(CONFIG_X86_64) += nv-modeset-kernel-amd64.o_binary +NVIDIA_MODESET_BINARY_OBJECT-$(CONFIG_PPC64) += nv-modeset-kernel-ppc64el.o_binary ++NVIDIA_MODESET_BINARY_OBJECT-$(CONFIG_ARM64) += nv-modeset-kernel-arm64.o_binary +NVIDIA_MODESET_BINARY_OBJECT := $(src)/nvidia-modeset/$(NVIDIA_MODESET_BINARY_OBJECT-y) NVIDIA_MODESET_BINARY_OBJECT_O := nvidia-modeset/nv-modeset-kernel.o 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 51820667..a20cb201 100644 --- a/debian/module/debian/patches/nvidia-use-ARCH.o_binary.patch +++ b/debian/module/debian/patches/nvidia-use-ARCH.o_binary.patch @@ -5,13 +5,14 @@ Description: Select the correct nv-kernel.o blob for the target architecture --- a/nvidia/nvidia.Kbuild +++ b/nvidia/nvidia.Kbuild -@@ -37,7 +37,9 @@ +@@ -37,7 +37,10 @@ # and needs to be re-executed. # -NVIDIA_BINARY_OBJECT := $(src)/nvidia/nv-kernel.o_binary +NVIDIA_BINARY_OBJECT-$(CONFIG_X86_64) += nv-kernel-amd64.o_binary +NVIDIA_BINARY_OBJECT-$(CONFIG_PPC64) += nv-kernel-ppc64el.o_binary ++NVIDIA_BINARY_OBJECT-$(CONFIG_ARM64) += nv-kernel-arm64.o_binary +NVIDIA_BINARY_OBJECT := $(src)/nvidia/$(NVIDIA_BINARY_OBJECT-y) NVIDIA_BINARY_OBJECT_O := nvidia/nv-kernel.o diff --git a/debian/module/debian/patches/use-kbuild-flags.patch b/debian/module/debian/patches/use-kbuild-flags.patch index b4ade1c2..26820fca 100644 --- a/debian/module/debian/patches/use-kbuild-flags.patch +++ b/debian/module/debian/patches/use-kbuild-flags.patch @@ -5,7 +5,7 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS --- a/Kbuild +++ b/Kbuild -@@ -111,6 +111,7 @@ NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST +@@ -108,6 +108,7 @@ NV_CFLAGS_FROM_CONFTEST := $(shell $(NV_CONFTEST_CMD) build_cflags) NV_CONFTEST_CFLAGS = $(NV_CFLAGS_FROM_CONFTEST) $(EXTRA_CFLAGS) -fno-pie @@ -15,8 +15,8 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS NV_CONFTEST_COMPILE_TEST_HEADERS += $(obj)/conftest/functions.h --- a/nvidia/nvidia.Kbuild +++ b/nvidia/nvidia.Kbuild -@@ -87,7 +87,7 @@ NVIDIA_INTERFACE := nvidia/nv-interface. - always += $(NVIDIA_INTERFACE) +@@ -92,7 +92,7 @@ + always-y += $(NVIDIA_INTERFACE) $(obj)/$(NVIDIA_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_OBJECTS)) - $(LD) -r -o $@ $^ @@ -26,7 +26,7 @@ Description: use KBUILD_CFLAGS and (KBUILD_)LDFLAGS # --- a/Makefile +++ b/Makefile -@@ -110,7 +110,7 @@ else +@@ -110,7 +110,7 @@ # cannot be defined in the *Kbuild files, which are only used during stage 1. %-linux.o: modules @@ -37,8 +37,8 @@ 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 -@@ -72,7 +72,7 @@ NVIDIA_MODESET_INTERFACE := nvidia-modes - always += $(NVIDIA_MODESET_INTERFACE) +@@ -77,7 +77,7 @@ + always-y += $(NVIDIA_MODESET_INTERFACE) $(obj)/$(NVIDIA_MODESET_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_MODESET_OBJECTS)) - $(LD) -r -o $@ $^ diff --git a/debian/module/debian/patches/use-kbuild-gcc-plugins.patch b/debian/module/debian/patches/use-kbuild-gcc-plugins.patch index 2575ac5e..dfc3c2ca 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 -@@ -111,7 +111,7 @@ NV_CONFTEST_CMD := /bin/sh $(NV_CONFTEST +@@ -108,7 +108,7 @@ 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/nv-readme.ids b/debian/nv-readme.ids index 85d66140..be3bab0f 100644 --- a/debian/nv-readme.ids +++ b/debian/nv-readme.ids @@ -235,6 +235,7 @@ 10DE1E02 10DE1E04 10DE1E07 +10DE1E09 10DE1E30 10DE1E36 10DE1E78 @@ -291,7 +292,9 @@ 10DE1FB2 10DE1FB8 10DE1FB9 +10DE1FBA 10DE1FBB +10DE1FBC 10DE1FDD 10DE1FF9 10DE20B0 @@ -311,18 +314,36 @@ 10DE21D1 10DE2204 10DE2206 +10DE2208 +10DE2216 10DE2230 10DE2231 10DE2235 10DE2236 10DE2237 +10DE2482 10DE2484 10DE2486 +10DE2488 +10DE2489 10DE249C 10DE249D 10DE24B0 +10DE24B6 +10DE24B7 +10DE24B8 10DE24DC 10DE24DD 10DE2503 +10DE2504 10DE2520 +10DE2523 10DE2560 +10DE2563 +10DE25A0 +10DE25A2 +10DE25A5 +10DE25B8 +10DE25E0 +10DE25E2 +10DE25E5 diff --git a/debian/rules b/debian/rules index d22db3f4..de75d8de 100755 --- a/debian/rules +++ b/debian/rules @@ -400,6 +400,7 @@ debian/control-real: $(CONTROL_FILES) -V'nvidia-if-variant=$(nvidia_if_variant)' \ -V'nvidia:Variant=$(-variant)' \ -V'libcuda1=$(libcuda1)' \ + -V'Vcs-Git:Branch=$(if $(variant), -b $(subst legacy-,,$(variant))/master)' \ $(foreach a,$(ARCH_CANDIDATES),-V'arch:$a=$(filter $a,$(DRIVER_ARCH_LIST))') \ -- \ debian/control.in > debian/control.new
diff --git a/debian/changelog b/debian/changelog index 55131b3..9f079c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nvidia-settings (460.91.03-1) unstable; urgency=medium + + * New upstream release 460.91.03. + + -- Andreas Beckmann <a...@debian.org> Mon, 26 Jul 2021 12:36:00 +0200 + nvidia-settings (460.73.01-1) unstable; urgency=medium [ Andreas Beckmann ] diff --git a/doc/version.mk b/doc/version.mk index 80e0e64..634141a 100644 --- a/doc/version.mk +++ b/doc/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.73.01 +NVIDIA_VERSION = 460.91.03 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/samples/version.mk b/samples/version.mk index 80e0e64..634141a 100644 --- a/samples/version.mk +++ b/samples/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.73.01 +NVIDIA_VERSION = 460.91.03 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/src/libXNVCtrl/version.mk b/src/libXNVCtrl/version.mk index 80e0e64..634141a 100644 --- a/src/libXNVCtrl/version.mk +++ b/src/libXNVCtrl/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.73.01 +NVIDIA_VERSION = 460.91.03 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/src/nvml.h b/src/nvml.h index 6ec5340..58de790 100644 --- a/src/nvml.h +++ b/src/nvml.h @@ -5963,6 +5963,7 @@ nvmlReturn_t DECLDIR nvmlDeviceGetGridLicensableFeatures_v3(nvmlDevice_t device, * - \ref NVML_ERROR_UNINITIALIZED if the library has not been successfully initialized * - \ref NVML_ERROR_INVALID_ARGUMENT if \a device is invalid, \a utilization is NULL, or \a samplingPeriodUs is NULL * - \ref NVML_ERROR_NOT_SUPPORTED if the device does not support this feature + * - \ref NVML_ERROR_NOT_FOUND if sample entries are not found * - \ref NVML_ERROR_GPU_IS_LOST if the target GPU has fallen off the bus or is otherwise inaccessible * - \ref NVML_ERROR_UNKNOWN on any unexpected error */ diff --git a/src/version.mk b/src/version.mk index 80e0e64..634141a 100644 --- a/src/version.mk +++ b/src/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.73.01 +NVIDIA_VERSION = 460.91.03 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST)) diff --git a/version.mk b/version.mk index 80e0e64..634141a 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.73.01 +NVIDIA_VERSION = 460.91.03 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
