Skip to content

Commit 5f55981

Browse files
klueskaklueska
committed
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
2 parents 4263e68 + ef45f6d commit 5f55981

File tree

6 files changed

+44
-30
lines changed

6 files changed

+44
-30
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,5 +299,5 @@ rpm: all
299299
$(CP) -T $(PKG_DIR)/rpm $(DESTDIR)
300300
$(LN) -nsf $(CURDIR) $(DESTDIR)/BUILD
301301
$(MKDIR) -p $(DESTDIR)/RPMS && $(LN) -nsf $(DIST_DIR) $(DESTDIR)/RPMS/$(ARCH)
302-
cd $(DESTDIR) && rpmbuild --clean --target=$(ARCH) -bb -D"_topdir $(DESTDIR)" -D"_version $(VERSION)" -D"_major $(MAJOR)" SPECS/*
302+
cd $(DESTDIR) && rpmbuild --clean --target=$(ARCH) -bb -D"_topdir $(DESTDIR)" -D"_version $(VERSION)" $(and $(TAG),-D"_tag $(TAG)") -D"_major $(MAJOR)" SPECS/*
303303
-cd $(DESTDIR) && rpmlint RPMS/*

‎mk/docker.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ docker-build-%:
144144
$(DOCKER) run \
145145
-e DISTRIB \
146146
-e SECTION \
147+
-e TAG \
147148
-v $(ARTIFACTS_DIR):/dist \
148149
$(BUILDIMAGE)
149150

‎pkg/deb/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
libnvidia-container (1.2.0~rc.1-1) UNRELEASED; urgency=medium
2+
3+
* 4263e684 Add support for Windows Subsystem for Linux (WSL2)
4+
* 2b75a55e Fix ability to build RC packages via TAG=rc.<num>
5+
6+
-- NVIDIA CORPORATION <[email protected]> Thu, 11 Jun 2020 15:12:59 -0700
7+
18
libnvidia-container (1.1.1-1) UNRELEASED; urgency=medium
29

310
* deeb499 Fixup deb packaging files to remove warnings

‎pkg/deb/libnvidia-container@[email protected]

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
libnvidia-container.so.1 libnvidia-container1 #MINVER#
2-
NVC_1.0@NVC_1.0 1.1.1
3-
nvc_config_free@NVC_1.0 1.1.1
4-
nvc_config_new@NVC_1.0 1.1.1
5-
nvc_container_config_free@NVC_1.0 1.1.1
6-
nvc_container_config_new@NVC_1.0 1.1.1
7-
nvc_container_free@NVC_1.0 1.1.1
8-
nvc_container_new@NVC_1.0 1.1.1
9-
nvc_context_free@NVC_1.0 1.1.1
10-
nvc_context_new@NVC_1.0 1.1.1
11-
nvc_device_info_free@NVC_1.0 1.1.1
12-
nvc_device_info_new@NVC_1.0 1.1.1
13-
nvc_device_mount@NVC_1.0 1.1.1
14-
nvc_mig_device_access_caps_mount@NVC_1.0 1.1.1
15-
nvc_mig_config_global_caps_mount@NVC_1.0 1.1.1
16-
nvc_mig_monitor_global_caps_mount@NVC_1.0 1.1.1
17-
nvc_device_mig_caps_mount@NVC_1.0 1.1.1
18-
nvc_driver_info_free@NVC_1.0 1.1.1
19-
nvc_driver_info_new@NVC_1.0 1.1.1
20-
nvc_driver_mount@NVC_1.0 1.1.1
21-
nvc_error@NVC_1.0 1.1.1
22-
nvc_init@NVC_1.0 1.1.1
23-
nvc_ldcache_update@NVC_1.0 1.1.1
24-
nvc_shutdown@NVC_1.0 1.1.1
25-
nvc_version@NVC_1.0 1.1.1
2+
NVC_1.0@NVC_1.0 1.2.0~rc.1
3+
nvc_config_free@NVC_1.0 1.2.0~rc.1
4+
nvc_config_new@NVC_1.0 1.2.0~rc.1
5+
nvc_container_config_free@NVC_1.0 1.2.0~rc.1
6+
nvc_container_config_new@NVC_1.0 1.2.0~rc.1
7+
nvc_container_free@NVC_1.0 1.2.0~rc.1
8+
nvc_container_new@NVC_1.0 1.2.0~rc.1
9+
nvc_context_free@NVC_1.0 1.2.0~rc.1
10+
nvc_context_new@NVC_1.0 1.2.0~rc.1
11+
nvc_device_info_free@NVC_1.0 1.2.0~rc.1
12+
nvc_device_info_new@NVC_1.0 1.2.0~rc.1
13+
nvc_device_mount@NVC_1.0 1.2.0~rc.1
14+
nvc_mig_device_access_caps_mount@NVC_1.0 1.2.0~rc.1
15+
nvc_mig_config_global_caps_mount@NVC_1.0 1.2.0~rc.1
16+
nvc_mig_monitor_global_caps_mount@NVC_1.0 1.2.0~rc.1
17+
nvc_device_mig_caps_mount@NVC_1.0 1.2.0~rc.1
18+
nvc_driver_info_free@NVC_1.0 1.2.0~rc.1
19+
nvc_driver_info_new@NVC_1.0 1.2.0~rc.1
20+
nvc_driver_mount@NVC_1.0 1.2.0~rc.1
21+
nvc_error@NVC_1.0 1.2.0~rc.1
22+
nvc_init@NVC_1.0 1.2.0~rc.1
23+
nvc_ldcache_update@NVC_1.0 1.2.0~rc.1
24+
nvc_shutdown@NVC_1.0 1.2.0~rc.1
25+
nvc_version@NVC_1.0 1.2.0~rc.1

‎pkg/rpm/SPECS/libnvidia-container.spec

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ Packager: NVIDIA CORPORATION <[email protected]>
55
URL: https://github.com/NVIDIA/libnvidia-container
66
BuildRequires: make
77
Version: %{_version}
8-
Release: 1
8+
%{!?_tag: %define _release 1}
9+
%{?_tag: %define _release 0.1.%{_tag}}
10+
Release: %{_release}
911
Summary: NVIDIA container runtime library
1012
%description
1113
The nvidia-container library provides an interface to configure GNU/Linux
@@ -72,7 +74,7 @@ This package contains the debugging symbols for the library.
7274
%{_prefix}/lib/debug%{_libdir}/lib*.so.*
7375

7476
%package tools
75-
Requires: %{name}%{_major}%{?_isa} >= %{version}-1, %{name}%{_major}%{?_isa} >= %{version}-%{release}
77+
Requires: %{name}%{_major}%{?_isa} >= %{version}-%{release}
7678
Summary: NVIDIA container runtime library (command-line tools)
7779
%description tools
7880
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.
8587
%{_bindir}/*
8688

8789
%changelog
90+
* Thu Jun 11 2020 NVIDIA CORPORATION <[email protected]> 1.2.0-0.1.rc.1
91+
- 4263e684 Add support for Windows Subsystem for Linux (WSL2)
92+
- 2b75a55e Fix ability to build RC packages via TAG=rc.<num>
93+
8894
* Tue May 19 2020 NVIDIA CORPORATION <[email protected]> 1.1.1-1
8995
- deeb499 Fixup deb packaging files to remove warnings
9096
- 6003504 nvmlSystemGetCudaDriverVersion_v2 to nvmlSystemGetCudaDriverVersion

‎src/nvc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ extern "C" {
1414
#endif /* __cplusplus */
1515

1616
#define NVC_MAJOR 1
17-
#define NVC_MINOR 1
18-
#define NVC_PATCH 1
19-
#define NVC_VERSION "1.1.1"
17+
#define NVC_MINOR 2
18+
#define NVC_PATCH 0
19+
#define NVC_VERSION "1.2.0"
2020

2121
#define NVC_ARG_MAX 256
2222

0 commit comments

Comments
 (0)