Merge pull request #552 from yeazelm/update_nvcontainers

Update NVIDIA Container Toolkit and libnvidia-container to latest

Author: yeazelm

packages/libnvidia-container/Cargo.toml

@@ -11,10 +11,12 @@ path = "../packages.rs"
 [package.metadata.build-package]
 releases-url = "https://github.com/NVIDIA/libnvidia-container/releases"
 
+# Should match the version of the nvidia-container-toolkit package
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/NVIDIA/libnvidia-container/archive/v1.17.4/libnvidia-container-1.17.4.tar.gz"
-sha512 = "a5edb4eec8cc4a9bd221c3cbb14515656854700b1a6aef7b47147d96b67511d5cfcae38c740fd946452768da0f993edf6c656697cd01189de88b67a4ae00aae5"
+url = "https://github.com/NVIDIA/libnvidia-container/archive/v1.17.8/libnvidia-container-1.17.8.tar.gz"
+sha512 = "727f66bcb7396110c056e483abc5d2ba38381feaf0d47b4b40159933ccc65e76d4b33d7bb32b1ec87851c802d1823165f50f289d92f748f7f50f6896fe2bd10e"
 
+# Check https://github.com/NVIDIA/libnvidia-container/blob/<LIBNVIDIA_VERSION>/mk/nvidia-modprobe.mk to determine which modprobe version it builds
 [[package.metadata.build-package.external-files]]
 url = "https://github.com/NVIDIA/nvidia-modprobe/archive/550.54.14/nvidia-modprobe-550.54.14.tar.gz"
 sha512 = "279228aa315ff5fd1a23df23527aff58b2319f11f9fc7d939fa285ea933b4cc6d223451e20ecf7f50baba9f6c9c100e57cb77675d0d17fa77f19d3fea2ccc193"

packages/libnvidia-container/libnvidia-container.spec

@@ -1,7 +1,7 @@
 %global nvidia_modprobe_version 550.54.14
 
 Name: %{_cross_os}libnvidia-container
-Version: 1.17.4
+Version: 1.17.8
 Release: 1%{?dist}
 Epoch: 1
 Summary: NVIDIA container runtime library

packages/nvidia-container-toolkit/0001-ldcache-fix-parsing-for-aarch64.patch

@@ -11,9 +11,10 @@ path = "../packages.rs"
 [package.metadata.build-package]
 releases-url = "https://github.com/NVIDIA/nvidia-container-toolkit/releases"
 
+# Should match the version of the libnvidia-container package
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.17.6/nvidia-container-toolkit-1.17.6.tar.gz"
-sha512 = "9b4dc074c21c88f3dcafe1fc1a5b3c12e7cab1bd904817a2c0fb759d89e46c7df06cad2fbf8c8019b0e56f45828e6e257be834d74979992dc4c215e7b27d6ba1"
+url = "https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.17.8/nvidia-container-toolkit-1.17.8.tar.gz"
+sha512 = "1ff7a39c09bd51222e3edbe6f31c3838df6a7d09bb0a0171df1e04be613502079253574fe2fb087b253687aa2a826d77f2410253023a127432e9d05a89174159"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

packages/nvidia-container-toolkit/Cargo.toml

@@ -2,7 +2,7 @@
 %global gorepo nvidia-container-toolkit
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 1.17.6
+%global gover 1.17.8
 %global rpmver %{gover}
 
 Name: %{_cross_os}nvidia-container-toolkit
@@ -23,7 +23,6 @@ Source4: nvidia-container-toolkit-tmpfiles-ecs.conf
 Source5: nvidia-container-toolkit-tmpfiles-k8s.conf
 Source6: nvidia-container-toolkit-config-k8s
 Source7: generate-cdi-specs.service
-Patch0001: 0001-ldcache-fix-parsing-for-aarch64.patch
 
 BuildRequires: %{_cross_os}glibc-devel
 Requires: %{_cross_os}libnvidia-container