[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1005148: marked as done (bullseye-pu: package nvidia-modprobe/470.103.01-1~deb11u1)

Your message dated Sat, 26 Mar 2022 11:59:13 +0000
with message-id <c4d20274f6d76a43fb574d2177f6e3af4235e4be.camel@adam-barratt.org.uk>
and subject line Closing p-u requests for updates in 11.3
has caused the Debian Bug report #1005148,
regarding bullseye-pu: package nvidia-modprobe/470.103.01-1~deb11u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1005148: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1005148
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
Control: block 1005129 with -1
Control: block 1005135 with -1

Hi,

in order to upgrade nvidia-graphics-drivers to 470.* (and to add
nvidia-graphics-drivers-tesla-470 to stable), we need to upgrade
nvidia-modprobe as well. There is a versioned dependency on
  nvidia-modprobe (>= $major_version) 
in the driver packages. This upgrade is safe (i.e. does not cause
dependency problems) even if the driver packages are not yet updated.

The proposed package is just a rebuild of the version currently in
sid.


Andreas

diff --git a/common-utils/gen-manpage-opts-helper.c b/common-utils/gen-manpage-opts-helper.c
index b41e2aa..56ba7b3 100644
--- a/common-utils/gen-manpage-opts-helper.c
+++ b/common-utils/gen-manpage-opts-helper.c
@@ -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 --git a/common-utils/nvgetopt.h b/common-utils/nvgetopt.h
index 0262aac..37da80e 100644
--- a/common-utils/nvgetopt.h
+++ b/common-utils/nvgetopt.h
@@ -117,8 +117,8 @@ typedef struct {
     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 --git a/debian/changelog b/debian/changelog
index 3e2a97a..1d9dd2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,49 @@
+nvidia-modprobe (470.103.01-1~deb11u1) bullseye; urgency=medium
+
+  * Rebuild for bullseye.
+
+ -- Andreas Beckmann <anbe@debian.org>  Mon, 07 Feb 2022 23:56:51 +0100
+
+nvidia-modprobe (470.103.01-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Beckmann <anbe@debian.org>  Mon, 07 Feb 2022 14:05:06 +0100
+
+nvidia-modprobe (470.94-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Beckmann <anbe@debian.org>  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 <anbe@debian.org>  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 <anbe@debian.org>  Mon, 02 Aug 2021 13:45:42 +0200
+
+nvidia-modprobe (470.42.01-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Beckmann <anbe@debian.org>  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 <bluca@debian.org>  Thu, 29 Apr 2021 11:48:45 +0100
+
 nvidia-modprobe (460.32.03-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 96a2ba6..324fbc3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  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 --git a/debian/copyright b/debian/copyright
index 34089cd..ff0d5ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,7 @@ Copyright: (C) Copyright IBM Corporation 2006
 License: Expat
 
 Files: debian/*
-Copyright: © 2014-2021 Andreas Beckmann <anbe@debian.org>
+Copyright: © 2014-2022 Andreas Beckmann <anbe@debian.org>
 License: Expat
 
 License: Expat
diff --git a/debian/nvidia-modprobe.lintian-overrides b/debian/nvidia-modprobe.lintian-overrides
index aada6f8..ecc59fc 100644
--- a/debian/nvidia-modprobe.lintian-overrides
+++ b/debian/nvidia-modprobe.lintian-overrides
@@ -1 +1 @@
-setuid-binary usr/bin/nvidia-modprobe 4755 root/root
+elevated-privileges usr/bin/nvidia-modprobe 4755 root/root
diff --git a/modprobe-utils/nvidia-modprobe-utils.c b/modprobe-utils/nvidia-modprobe-utils.c
index 9bf8506..7437751 100644
--- a/modprobe-utils/nvidia-modprobe-utils.c
+++ b/modprobe-utils/nvidia-modprobe-utils.c
@@ -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 @@ int nvidia_uvm_modprobe(void)
     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 --git a/modprobe-utils/nvidia-modprobe-utils.h b/modprobe-utils/nvidia-modprobe-utils.h
index 876c8bf..924f7c3 100644
--- a/modprobe-utils/nvidia-modprobe-utils.h
+++ b/modprobe-utils/nvidia-modprobe-utils.h
@@ -82,6 +82,7 @@ int nvidia_nvswitch_get_file_state(int minor);
 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 --git a/modprobe-utils/pci-sysfs.h b/modprobe-utils/pci-sysfs.h
index 65e4e97..10d60c2 100644
--- a/modprobe-utils/pci-sysfs.h
+++ b/modprobe-utils/pci-sysfs.h
@@ -30,6 +30,7 @@
 
 #if defined(NV_LINUX)
 
+#include <stdint.h>
 #include <linux/pci.h>
 
 #if !defined(PCI_STD_HEADER_SIZEOF)
diff --git a/utils.mk b/utils.mk
index af0e3d7..e5ac3a2 100644
--- a/utils.mk
+++ b/utils.mk
@@ -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 @@ CFLAGS                += -Wno-unused-parameter
 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
@@ -185,6 +197,21 @@ ifneq ($(_eval_available),T)
 endif
 
 
+##############################################################################
+# 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 @@ host_target = $(patsubst HOST,HOST_,$(patsubst TARGET,,$(1)))
 
 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 @@ endif
 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 @@ endef
 
 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 --git a/version.mk b/version.mk
index b3f509d..061d452 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
-NVIDIA_VERSION = 460.32.03
+NVIDIA_VERSION = 470.103.01
 
 # This file.
 VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))

--- End Message ---
--- Begin Message --- 
Package: release.debian.org
Version: 11.3

Hi,

The updates referenced by these bugs were included in stable as part of
this morning's 11.3 point release.

Regards,

Adam

--- End Message ---
Reply to: