Skip to content

Commit 2ef6664

Browse files
author
Evan Lezar
committed
Merge branch 'fix-fedora-artifacts-dir' into 'main'
Fix fedora35 artifact dir See merge request nvidia/container-toolkit/libnvidia-container!180
2 parents 5c7ea1d + 8adfca0 commit 2ef6664

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

mk/docker.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ docker-amd64-verify: $(patsubst %, %-verify, $(AMD64_TARGETS)) \
142142
--fedora35%: OS := centos
143143
# We need to specify this version to ensure that the correct packages are installed in the centos8 build image
144144
--fedora35%: VERSION := 8
145+
--fedora35%: ARTIFACTS_DIR = $(DIST_DIR)/fedora35/$(ARCH)
145146

146147
# private opensuse-leap target with overrides
147148
--opensuse-leap%: OS := opensuse-leap

pkg/deb/changelog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ libnvidia-container (1.11.0~rc.3-1) experimental; urgency=medium
22

33
* Preload libgcc_s.so.1 on arm64 systems
44

5-
-- NVIDIA CORPORATION <[email protected]> Mon, 22 Aug 2022 17:11:32 +0200
5+
-- NVIDIA CORPORATION <[email protected]> Tue, 23 Aug 2022 17:11:32 +0200
66

77
libnvidia-container (1.11.0~rc.2-1) experimental; urgency=medium
88

pkg/rpm/SPECS/libnvidia-container.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ This package contains command-line tools that facilitate using the library.
9999
%{_bindir}/*
100100

101101
%changelog
102-
* Mon Aug 22 2022 NVIDIA CORPORATION <[email protected]> 1.11.0-0.1.rc.3
102+
* Tue Aug 23 2022 NVIDIA CORPORATION <[email protected]> 1.11.0-0.1.rc.3
103103
- Preload libgcc_s.so.1 on arm64 systems
104104

105105
* Tue Jul 26 2022 NVIDIA CORPORATION <[email protected]> 1.11.0-0.1.rc.2

src/nvc_ldcache.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ change_rootfs(struct error *err, const char *rootfs, bool no_pivot, bool mount_p
117117
goto fail;
118118
}
119119
if (fchdir(newroot) < 0) {
120-
log_errf("failed calling fchdir %s", newroot);
120+
log_errf("failed calling fchdir %d", newroot);
121121
goto fail;
122122
}
123123
} else {

0 commit comments

Comments
 (0)