Merge branch 'v1.2.0-rc.1' into 'master'

Prepare 1.2.0-rc.1 release

See merge request nvidia/container-toolkit/libnvidia-container!24

Makefile

@@ -299,5 +299,5 @@ rpm: all
 	$(CP) -T $(PKG_DIR)/rpm $(DESTDIR)
 	$(LN) -nsf $(CURDIR) $(DESTDIR)/BUILD
 	$(MKDIR) -p $(DESTDIR)/RPMS && $(LN) -nsf $(DIST_DIR) $(DESTDIR)/RPMS/$(ARCH)
-	cd $(DESTDIR) && rpmbuild --clean --target=$(ARCH) -bb -D"_topdir $(DESTDIR)" -D"_version $(VERSION)" -D"_major $(MAJOR)" SPECS/*
+	cd $(DESTDIR) && rpmbuild --clean --target=$(ARCH) -bb -D"_topdir $(DESTDIR)" -D"_version $(VERSION)" $(and $(TAG),-D"_tag $(TAG)") -D"_major $(MAJOR)" SPECS/*
 	-cd $(DESTDIR) && rpmlint RPMS/*

mk/docker.mk

@@ -144,6 +144,7 @@ docker-build-%:
 	$(DOCKER) run \
 	    -e DISTRIB \
 	    -e SECTION \
+	    -e TAG \
 	    -v $(ARTIFACTS_DIR):/dist \
 	    $(BUILDIMAGE)
 

pkg/deb/changelog

@@ -1,3 +1,10 @@
+libnvidia-container (1.2.0~rc.1-1) UNRELEASED; urgency=medium
+
+  * 4263e684 Add support for Windows Subsystem for Linux (WSL2)
+  * 2b75a55e Fix ability to build RC packages via TAG=rc.<num>
+
+ -- NVIDIA CORPORATION <[email protected]>  Thu, 11 Jun 2020 15:12:59 -0700
+
 libnvidia-container (1.1.1-1) UNRELEASED; urgency=medium
 
   * deeb499 Fixup deb packaging files to remove warnings

pkg/deb/libnvidia-container@MAJOR@.symbols

@@ -1,25 +1,25 @@
 libnvidia-container.so.1 libnvidia-container1 #MINVER#
- NVC_1.0@NVC_1.0 1.1.1
- nvc_config_free@NVC_1.0 1.1.1
- nvc_config_new@NVC_1.0 1.1.1
- nvc_container_config_free@NVC_1.0 1.1.1
- nvc_container_config_new@NVC_1.0 1.1.1
- nvc_container_free@NVC_1.0 1.1.1
- nvc_container_new@NVC_1.0 1.1.1
- nvc_context_free@NVC_1.0 1.1.1
- nvc_context_new@NVC_1.0 1.1.1
- nvc_device_info_free@NVC_1.0 1.1.1
- nvc_device_info_new@NVC_1.0 1.1.1
- nvc_device_mount@NVC_1.0 1.1.1
- nvc_mig_device_access_caps_mount@NVC_1.0 1.1.1
- nvc_mig_config_global_caps_mount@NVC_1.0 1.1.1
- nvc_mig_monitor_global_caps_mount@NVC_1.0 1.1.1
- nvc_device_mig_caps_mount@NVC_1.0 1.1.1
- nvc_driver_info_free@NVC_1.0 1.1.1
- nvc_driver_info_new@NVC_1.0 1.1.1
- nvc_driver_mount@NVC_1.0 1.1.1
- nvc_error@NVC_1.0 1.1.1
- nvc_init@NVC_1.0 1.1.1
- nvc_ldcache_update@NVC_1.0 1.1.1
- nvc_shutdown@NVC_1.0 1.1.1
- nvc_version@NVC_1.0 1.1.1
+ NVC_1.0@NVC_1.0 1.2.0~rc.1
+ nvc_config_free@NVC_1.0 1.2.0~rc.1
+ nvc_config_new@NVC_1.0 1.2.0~rc.1
+ nvc_container_config_free@NVC_1.0 1.2.0~rc.1
+ nvc_container_config_new@NVC_1.0 1.2.0~rc.1
+ nvc_container_free@NVC_1.0 1.2.0~rc.1
+ nvc_container_new@NVC_1.0 1.2.0~rc.1
+ nvc_context_free@NVC_1.0 1.2.0~rc.1
+ nvc_context_new@NVC_1.0 1.2.0~rc.1
+ nvc_device_info_free@NVC_1.0 1.2.0~rc.1
+ nvc_device_info_new@NVC_1.0 1.2.0~rc.1
+ nvc_device_mount@NVC_1.0 1.2.0~rc.1
+ nvc_mig_device_access_caps_mount@NVC_1.0 1.2.0~rc.1
+ nvc_mig_config_global_caps_mount@NVC_1.0 1.2.0~rc.1
+ nvc_mig_monitor_global_caps_mount@NVC_1.0 1.2.0~rc.1
+ nvc_device_mig_caps_mount@NVC_1.0 1.2.0~rc.1
+ nvc_driver_info_free@NVC_1.0 1.2.0~rc.1
+ nvc_driver_info_new@NVC_1.0 1.2.0~rc.1
+ nvc_driver_mount@NVC_1.0 1.2.0~rc.1
+ nvc_error@NVC_1.0 1.2.0~rc.1
+ nvc_init@NVC_1.0 1.2.0~rc.1
+ nvc_ldcache_update@NVC_1.0 1.2.0~rc.1
+ nvc_shutdown@NVC_1.0 1.2.0~rc.1
+ nvc_version@NVC_1.0 1.2.0~rc.1

pkg/rpm/SPECS/libnvidia-container.spec

@@ -5,7 +5,9 @@ Packager: NVIDIA CORPORATION <[email protected]>
 URL: https://github.com/NVIDIA/libnvidia-container
 BuildRequires: make
 Version: %{_version}
-Release: 1
+%{!?_tag: %define _release 1}
+%{?_tag:  %define _release 0.1.%{_tag}}
+Release: %{_release}
 Summary: NVIDIA container runtime library
 %description
 The nvidia-container library provides an interface to configure GNU/Linux
@@ -72,7 +74,7 @@ This package contains the debugging symbols for the library.
 %{_prefix}/lib/debug%{_libdir}/lib*.so.*
 
 %package tools
-Requires: %{name}%{_major}%{?_isa} >= %{version}-1, %{name}%{_major}%{?_isa} >= %{version}-%{release}
+Requires: %{name}%{_major}%{?_isa} >= %{version}-%{release}
 Summary: NVIDIA container runtime library (command-line tools)
 %description tools
 The nvidia-container library provides an interface to configure GNU/Linux
@@ -85,6 +87,10 @@ This package contains command-line tools that facilitate using the library.
 %{_bindir}/*
 
 %changelog
+* Thu Jun 11 2020 NVIDIA CORPORATION <[email protected]> 1.2.0-0.1.rc.1
+- 4263e684 Add support for Windows Subsystem for Linux (WSL2)
+- 2b75a55e Fix ability to build RC packages via TAG=rc.<num>
+
 * Tue May 19 2020 NVIDIA CORPORATION <[email protected]> 1.1.1-1
 - deeb499 Fixup deb packaging files to remove warnings
 - 6003504 nvmlSystemGetCudaDriverVersion_v2 to nvmlSystemGetCudaDriverVersion

src/nvc.h

@@ -14,9 +14,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define NVC_MAJOR   1
-#define NVC_MINOR   1
-#define NVC_PATCH   1
-#define NVC_VERSION "1.1.1"
+#define NVC_MINOR   2
+#define NVC_PATCH   0
+#define NVC_VERSION "1.2.0"
 
 #define NVC_ARG_MAX 256