Merge branch 'upstream-bump-v1.2.0' into 'master'

Bump to version 1.2.0 See merge request nvidia/container-toolkit/container-toolkit!12
NVIDIA · Jul 8, 2020 · 7ec9e84 · 7ec9e84
2 parents ad7d3dd + 023af37
commit 7ec9e84
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git 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

diff --git 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
diff --git 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 <cudatools@nvidia.com>  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/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
@@ -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.
@@ -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 <cudatools@nvidia.com> 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 <cudatools@nvidia.com> 1.1.2-1
 - c32237f3 Add support for parsing Linux Capabilities for older OCI specs