From e768f8bca50f321e1f4f9ef85143b1fe0b2e02d2 Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Thu, 11 Jun 2020 13:32:29 +0000 Subject: [PATCH 1/3] Fix ability to build RC packages via TAG=rc. on make This actually still works for all debian based systems, but was broken for rpm based systems by b6aff41f09bb2c21ed7da3058c61a063726fa5d6 This patch now reenables it for rpm packages as well. Signed-off-by: Kevin Klues --- Makefile | 2 +- mk/docker.mk | 1 + pkg/rpm/SPECS/libnvidia-container.spec | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3d9a47c1..c07863bb 100644 --- a/Makefile +++ b/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/* diff --git a/mk/docker.mk b/mk/docker.mk index 8f341e5e..2943bded 100644 --- a/mk/docker.mk +++ b/mk/docker.mk @@ -144,6 +144,7 @@ docker-build-%: $(DOCKER) run \ -e DISTRIB \ -e SECTION \ + -e TAG \ -v $(ARTIFACTS_DIR):/dist \ $(BUILDIMAGE) diff --git a/pkg/rpm/SPECS/libnvidia-container.spec b/pkg/rpm/SPECS/libnvidia-container.spec index 0a803bfc..ad67075e 100644 --- a/pkg/rpm/SPECS/libnvidia-container.spec +++ b/pkg/rpm/SPECS/libnvidia-container.spec @@ -5,7 +5,9 @@ Packager: NVIDIA CORPORATION 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 From cba086497211f7711b4cdc80492933990ef0f1cc Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Thu, 11 Jun 2020 13:39:53 +0000 Subject: [PATCH 2/3] Bump version to 1.2.0-rc.1 Signed-off-by: Kevin Klues --- pkg/deb/libnvidia-container@MAJOR@.symbols | 48 +++++++++++----------- src/nvc.h | 6 +-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkg/deb/libnvidia-container@MAJOR@.symbols b/pkg/deb/libnvidia-container@MAJOR@.symbols index 73f65046..c87acbe5 100644 --- a/pkg/deb/libnvidia-container@MAJOR@.symbols +++ b/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 diff --git a/src/nvc.h b/src/nvc.h index 9087bc8c..0e5cb1f9 100644 --- a/src/nvc.h +++ b/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 From ef45f6de29690d8fe9099a62622ce9f82a8c1b9c Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Thu, 11 Jun 2020 13:41:31 +0000 Subject: [PATCH 3/3] Update changelog for 1.2.0-rc.1 Signed-off-by: Kevin Klues --- pkg/deb/changelog | 7 +++++++ pkg/rpm/SPECS/libnvidia-container.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/pkg/deb/changelog b/pkg/deb/changelog index 34b387ad..c21019b7 100644 --- a/pkg/deb/changelog +++ b/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. + + -- NVIDIA CORPORATION 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 diff --git a/pkg/rpm/SPECS/libnvidia-container.spec b/pkg/rpm/SPECS/libnvidia-container.spec index ad67075e..46a972bf 100644 --- a/pkg/rpm/SPECS/libnvidia-container.spec +++ b/pkg/rpm/SPECS/libnvidia-container.spec @@ -87,6 +87,10 @@ This package contains command-line tools that facilitate using the library. %{_bindir}/* %changelog +* Thu Jun 11 2020 NVIDIA CORPORATION 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. + * Tue May 19 2020 NVIDIA CORPORATION 1.1.1-1 - deeb499 Fixup deb packaging files to remove warnings - 6003504 nvmlSystemGetCudaDriverVersion_v2 to nvmlSystemGetCudaDriverVersion