From 971ab5c8ecfbb3f8815a16c9538bf180711e9b35 Mon Sep 17 00:00:00 2001 From: Henry Li Date: Sun, 9 Jun 2024 21:42:42 -0700 Subject: [PATCH 1/2] upgrade libnvidia-container and nvidia-container-toolkit --- .../libnvidia-container.signatures.json | 2 +- SPECS/libnvidia-container/libnvidia-container.spec | 9 ++++++--- .../nvidia-container-toolkit.signatures.json | 4 ++-- .../nvidia-container-toolkit.spec | 13 ++++++++----- cgmanifest.json | 8 ++++---- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/SPECS/libnvidia-container/libnvidia-container.signatures.json b/SPECS/libnvidia-container/libnvidia-container.signatures.json index 9f105c4e525..692c3bc1866 100644 --- a/SPECS/libnvidia-container/libnvidia-container.signatures.json +++ b/SPECS/libnvidia-container/libnvidia-container.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "libnvidia-container-1.14.4.tar.gz": "074cf994e9190034f3a35f1247d3b0983633ccd3a00cb27f329ac3471cbb388f", + "libnvidia-container-1.15.0.tar.gz": "6633fcadadb6b8d517e2859f4edd9b20cbb3702d7b3b7c4ac41617ca9891d1b9", "nvidia-modprobe-495.44.tar.gz": "ae6e9c7e6b43368945c28f6b8b6d0d7cc36ee7e1be8955a009a1cb189e46de92" } } \ No newline at end of file diff --git a/SPECS/libnvidia-container/libnvidia-container.spec b/SPECS/libnvidia-container/libnvidia-container.spec index 876b35c662e..43e61cb9f09 100644 --- a/SPECS/libnvidia-container/libnvidia-container.spec +++ b/SPECS/libnvidia-container/libnvidia-container.spec @@ -3,7 +3,7 @@ %define mod_probe_dir deps/src/nvidia-modprobe-%{modprobe_version} Summary: NVIDIA container runtime library Name: libnvidia-container -Version: 1.14.4 +Version: 1.15.0 Release: 1%{?dist} License: BSD AND ASL2.0 AND GPLv3+ AND LGPLv3+ AND MIT AND GPLv2 Vendor: Microsoft Corporation @@ -40,8 +40,8 @@ touch %{mod_probe_dir}/.download_stamp %build sed -i 's/^MAJOR[[:space:]]*:=.*$/MAJOR := 1/' versions.mk -sed -i 's/^MINOR[[:space:]]*:=.*$/MINOR := 14/' versions.mk -sed -i 's/^PATCH[[:space:]]*:=.*$/PATCH := 4/' versions.mk +sed -i 's/^MINOR[[:space:]]*:=.*$/MINOR := 15/' versions.mk +sed -i 's/^PATCH[[:space:]]*:=.*$/PATCH := 0/' versions.mk %make_build WITH_LIBELF=yes %install @@ -135,6 +135,9 @@ This package contains command-line tools that facilitate using the library. %{_bindir}/* %changelog +* Fri Jun 07 2024 Henry Li - 1.15.0-1 +- Upgrade to version 1.15.0 + * Fri Apr 16 2024 Henry Li - 1.14.4-1 - Upgrade to version 1.14.4 - Add external specification of package versioning to build diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json index 2e373022d88..61905ef9d8d 100644 --- a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "nvidia-container-toolkit-1.14.4-vendor.tar.gz": "5c4f1ba9c6e3cacc1002ece40c93928f8836824532f5e0b8c6bcea2322dc3123", - "nvidia-container-toolkit-1.14.4.tar.gz": "bc490ec639cda474ee5876349bf686411107301c666a246d4a58045b3332c6eb" + "nvidia-container-toolkit-1.15.0-vendor.tar.gz": "bf7f794e9ec7be779707c4ef9ea5bd813f767b49a76729115716110dafa1b7c2", + "nvidia-container-toolkit-1.15.0.tar.gz": "9ecf53ffce76404de6717745a55b82d40d3217b43c1ab27acc7d8b15238b6edc" } } diff --git a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec index 95c3586f1a0..b319af17039 100644 --- a/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec +++ b/SPECS/nvidia-container-toolkit/nvidia-container-toolkit.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Summary: NVIDIA container runtime hook Name: nvidia-container-toolkit -Version: 1.14.4 +Version: 1.15.0 Release: 1%{?dist} License: ALS2.0 Vendor: Microsoft Corporation @@ -65,13 +65,12 @@ install -m 755 -t %{buildroot}%{_bindir} nvidia-container-runtime-hook install -m 755 -t %{buildroot}%{_bindir} nvidia-container-runtime install -m 755 -t %{buildroot}%{_bindir} nvidia-ctk -mkdir -p %{buildroot}%{_sysconfdir}/nvidia-container-runtime -mkdir -p %{buildroot}%{_libexecdir}/oci/hooks.d -mkdir -p %{buildroot}%{_datadir}/containers/oci/hooks.d - %posttrans ln -sf %{_bindir}/nvidia-container-runtime-hook %{_bindir}/nvidia-container-toolkit +# Generate the default config; If this file already exists no changes are made. +%{_bindir}/nvidia-ctk --quiet config --config-file=%{_sysconfdir}/nvidia-container-runtime/config.toml --in-place + %postun rm -f %{_bindir}/nvidia-container-toolkit @@ -85,6 +84,10 @@ rm -f %{_bindir}/nvidia-container-toolkit %{_bindir}/nvidia-ctk %changelog +* Fri Jun 07 2024 Henry Li - 1.15.0-1 +- Upgrade to version 1.15.0 +- Generate config.toml file during %posttrans + * Mon Feb 05 2024 Bala - 1.14.4-1 - Upgrade to version 1.14.4 - Remove config and oci hooks from files as they are handled in post-install from v1.14.0 diff --git a/cgmanifest.json b/cgmanifest.json index 8dc42f687f0..690328ab457 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -10321,8 +10321,8 @@ "type": "other", "other": { "name": "libnvidia-container", - "version": "1.14.4", - "downloadUrl": "https://github.com/NVIDIA/libnvidia-container/archive/v1.14.4.tar.gz" + "version": "1.15.0", + "downloadUrl": "https://github.com/NVIDIA/libnvidia-container/archive/v1.15.0.tar.gz" } } }, @@ -14282,8 +14282,8 @@ "type": "other", "other": { "name": "nvidia-container-toolkit", - "version": "1.14.4", - "downloadUrl": "https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.14.4.tar.gz" + "version": "1.15.0", + "downloadUrl": "https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.15.0.tar.gz" } } }, From 19cf8f96cfd1c330dae679a2f3ef1721fd1acbe1 Mon Sep 17 00:00:00 2001 From: Henry Li Date: Sun, 9 Jun 2024 22:25:01 -0700 Subject: [PATCH 2/2] update nvidia-modprobe --- .../libnvidia-container.signatures.json | 2 +- SPECS/libnvidia-container/libnvidia-container.spec | 2 +- SPECS/libnvidia-container/nvidia-modprobe.patch | 8 +++++--- cgmanifest.json | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/SPECS/libnvidia-container/libnvidia-container.signatures.json b/SPECS/libnvidia-container/libnvidia-container.signatures.json index 692c3bc1866..2530cd6a1e3 100644 --- a/SPECS/libnvidia-container/libnvidia-container.signatures.json +++ b/SPECS/libnvidia-container/libnvidia-container.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { "libnvidia-container-1.15.0.tar.gz": "6633fcadadb6b8d517e2859f4edd9b20cbb3702d7b3b7c4ac41617ca9891d1b9", - "nvidia-modprobe-495.44.tar.gz": "ae6e9c7e6b43368945c28f6b8b6d0d7cc36ee7e1be8955a009a1cb189e46de92" + "nvidia-modprobe-550.54.14.tar.gz": "5687b0dfa6087dd480ae91e91ff1dca975794e35a2edcf9ec08d8f9cb98ef905" } } \ No newline at end of file diff --git a/SPECS/libnvidia-container/libnvidia-container.spec b/SPECS/libnvidia-container/libnvidia-container.spec index 43e61cb9f09..c00bae02bef 100644 --- a/SPECS/libnvidia-container/libnvidia-container.spec +++ b/SPECS/libnvidia-container/libnvidia-container.spec @@ -1,4 +1,4 @@ -%define modprobe_version 495.44 +%define modprobe_version 550.54.14 %define _major 1 %define mod_probe_dir deps/src/nvidia-modprobe-%{modprobe_version} Summary: NVIDIA container runtime library diff --git a/SPECS/libnvidia-container/nvidia-modprobe.patch b/SPECS/libnvidia-container/nvidia-modprobe.patch index d99a17488a0..b5450f6afe3 100644 --- a/SPECS/libnvidia-container/nvidia-modprobe.patch +++ b/SPECS/libnvidia-container/nvidia-modprobe.patch @@ -1,7 +1,7 @@ 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 @@ +@@ -959,10 +959,10 @@ return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH); } @@ -19,11 +19,13 @@ diff -ruN nvidia-modprobe-495.44/modprobe-utils/nvidia-modprobe-utils.c nvidia-m 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 @@ +@@ -87,6 +87,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_cap_imex_channel_mknod(int minor); + int nvidia_cap_imex_channel_file_state(int minor); int nvidia_get_chardev_major(const char *name); int nvidia_msr_modprobe(void); - + \ No newline at end of file diff --git a/cgmanifest.json b/cgmanifest.json index 690328ab457..a4f6cb796da 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -14292,8 +14292,8 @@ "type": "other", "other": { "name": "nvidia-modprobe", - "version": "495.44", - "downloadUrl": "https://github.com/NVIDIA/nvidia-modprobe/archive/495.44.tar.gz" + "version": "550.54.14", + "downloadUrl": "https://github.com/NVIDIA/nvidia-modprobe/archive/550.54.14.tar.gz" } } },