Merge branch 'upstream-bump-modprobe' into 'master'

Bump nvidia-modprobe version to 495.44 See merge request nvidia/container-toolkit/libnvidia-container!102
NVIDIA · Nov 15, 2021 · ff6ed3d · ff6ed3d
2 parents 3bca465 + bfafaed
commit ff6ed3d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/mk/nvidia-modprobe.mk b/mk/nvidia-modprobe.mk
@@ -6,7 +6,7 @@ include $(MAKE_DIR)/common.mk
 
 ##### Source definitions #####
 
-VERSION        := 450.57
+VERSION        := 495.44
 PREFIX         := nvidia-modprobe-$(VERSION)
 URL            := https://github.com/NVIDIA/nvidia-modprobe/archive/$(VERSION).tar.gz
 

diff --git a/mk/nvidia-modprobe.patch b/mk/nvidia-modprobe.patch
@@ -1,7 +1,7 @@
-diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57-patched/modprobe-utils/nvidia-modprobe-utils.c
---- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c	2020-07-09 17:06:05.000000000 +0000
-+++ nvidia-modprobe-450.57-patched/modprobe-utils/nvidia-modprobe-utils.c	2020-08-18 12:43:03.223871514 +0000
-@@ -840,10 +840,10 @@
+diff -ruN nvidia-modprobe-495.44/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-495.44-patched/modprobe-utils/nvidia-modprobe-utils.c
+--- nvidia-modprobe-495.44/modprobe-utils/nvidia-modprobe-utils.c	2021-11-13 14:36:58.096684602 +0000
++++ nvidia-modprobe-495.44-patched/modprobe-utils/nvidia-modprobe-utils.c	2021-11-13 14:43:40.965146390 +0000
+@@ -888,10 +888,10 @@
      return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH);
  }
 
@@ -16,14 +16,14 @@ diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-m
  {
      char field[32];
      FILE *fp;
-diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57-patched/modprobe-utils/nvidia-modprobe-utils.h
---- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h	2020-07-09 17:06:05.000000000 +0000
-+++ nvidia-modprobe-450.57-patched/modprobe-utils/nvidia-modprobe-utils.h	2020-08-18 12:43:44.227745050 +0000
+diff -ruN nvidia-modprobe-495.44/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-495.44-patched/modprobe-utils/nvidia-modprobe-utils.h
+--- nvidia-modprobe-495.44/modprobe-utils/nvidia-modprobe-utils.h	2021-11-13 14:36:58.096684602 +0000
++++ nvidia-modprobe-495.44-patched/modprobe-utils/nvidia-modprobe-utils.h	2021-11-13 14:38:34.078700961 +0000
 @@ -81,6 +81,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_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name);
  int nvidia_get_chardev_major(const char *name);
+ int nvidia_msr_modprobe(void);
 
- #endif /* NV_LINUX */
diff --git a/pkg/deb/changelog b/pkg/deb/changelog
@@ -1,6 +1,8 @@
 libnvidia-container (1.6.0~rc.3-1) experimental; urgency=medium
 
- -- NVIDIA CORPORATION <[email protected]>  Mon, 08 Nov 2021 14:54:46 +0100
+  * Bump nvidia-modprobe dependency to 495.44
+
+ -- NVIDIA CORPORATION <[email protected]>  Sat, 13 Nov 2021 14:54:46 +0100
 
 libnvidia-container (1.6.0~rc.2-1) experimental; urgency=medium
 

diff --git a/pkg/rpm/SPECS/libnvidia-container.spec b/pkg/rpm/SPECS/libnvidia-container.spec
@@ -99,7 +99,8 @@ This package contains command-line tools that facilitate using the library.
 %{_bindir}/*
 
 %changelog
-* Mon Nov 08 2021  NVIDIA CORPORATION <[email protected]> 1.6.0-0.1.rc.3
+* Sat Nov 13 2021  NVIDIA CORPORATION <[email protected]> 1.6.0-0.1.rc.3
+- Bump nvidia-modprobe dependency to 495.44
 
 * Fri Nov 05 2021  NVIDIA CORPORATION <[email protected]> 1.6.0-0.1.rc.2
 - Fix bug that lead to unexected mount error when /proc/driver/nvidia does not exist on the host