[3.0] Upgrade libnvidia-container and remove unneeded packages (#8938)

Co-authored-by: Henry Li <lihl@microsoft.com>

LICENSES-AND-NOTICES/SPECS/data/licenses.json

@@ -2429,9 +2429,7 @@
                 "libnvidia-container",
                 "mlnx-tools",
                 "mlx-bootctl",
-                "nvidia-container-runtime",
                 "nvidia-container-toolkit",
-                "nvidia-docker2",
                 "ofed-scripts",
                 "perftest"
             ]

SPECS/libnvidia-container/libnvidia-container.signatures.json

@@ -1,6 +1,6 @@
 {
  "Signatures": {
-  "libnvidia-container-1.13.5.tar.gz": "431522239d71728d2840b2f048d0a0733c3e6ad7a209bdf21c7d17c0aa661657",
+  "libnvidia-container-1.14.4.tar.gz": "074cf994e9190034f3a35f1247d3b0983633ccd3a00cb27f329ac3471cbb388f",
   "nvidia-modprobe-495.44.tar.gz": "ae6e9c7e6b43368945c28f6b8b6d0d7cc36ee7e1be8955a009a1cb189e46de92"
  }
-}
+}

SPECS/libnvidia-container/libnvidia-container.spec

@@ -3,8 +3,8 @@
 %define mod_probe_dir deps/src/nvidia-modprobe-%{modprobe_version}
 Summary:        NVIDIA container runtime library
 Name:           libnvidia-container
-Version:        1.13.5
+Version:        1.14.4
-Release:        4%{?dist}
+Release:        1%{?dist}
 License:        BSD AND ASL2.0 AND GPLv3+ AND LGPLv3+ AND MIT AND GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -39,6 +39,9 @@ tar -C %{mod_probe_dir} --strip-components=1 -xzf %{SOURCE1}
 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
 %make_build WITH_LIBELF=yes
 
 %install
