From 68f0203a49635fb061e9bbc8f84c67ac6524bedc Mon Sep 17 00:00:00 2001 From: Evan Lezar <7723350-elezar@users.noreply.gitlab.com> Date: Tue, 9 Jan 2024 09:44:23 +0000 Subject: [PATCH] Merge branch 'remove-libseccomp-dependency' into 'main' Remove libseccomp package dependency See merge request nvidia/container-toolkit/container-toolkit!531 --- CHANGELOG.md | 1 + packaging/debian/control | 2 +- packaging/rpm/SPECS/nvidia-container-toolkit.spec | 7 ------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee60beb9..a5a3e77f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Include `vulkan/icd.d/nvidia_layers.json` in list of graphics mounts. * Fixed bug in `nvidia-ctk config` command when using `--set`. The types of applied config options are now applied correctly. * Log explicitly requested runtime mode. +* Remove package dependency on libseccomp. ## v1.14.3 * [toolkit-container] Bump CUDA base image version to 12.2.2. diff --git a/packaging/debian/control b/packaging/debian/control index c43cbcbd..01abcea4 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9) Package: nvidia-container-toolkit Architecture: any -Depends: ${misc:Depends}, nvidia-container-toolkit-base (= @VERSION@), libnvidia-container-tools (>= @LIBNVIDIA_CONTAINER_TOOLS_VERSION@), libnvidia-container-tools (<< 2.0.0), libseccomp2 +Depends: ${misc:Depends}, nvidia-container-toolkit-base (= @VERSION@), libnvidia-container-tools (>= @LIBNVIDIA_CONTAINER_TOOLS_VERSION@), libnvidia-container-tools (<< 2.0.0) Breaks: nvidia-container-runtime (<= 3.5.0-1), nvidia-container-runtime-hook Replaces: nvidia-container-runtime (<= 3.5.0-1), nvidia-container-runtime-hook Description: NVIDIA Container toolkit diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index a3613537..79ef91b2 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -23,13 +23,6 @@ Provides: nvidia-container-runtime-hook Requires: libnvidia-container-tools >= %{libnvidia_container_tools_version}, libnvidia-container-tools < 2.0.0 Requires: nvidia-container-toolkit-base == %{version}-%{release} -%if 0%{?suse_version} -Requires: libseccomp2 -Requires: libapparmor1 -%else -Requires: libseccomp -%endif - %description Provides tools and utilities to enable GPU support in containers.