Version in base suite: 460.32.03-1 Base version: nvidia-modprobe_460.32.03-1 Target version: nvidia-modprobe_470.103.01-1~deb11u1 Base file: /srv/ftp-master.debian.org/ftp/pool/contrib/n/nvidia-modprobe/nvidia-modprobe_460.32.03-1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/contrib/n/nvidia-modprobe/nvidia-modprobe_470.103.01-1~deb11u1.dsc common-utils/gen-manpage-opts-helper.c | 3 +- common-utils/nvgetopt.h | 4 +- debian/changelog | 46 +++++++++++++++++++++++++++++++ debian/control | 2 - debian/copyright | 2 - debian/nvidia-modprobe.lintian-overrides | 2 - modprobe-utils/nvidia-modprobe-utils.c | 10 ++++++ modprobe-utils/nvidia-modprobe-utils.h | 1 modprobe-utils/pci-sysfs.h | 1 utils.mk | 43 ++++++++++++++++++++++++---- version.mk | 2 - 11 files changed, 101 insertions(+), 15 deletions(-) diff -Nru nvidia-modprobe-460.32.03/common-utils/gen-manpage-opts-helper.c nvidia-modprobe-470.103.01/common-utils/gen-manpage-opts-helper.c --- nvidia-modprobe-460.32.03/common-utils/gen-manpage-opts-helper.c 2020-12-27 19:10:32.000000000 +0000 +++ nvidia-modprobe-470.103.01/common-utils/gen-manpage-opts-helper.c 2022-01-06 12:44:05.000000000 +0000 @@ -31,7 +31,8 @@ static void print_option(const NVGetoptOption *o) { - char scratch[64], *s; + char scratch[64]; + const char *s; int j, len; int italics, bold, omitWhiteSpace, firstchar; diff -Nru nvidia-modprobe-460.32.03/common-utils/nvgetopt.h nvidia-modprobe-470.103.01/common-utils/nvgetopt.h --- nvidia-modprobe-460.32.03/common-utils/nvgetopt.h 2020-12-27 19:10:32.000000000 +0000 +++ nvidia-modprobe-470.103.01/common-utils/nvgetopt.h 2022-01-06 12:44:05.000000000 +0000 @@ -117,8 +117,8 @@ const char *name; int val; unsigned int flags; - char *arg_name; /* not used by nvgetopt() */ - char *description; /* not used by nvgetopt() */ + const char *arg_name; /* not used by nvgetopt() */ + const char *description; /* not used by nvgetopt() */ } NVGetoptOption; diff -Nru nvidia-modprobe-460.32.03/debian/changelog nvidia-modprobe-470.103.01/debian/changelog --- nvidia-modprobe-460.32.03/debian/changelog 2021-01-15 16:56:56.000000000 +0000 +++ nvidia-modprobe-470.103.01/debian/changelog 2022-03-19 22:07:41.000000000 +0000 @@ -1,3 +1,49 @@ +nvidia-modprobe (470.103.01-1~deb11u1) bullseye; urgency=medium + + * Rebuild for bullseye. + + -- Andreas Beckmann Sat, 19 Mar 2022 23:07:41 +0100 + +nvidia-modprobe (470.103.01-1) unstable; urgency=medium + + * New upstream release. + + -- Andreas Beckmann Mon, 07 Feb 2022 14:05:06 +0100 + +nvidia-modprobe (470.94-1) unstable; urgency=medium + + * New upstream release. + + -- Andreas Beckmann Fri, 07 Jan 2022 21:24:20 +0100 + +nvidia-modprobe (470.82.00-1) unstable; urgency=medium + + * New upstream release. + * Bump Standards-Version to 4.6.0. No changes needed. + * Update Lintian overrides. + + -- Andreas Beckmann Sun, 07 Nov 2021 09:12:44 +0100 + +nvidia-modprobe (470.57.02-1) unstable; urgency=medium + + * New upstream release. + * Upload to unstable. + + -- Andreas Beckmann Mon, 02 Aug 2021 13:45:42 +0200 + +nvidia-modprobe (470.42.01-1) experimental; urgency=medium + + * New upstream release. + + -- Andreas Beckmann Tue, 29 Jun 2021 09:27:06 +0200 + +nvidia-modprobe (465.24.02-1) experimental; urgency=medium + + * New upstream release. (Closes: #987744) + * Upload to experimental. + + -- Luca Boccassi Thu, 29 Apr 2021 11:48:45 +0100 + nvidia-modprobe (460.32.03-1) unstable; urgency=medium * New upstream release. diff -Nru nvidia-modprobe-460.32.03/debian/control nvidia-modprobe-470.103.01/debian/control --- nvidia-modprobe-460.32.03/debian/control 2021-01-15 16:56:56.000000000 +0000 +++ nvidia-modprobe-470.103.01/debian/control 2022-03-19 22:07:41.000000000 +0000 @@ -10,7 +10,7 @@ dpkg-dev (>= 1.18.8), m4, Rules-Requires-Root: binary-targets -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Homepage: https://github.com/NVIDIA/nvidia-modprobe Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-modprobe Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-modprobe.git diff -Nru nvidia-modprobe-460.32.03/debian/copyright nvidia-modprobe-470.103.01/debian/copyright --- nvidia-modprobe-460.32.03/debian/copyright 2021-01-15 16:56:56.000000000 +0000 +++ nvidia-modprobe-470.103.01/debian/copyright 2022-03-19 22:07:41.000000000 +0000 @@ -25,7 +25,7 @@ License: Expat Files: debian/* -Copyright: © 2014-2021 Andreas Beckmann +Copyright: © 2014-2022 Andreas Beckmann License: Expat License: Expat diff -Nru nvidia-modprobe-460.32.03/debian/nvidia-modprobe.lintian-overrides nvidia-modprobe-470.103.01/debian/nvidia-modprobe.lintian-overrides --- nvidia-modprobe-460.32.03/debian/nvidia-modprobe.lintian-overrides 2021-01-15 16:56:56.000000000 +0000 +++ nvidia-modprobe-470.103.01/debian/nvidia-modprobe.lintian-overrides 2022-03-19 22:07:41.000000000 +0000 @@ -1 +1 @@ -setuid-binary usr/bin/nvidia-modprobe 4755 root/root +elevated-privileges usr/bin/nvidia-modprobe 4755 root/root diff -Nru nvidia-modprobe-460.32.03/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-470.103.01/modprobe-utils/nvidia-modprobe-utils.c --- nvidia-modprobe-460.32.03/modprobe-utils/nvidia-modprobe-utils.c 2020-12-27 19:10:32.000000000 +0000 +++ nvidia-modprobe-470.103.01/modprobe-utils/nvidia-modprobe-utils.c 2022-01-06 12:44:05.000000000 +0000 @@ -48,7 +48,6 @@ #define NV_PROC_MODPROBE_PATH_MAX 1024 #define NV_MAX_MODULE_NAME_SIZE 16 -#define NV_MAX_PROC_REGISTRY_PATH_SIZE NV_MAX_CHARACTER_DEVICE_FILE_STRLEN #define NV_MAX_LINE_LENGTH 256 #define NV_NVIDIA_MODULE_NAME "nvidia" @@ -72,6 +71,8 @@ #define NV_MAX_SOC_FAMILY_NAME_SIZE 6 #define NV_SOC_FAMILY_NAME_TEGRA "Tegra" +#define NV_MSR_MODULE_NAME "msr" + #define NV_DEVICE_FILE_MODE_MASK (S_IRWXU|S_IRWXG|S_IRWXO) #define NV_DEVICE_FILE_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) #define NV_DEVICE_FILE_UID 0 @@ -784,6 +785,13 @@ return modprobe_helper(0, NV_UVM_MODULE_NAME, false); } +/* + * Attempt to load msr module + */ +int nvidia_msr_modprobe(void) +{ + return modprobe_helper(0, NV_MSR_MODULE_NAME, false); +} /* * Attempt to load the NVIDIA modeset driver. diff -Nru nvidia-modprobe-460.32.03/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-470.103.01/modprobe-utils/nvidia-modprobe-utils.h --- nvidia-modprobe-460.32.03/modprobe-utils/nvidia-modprobe-utils.h 2020-12-27 19:10:32.000000000 +0000 +++ nvidia-modprobe-470.103.01/modprobe-utils/nvidia-modprobe-utils.h 2022-01-06 12:44:05.000000000 +0000 @@ -82,6 +82,7 @@ int nvidia_cap_mknod(const char* cap_file_path, int *minor); int nvidia_cap_get_file_state(const char* cap_file_path); int nvidia_get_chardev_major(const char *name); +int nvidia_msr_modprobe(void); #endif /* NV_LINUX */ diff -Nru nvidia-modprobe-460.32.03/modprobe-utils/pci-sysfs.h nvidia-modprobe-470.103.01/modprobe-utils/pci-sysfs.h --- nvidia-modprobe-460.32.03/modprobe-utils/pci-sysfs.h 2020-12-27 19:10:32.000000000 +0000 +++ nvidia-modprobe-470.103.01/modprobe-utils/pci-sysfs.h 2022-01-06 12:44:05.000000000 +0000 @@ -30,6 +30,7 @@ #if defined(NV_LINUX) +#include #include #if !defined(PCI_STD_HEADER_SIZEOF) diff -Nru nvidia-modprobe-460.32.03/utils.mk nvidia-modprobe-470.103.01/utils.mk --- nvidia-modprobe-460.32.03/utils.mk 2020-12-27 19:10:32.000000000 +0000 +++ nvidia-modprobe-470.103.01/utils.mk 2022-01-06 12:44:05.000000000 +0000 @@ -33,10 +33,11 @@ ############################################################################## CC ?= gcc +CXX ?= g++ LD ?= ld AR ?= ar -# only set these warnings and optimizations if CFLAGS is unset -CFLAGS ?= -Wall -O2 +# only set these warnings if CFLAGS is unset +CFLAGS ?= -Wall # always set these -f CFLAGS CFLAGS += -fno-strict-aliasing -fno-omit-frame-pointer -Wformat=2 CC_ONLY_CFLAGS ?= @@ -58,16 +59,27 @@ HOST_CC_ONLY_CFLAGS += -Wno-format-zero-length HOST_CFLAGS += -Wno-unused-parameter +DEBUG ?= +DEVELOP ?= + ifeq ($(DEBUG),1) STRIP_CMD ?= true DO_STRIP ?= CFLAGS += -O0 -g CFLAGS += -DDEBUG=1 else - STRIP_CMD ?= strip - DO_STRIP ?= 1 + CFLAGS += -O2 endif +ifeq ($(DEVELOP),1) + STRIP_CMD ?= true + DO_STRIP ?= + CFLAGS += -DDEVELOP=1 +endif + +STRIP_CMD ?= strip +DO_STRIP ?= 1 + INSTALL ?= install INSTALL_BIN_ARGS ?= -m 755 INSTALL_LIB_ARGS ?= -m 644 @@ -186,6 +198,21 @@ ############################################################################## +# Test passing $(1) to $(CC). If $(CC) succeeds, then echo $(1). +# +# Because this uses $(shell), it is best to use this to assign simply expanded +# variables (e.g., ":="). +# +# Example usage: +# CONDITIONAL_CFLAGS := $(call TEST_CC_ARG, -ffoo) +############################################################################## + +TEST_CC_ARG = \ + $(shell $(CC) -c -x c /dev/null $(1) -o /dev/null > /dev/null 2>&1 && \ + $(ECHO) $(1)) + + +############################################################################## # define variables used when installing the open source utilities from # the source tarball ############################################################################## @@ -276,7 +303,7 @@ ifeq ($(NV_AUTO_DEPEND),1) AUTO_DEP_SUFFIX = -MMD -MF $$(@:.o=.d.to_be_processed) -MP -MT $$@ && \ - $$(SED) -e "1,3s@ $$< @ @" < $$(@:.o=.d.to_be_processed) > $$(@:.o=.d) + $$(SED) -e "1,3s| $$< | |" < $$(@:.o=.d.to_be_processed) > $$(@:.o=.d) else AUTO_DEP_SUFFIX = endif @@ -486,8 +513,9 @@ define GENERATE_NVIDSTRING # g_nvid_string.c depends on all objects except g_nvid_string.o, and version.mk $(NVIDSTRING): $$(filter-out $$(call BUILD_OBJECT_LIST,$$(NVIDSTRING)), $(3)) $$(VERSION_MK) - @$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for $$(TARGET_ARCH) $$(NVIDIA_VERSION) $$(NVIDSTRING_BUILD_TYPE_STRING) (`$$(WHOAMI)`@`$$(HOSTNAME)`) `$$(DATE)`\";" > $$@ - @$$(ECHO) "const char *const p$$(strip $(1)) = $(1) + 11;" >> $$@; + $(at_if_quiet)$$(MKDIR) $$(dir $$@) + $(at_if_quiet)$$(ECHO) "const char $(1)[] = \"nvidia id: NVIDIA $$(strip $(2)) for $$(TARGET_ARCH) $$(NVIDIA_VERSION) $$(NVIDSTRING_BUILD_TYPE_STRING) (`$$(WHOAMI)`@`$$(HOSTNAME)`) `$$(DATE)`\";" > $$@ + $(at_if_quiet)$$(ECHO) "const char *const p$$(strip $(1)) = $(1) + 11;" >> $$@; endef @@ -510,6 +538,7 @@ define READ_ONLY_OBJECT_FROM_FILE_RULE $$(OUTPUTDIR)/$$(notdir $(1)).o: $(1) + $(at_if_quiet)$$(MKDIR) $$(OUTPUTDIR) $(at_if_quiet)cd $$(dir $(1)); \ $$(call quiet_cmd_no_at,LD) -r -z noexecstack --format=binary \ $$(notdir $(1)) -o $$(OUTPUTDIR_ABSOLUTE)/$$(notdir $$@) diff -Nru nvidia-modprobe-460.32.03/version.mk nvidia-modprobe-470.103.01/version.mk --- nvidia-modprobe-460.32.03/version.mk 2020-12-27 19:10:32.000000000 +0000 +++ nvidia-modprobe-470.103.01/version.mk 2022-01-06 12:44:05.000000000 +0000 @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 460.32.03 +NVIDIA_VERSION = 470.103.01 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))