@@ -132,6 +135,10 @@ This package contains command-line tools that facilitate using the library.
 %{_bindir}/*
 
 %changelog
+* Fri Apr 16 2024 Henry Li <lihl@microsoft.com> - 1.14.4-1
+- Upgrade to version 1.14.4
+- Add external specification of package versioning to build
+
 * Mon Oct 16 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1.13.5-4
 - Bump release to rebuild with go 1.20.10
 

SPECS/nvidia-container-runtime/nvidia-container-runtime.signatures.json

@@ -1,5 +0,0 @@
-{
- "Signatures": {
-  "nvidia-container-runtime-3.13.0.tar.gz": "5a2516501eaf762fcb8bdeeeeab6e2597b3ccf52d9c5ed77d4c52c12f70cf3d1"
- }
-}

SPECS/nvidia-container-runtime/nvidia-container-runtime.spec

@@ -1,90 +0,0 @@
-%global debug_package %{nil}
-Summary:        NVIDIA container runtime
-Name:           nvidia-container-runtime
-Version:        3.13.0
-Release:        1%{?dist}
-License:        ASL 2.0
-Vendor:         Microsoft Corporation
-Distribution:   Azure Linux
-URL:            https://github.com/NVIDIA/nvidia-container-runtime
-#Source0:       https://github.com/NVIDIA/%%{name}/archive/v%%{version}.tar.gz
-Source0:        %{name}-%{version}.tar.gz
-Obsoletes: nvidia-container-runtime < 2.0.0
-Requires: nvidia-container-toolkit >= 1.13.5, nvidia-container-toolkit < 2.0.0
-Requires:       libseccomp
-# NVIDIA now includes the runtime within the toolkit installs itself.
-# Previously there were independent installs of the runtime and the toolkit
-# but with v3.9.0 and beyond the nvidia-container-runtime package no longer builds.
-#
-# The package is now a meta package that only forces the toolkit installation.
-
-%description
-Provides a modified version of runc allowing users to run GPU enabled
-containers.
-
-%prep
-%setup -q
-
-%install
-
-%files
-%license LICENSE
-
-
-%changelog
-* Mon Jul 10 2023 Henry Li <lihl@microsoft.com> - 3.13.0-1
-- Upgrade to version 3.13.0
-- Add nvidia-container-toolkit minimum version 1.13.5 dependency
-
-* Wed Sep 21 2022 Henry Li <lihl@microsoft.com> - 3.11.0-1
-- Upgrade to version 3.11.0
-- Add nvidia-container-toolkit minimum version 1.11.0 dependency
-
-* Wed Mar 30 2022 Adithya Jayachandran <adjayach@microsoft.com> - 3.9.0-1
-- Bumped version to 3.9.0
-- Package is officially included in toolkit install, this is a meta package
-- Added nvidia-container-toolkit minimum version 1.9.0 dependence
-
-* Tue Mar 29 2022 Adithya Jayachandran <adjayach@microsoft.com> - 3.5.0-1
-- Ported nvidia container runtime update v3.5.0 to 2.0
-- Added dependence on nvidia-container-toolkit >= 1.5.0
-- Change directory structure for build output
-
-* Wed Nov 17 2021 Mateusz Malisz <mateusz.malisz@microsoft.com> 3.4.2-5
-- Move buildroot directory tree creation to install step
-- Use make macros.
-
-* Fri Aug 06 2021 Nicolas Guibourge <nicolasg@microsoft.com> 3.4.2-5
-- Increment release to force republishing using golang 1.16.7.
-
-* Tue Jun 08 2021 Henry Beberman <henry.beberman@microsoft.com> 3.4.2-4
-- Increment release to force republishing using golang 1.15.13.
-
-* Mon Apr 26 2021 Nicolas Guibourge <nicolasg@microsoft.com> 3.4.2-3
-- Increment release to force republishing using golang 1.15.11.
-
-* Wed Apr 21 2021 Joseph Knierman <jknierman@microsoft.com> - 3.4.2-2
-- License verified
-- Initial CBL-Mariner import from NVIDIA (license: ASL 2.0).
-
-* Fri Feb 05 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.4.2-1
-- Add dependence on nvidia-container-toolkit >= 1.4.2
-
-* Mon Jan 25 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.4.1-1
-- Update README to list 'compute' as part of the default capabilities
-- Switch to gomod for vendoring
-- Update to Go 1.15.6 for builds
-- Add dependence on nvidia-container-toolkit >= 1.4.1
-
-* Wed Sep 16 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 3.4.0-1
-- Bump version to v3.4.0
-- Add dependence on nvidia-container-toolkit >= 1.3.0
-
-* Wed Jul 08 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 3.3.0-1
-- e550cb15 Update package license to match source license
-- f02eef53 Update project License
-- c0fe8aae Update dependence on nvidia-container-toolkit to 1.2.0
-
-* Fri May 15 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 3.2.0-1
-- e486a70e Update build system to support multi-arch builds
-- 854f4c48 Require new MIG changes

SPECS/nvidia-docker2/nvidia-docker2.signatures.json

@@ -1,5 +0,0 @@
-{
- "Signatures": {
-  "nvidia-docker-2.10.0.tar.gz": "1b0050c500a0d728824ea0e6abcd2d8612097e7b7031f3b2fdf587c2bc2843a8"
- }
-}

SPECS/nvidia-docker2/nvidia-docker2.spec

@@ -1,61 +0,0 @@
-%global debug_package %{nil}
-Summary:        nvidia-docker CLI wrapper
-Name:           nvidia-docker2
-Version:        2.10.0
-Release:        1%{?dist}
-License:        ASL2.0
-Vendor:         Microsoft Corporation
-Distribution:   Azure Linux
-Group:          Development Tools
-URL:            https://github.com/NVIDIA/nvidia-docker
-#Source0:       https://github.com/NVIDIA/nvidia-docker/archive/v%%{version}.tar.gz
-Source0:        nvidia-docker-%{version}.tar.gz
-Requires:       nvidia-container-toolkit >= 1.9.0
-Conflicts:      nvidia-docker < 2.0.0
-BuildArch:      noarch
-
-%description
-Replaces nvidia-docker with a new implementation based on nvidia-container-runtime
-
-%prep
-%autosetup -n nvidia-docker-%{version}
-cp nvidia-docker daemon.json LICENSE ..
-
-%install
-mkdir -p %{buildroot}%{_bindir}
-install -m 755 -t %{buildroot}%{_bindir} nvidia-docker
-mkdir -p %{buildroot}%{_sysconfdir}/docker
-install -m 644 -t %{buildroot}%{_sysconfdir}/docker daemon.json
-
-%files
-%license LICENSE
-%{_bindir}/nvidia-docker
-%config %{_sysconfdir}/docker/daemon.json
-
-%changelog
-* Mon Mar 28 2022 Adithya Jayachandran <adjayach@microsoft.com> - 2.10.0-1
-- Updating package to v2.10.0
-- Replace nvidia-container-runtime dependence with nvidia-container-toolkit
-- Bump the nvidia-container-toolkit dependency to v1.9.0
-
-* Wed May 19 2021 Joseph Knierman <joknierm@microsoft.com> - 2.6.0-2
-- License verified
-- Initial CBL-Mariner import from NVIDIA (license: ASL 2.0).
-
-* Thu Apr 29 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 2.6.0-1
-- Add dependence on nvidia-container-runtime >= 3.5.0
-- Add Jenkinsfile for building packages
-
-* Wed Sep 16 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.5.0-1
-- Bump version to v2.5.0
-- Add dependence on nvidia-container-runtime >= 3.4.0
-- Update readme to point to the official documentatio
-- Add %config directive to daemon.json for RPM installations
-
-* Wed Jul 08 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.4.0-1
-- 09a01276 Update package license to match source license
-- b9c70155 Update dependence on nvidia-container-runtime to 3.3.0
-
-* Fri May 15 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.3.0-1
-- 0d3b049a Update build system to support multi-arch builds
-- 8557216d Require new MIG changes

cgmanifest.json

@@ -10331,8 +10331,8 @@
         "type": "other",
         "other": {
           "name": "libnvidia-container",
-          "version": "1.13.5",
+          "version": "1.14.4",
-          "downloadUrl": "https://github.com/NVIDIA/libnvidia-container/archive/v1.13.5.tar.gz"
+          "downloadUrl": "https://github.com/NVIDIA/libnvidia-container/archive/v1.14.4.tar.gz"
         }
       }
     },
@@ -14287,16 +14287,6 @@
         }
       }
     },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "nvidia-container-runtime",
-          "version": "3.13.0",
-          "downloadUrl": "https://github.com/NVIDIA/nvidia-container-runtime/archive/v3.13.0.tar.gz"
-        }
-      }
-    },
     {
       "component": {
         "type": "other",
@@ -14307,16 +14297,6 @@
         }
       }
     },
-    {
-      "component": {
-        "type": "other",
-        "other": {
-          "name": "nvidia-docker2",
-          "version": "2.10.0",
-          "downloadUrl": "https://github.com/NVIDIA/nvidia-docker/archive/v2.10.0.tar.gz"
-        }
-      }
-    },
     {
       "component": {
         "type": "other",