From 7c10762768a62ec589ea87f485b10dea05bebdfe Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 6 Apr 2022 20:53:51 +0200 Subject: [PATCH] Include nvidia-ctk in deb and rpm packages Signed-off-by: Evan Lezar --- packaging/debian/changelog | 1 + packaging/debian/nvidia-container-toolkit.install | 3 ++- packaging/rpm/SPECS/nvidia-container-toolkit.spec | 14 +++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 67ad3690..73e93a8a 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,5 +1,6 @@ nvidia-container-toolkit (1.10.0~rc.1-1) experimental; urgency=medium + * Include nvidia-ctk CLI in installed binaries * Add experimental option to NVIDIA Container Runtime -- NVIDIA CORPORATION Thu, 24 Mar 2022 13:22:24 +0200 diff --git a/packaging/debian/nvidia-container-toolkit.install b/packaging/debian/nvidia-container-toolkit.install index 9547c0c9..0faa1ede 100644 --- a/packaging/debian/nvidia-container-toolkit.install +++ b/packaging/debian/nvidia-container-toolkit.install @@ -1,3 +1,4 @@ config.toml /etc/nvidia-container-runtime nvidia-container-toolkit /usr/bin -nvidia-container-runtime /usr/bin \ No newline at end of file +nvidia-container-runtime /usr/bin +nvidia-ctk /usr/bin diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 678c3012..f940ec97 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -12,10 +12,11 @@ License: Apache-2.0 Source0: nvidia-container-toolkit Source1: nvidia-container-runtime -Source2: config.toml -Source3: oci-nvidia-hook -Source4: oci-nvidia-hook.json -Source5: LICENSE +Source2: nvidia-ctk +Source3: config.toml +Source4: oci-nvidia-hook +Source5: oci-nvidia-hook.json +Source6: LICENSE Obsoletes: nvidia-container-runtime <= 3.5.0-1, nvidia-container-runtime-hook Provides: nvidia-container-runtime @@ -33,12 +34,13 @@ Requires: libseccomp Provides a OCI hook to enable GPU support in containers. %prep -cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . +cp %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} . %install mkdir -p %{buildroot}%{_bindir} install -m 755 -t %{buildroot}%{_bindir} nvidia-container-toolkit install -m 755 -t %{buildroot}%{_bindir} nvidia-container-runtime +install -m 755 -t %{buildroot}%{_bindir} nvidia-ctk mkdir -p %{buildroot}/etc/nvidia-container-runtime install -m 644 -t %{buildroot}/etc/nvidia-container-runtime config.toml @@ -59,12 +61,14 @@ rm -f %{_bindir}/nvidia-container-runtime-hook %license LICENSE %{_bindir}/nvidia-container-toolkit %{_bindir}/nvidia-container-runtime +%{_bindir}/nvidia-ctk %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 %changelog * Thu Mar 24 2022 NVIDIA CORPORATION 1.10.0-0.1.rc.1 +- Include nvidia-ctk CLI in installed binaries - Add experimental option to NVIDIA Container Runtime * Fri Mar 18 2022 NVIDIA CORPORATION 1.9.0-1