From 1b3e2d9423b3122fd86a13d5b5b27a63537a6df3 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 8 Nov 2021 11:22:17 +0100 Subject: [PATCH 1/2] Bump version post v1.6.0-rc.2 release Signed-off-by: Evan Lezar --- Makefile | 2 +- build/container/Makefile | 2 +- packaging/debian/changelog | 8 +++++++- packaging/rpm/SPECS/nvidia-container-toolkit.spec | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 15458521..97fe3b5a 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ DIST_DIR ?= $(CURDIR)/dist LIB_NAME := nvidia-container-toolkit LIB_VERSION := 1.6.0 -LIB_TAG ?= rc.2 +LIB_TAG ?= rc.3 GOLANG_VERSION := 1.16.3 MODULE := github.com/NVIDIA/nvidia-container-toolkit diff --git a/build/container/Makefile b/build/container/Makefile index 065ce6dd..ed036156 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -21,7 +21,7 @@ DIST_DIR ?= $(CURDIR)/dist # TODO: These should be defined ONCE and currently duplicate the version in the # toolkit makefile. LIB_VERSION := 1.6.0 -LIB_TAG := rc.2 +LIB_TAG := rc.3 VERSION ?= $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG)) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 7cda74a0..26ea10b6 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,8 +1,14 @@ +nvidia-container-toolkit (1.6.0~rc.3-1) experimental; urgency=medium + + * Move OCI and command line checks for runtime to internal oci package + + -- NVIDIA CORPORATION Mon, 15 Nov 2021 13:02:23 +0100 + nvidia-container-toolkit (1.6.0~rc.2-1) experimental; urgency=medium * Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime - -- NVIDIA CORPORATION Tue, 26 Oct 2021 12:24:05 +0200 + -- NVIDIA CORPORATION Fri, 05 Nov 2021 12:24:05 +0200 nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 2e0bd3db..93f78b6d 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -64,8 +64,11 @@ rm -f %{_bindir}/nvidia-container-runtime-hook /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json %changelog +* Mon Nov 15 2021 NVIDIA CORPORATION 1.6.0-0.1.rc.3 -* Tue Oct 26 2021 NVIDIA CORPORATION 1.6.0-0.1.rc.2 +- Move OCI and command line checks for runtime to internal oci package + +* Fri Nov 05 2021 NVIDIA CORPORATION 1.6.0-0.1.rc.2 - Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime From 060f6702321f41bd98055c3a377300544cb6e623 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 15 Nov 2021 13:06:42 +0100 Subject: [PATCH 2/2] Update libnvidia-container submodule to 1.6.0-rc.3 Signed-off-by: Evan Lezar --- third_party/libnvidia-container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index badec1fa..3bca465e 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit badec1fa4a2c085aa9396f95b6bb1d69f1c7996b +Subproject commit 3bca465e82ce5843e6b4428596c00ee0c3db7696