From 8e0aab4607bd29e0b019d0ccd60d013a0c1ed917 Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Wed, 8 Jul 2020 16:21:23 +0000 Subject: [PATCH 1/4] Fix repo listed in changelog for debian distributions Signed-off-by: Kevin Klues --- docker/Dockerfile.debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 29c1329d..8329dfb9 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -64,6 +64,6 @@ COPY packaging/debian ./debian RUN sed -i "s;@VERSION@;${REVISION};" debian/changelog && \ if [ "$REVISION" != "$(dpkg-parsechangelog --show-field=Version)" ]; then exit 1; fi -CMD export DISTRIB="unstable" && \ +CMD export DISTRIB="$(lsb_release -cs)" && \ debuild -eDISTRIB -eSECTION --dpkg-buildpackage-hook='sh debian/prepare' -i -us -uc -b && \ mv /tmp/nvidia-container-toolkit_*.deb /dist From 320bb6e4dcae1f6becf8348688d4df376f8ddf91 Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Wed, 8 Jul 2020 16:16:41 +0000 Subject: [PATCH 2/4] Update dependence on libnvidia-container to 1.2.0 Signed-off-by: Kevin Klues --- packaging/debian/control | 2 +- packaging/rpm/SPECS/nvidia-container-toolkit.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/debian/control b/packaging/debian/control index 98ed7564..22ffe1b8 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}, libnvidia-container-tools (>= 1.1.1), libnvidia-container-tools (<< 2.0.0) +Depends: ${misc:Depends}, libnvidia-container-tools (>= 1.2.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 Description: NVIDIA container runtime hook diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 0e059dcf..6e7c2fe5 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -18,7 +18,7 @@ Source4: LICENSE Obsoletes: nvidia-container-runtime < 2.0.0, nvidia-container-runtime-hook Provides: nvidia-container-runtime-hook -Requires: libnvidia-container-tools >= 1.1.1, libnvidia-container-tools < 2.0.0 +Requires: libnvidia-container-tools >= 1.2.0, libnvidia-container-tools < 2.0.0 %description Provides a OCI hook to enable GPU support in containers. From a63bef2281974156fbae132c545080609888d49c Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Wed, 8 Jul 2020 16:13:27 +0000 Subject: [PATCH 3/4] Bump version to 1.2.0 Signed-off-by: Kevin Klues --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e2ccef98..771da990 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ MKDIR ?= mkdir DIST_DIR ?= $(CURDIR)/dist LIB_NAME := nvidia-container-toolkit -LIB_VERSION := 1.1.2 +LIB_VERSION := 1.2.0 GOLANG_VERSION := 1.14.2 GOLANG_PKG_PATH := github.com/NVIDIA/container-toolkit/pkg From 023af3729f1dd67269b3221a31be500f350e3d10 Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Wed, 8 Jul 2020 16:13:48 +0000 Subject: [PATCH 4/4] Update changelogs for 1.2.0 Signed-off-by: Kevin Klues --- packaging/debian/changelog | 10 ++++++++++ packaging/rpm/SPECS/nvidia-container-toolkit.spec | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 43465c33..29ba8878 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,13 @@ +nvidia-container-toolkit (1.2.0-1) UNRELEASED; urgency=medium + + * 8e0aab46 Fix repo listed in changelog for debian distributions + * 320bb6e4 Update dependence on libnvidia-container to 1.2.0 + * 6cfc8097 Update package license to match source license + * e7dc3cbb Fix debian copyright file + * d3aee3e0 Add the 'ngx' driver capability + + -- NVIDIA CORPORATION Wed, 08 Jul 2020 18:11:19 -0700 + nvidia-container-toolkit (1.1.2-1) UNRELEASED; urgency=medium * c32237f3 Add support for parsing Linux Capabilities for older OCI specs diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 6e7c2fe5..8b06aab3 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -53,6 +53,13 @@ rm -f %{_bindir}/nvidia-container-runtime-hook /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json %changelog +* Wed Jul 08 2020 NVIDIA CORPORATION 1.2.0-1 +- 8e0aab46 Fix repo listed in changelog for debian distributions +- 320bb6e4 Update dependence on libnvidia-container to 1.2.0 +- 6cfc8097 Update package license to match source license +- e7dc3cbb Fix debian copyright file +- d3aee3e0 Add the 'ngx' driver capability + * Wed Jun 03 2020 NVIDIA CORPORATION 1.1.2-1 - c32237f3 Add support for parsing Linux Capabilities for older OCI specs