From e828697f90b0e054a3c04cb5f988c01329a73285 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 6 Sep 2021 13:51:39 +0200 Subject: [PATCH] Update debian and rpm package definitions Signed-off-by: Evan Lezar --- packaging/debian/changelog | 2 ++ packaging/debian/control | 6 ++--- .../debian/nvidia-container-toolkit.install | 1 + .../rpm/SPECS/nvidia-container-toolkit.spec | 25 ++++++++++++++----- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 61638b80..da13bd12 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,5 +1,7 @@ nvidia-container-toolkit (1.5.2~rc.1-1) experimental; urgency=medium + * Include nvidia-container-runtime into nvidia-container-toolkit package + -- NVIDIA CORPORATION Mon, 06 Sep 2021 12:24:05 +0200 nvidia-container-toolkit (1.5.1-1) UNRELEASED; urgency=medium diff --git a/packaging/debian/control b/packaging/debian/control index 7dbec179..e02e0931 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 9) Package: nvidia-container-toolkit Architecture: any -Depends: ${misc:Depends}, libnvidia-container-tools (>= 1.4.0), libnvidia-container-tools (<< 2.0.0) -Breaks: nvidia-container-runtime (<< 2.0.0), nvidia-container-runtime-hook -Replaces: nvidia-container-runtime (<< 2.0.0), nvidia-container-runtime-hook +Depends: ${misc:Depends}, libnvidia-container-tools (>= 1.4.0), libnvidia-container-tools (<< 2.0.0), libseccomp2 +Breaks: nvidia-container-runtime (<= 3.5.0), nvidia-container-runtime-hook +Replaces: nvidia-container-runtime (<= 3.5.0), nvidia-container-runtime-hook Description: NVIDIA container runtime hook Provides a OCI hook to enable GPU support in containers. diff --git a/packaging/debian/nvidia-container-toolkit.install b/packaging/debian/nvidia-container-toolkit.install index 6975c4bd..9547c0c9 100644 --- a/packaging/debian/nvidia-container-toolkit.install +++ b/packaging/debian/nvidia-container-toolkit.install @@ -1,2 +1,3 @@ config.toml /etc/nvidia-container-runtime nvidia-container-toolkit /usr/bin +nvidia-container-runtime /usr/bin \ No newline at end of file diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 3de3f9d8..3a1ad3f0 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -11,24 +11,34 @@ URL: https://github.com/NVIDIA/nvidia-container-runtime License: Apache-2.0 Source0: nvidia-container-toolkit -Source1: config.toml -Source2: oci-nvidia-hook -Source3: oci-nvidia-hook.json -Source4: LICENSE +Source1: nvidia-container-runtime +Source2: config.toml +Source3: oci-nvidia-hook +Source4: oci-nvidia-hook.json +Source5: LICENSE -Obsoletes: nvidia-container-runtime < 2.0.0, nvidia-container-runtime-hook +Obsoletes: nvidia-container-runtime <= 3.5.0, nvidia-container-runtime-hook +Provides: nvidia-container-runtime Provides: nvidia-container-runtime-hook Requires: libnvidia-container-tools >= 1.4.0, libnvidia-container-tools < 2.0.0 +%if 0%{?suse_version} +Requires: libseccomp2 +Requires: libapparmor1 +%else +Requires: libseccomp +%endif + %description Provides a OCI hook to enable GPU support in containers. %prep -cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} . +cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . %install mkdir -p %{buildroot}%{_bindir} install -m 755 -t %{buildroot}%{_bindir} nvidia-container-toolkit +install -m 755 -t %{buildroot}%{_bindir} nvidia-container-runtime mkdir -p %{buildroot}/etc/nvidia-container-runtime install -m 644 -t %{buildroot}/etc/nvidia-container-runtime config.toml @@ -48,6 +58,7 @@ rm -f %{_bindir}/nvidia-container-runtime-hook %files %license LICENSE %{_bindir}/nvidia-container-toolkit +%{_bindir}/nvidia-container-runtime %config /etc/nvidia-container-runtime/config.toml /usr/libexec/oci/hooks.d/oci-nvidia-hook /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json @@ -55,6 +66,8 @@ rm -f %{_bindir}/nvidia-container-runtime-hook %changelog * Mon Sep 06 2021 NVIDIA CORPORATION 1.5.2-0.1.rc.1 +- Include nvidia-container-runtime into nvidia-container-toolkit package + * Mon Jun 14 2021 NVIDIA CORPORATION 1.5.1-1 - Fix bug where Docker Swarm device selection is ignored if NVIDIA_VISIBLE_DEVICES is also set