From ff92f1d799b38721ef78c84a8a46cc11fe8f6168 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 23 Mar 2023 10:33:26 +0200 Subject: [PATCH 1/2] Update libnvidia-container Signed-off-by: Evan Lezar --- CHANGELOG.md | 3 +++ third_party/libnvidia-container | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb6e3321..f7c765de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ * Prefer /run over /var/run when locating nvidia-persistenced and nvidia-fabricmanager sockets. * Only initialize NVML for modes that require it when runing `nvidia-ctk cdi generate` +* [libnvidia-container] Fix segmentation fault when RPC initialization fails. +* [libnvidia-container] Build centos variants of the NVIDIA Container Library with static libtirpc v1.3.2. +* [libnvidia-container] Remove make targets for fedora35 as the centos8 packages are compatible. ## v1.13.0-rc.2 diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index d5e6cdc4..36259363 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit d5e6cdc4c51ff97147cbc46c93fb7b01c8719734 +Subproject commit 36259363e291694f9c246bd9012a9a9b04f2aae2 From 09a0cb24cc7ccd9dc57f5147903bc1d9fef2516e Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 23 Mar 2023 10:35:57 +0200 Subject: [PATCH 2/2] Remove fedora make targets Signed-off-by: Evan Lezar --- docker/docker.mk | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/docker/docker.mk b/docker/docker.mk index 8250904e..d8a2a898 100644 --- a/docker/docker.mk +++ b/docker/docker.mk @@ -14,10 +14,10 @@ # Supported OSs by architecture AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9 -X86_64_TARGETS := fedora35 centos7 centos8 rhel7 rhel8 amazonlinux2 opensuse-leap15.1 +X86_64_TARGETS := centos7 centos8 rhel7 rhel8 amazonlinux2 opensuse-leap15.1 PPC64LE_TARGETS := ubuntu18.04 ubuntu16.04 centos7 centos8 rhel7 rhel8 ARM64_TARGETS := ubuntu20.04 ubuntu18.04 -AARCH64_TARGETS := fedora35 centos8 rhel8 amazonlinux2 +AARCH64_TARGETS := centos8 rhel8 amazonlinux2 # Define top-level build targets docker%: SHELL:=/bin/bash @@ -102,14 +102,6 @@ LIBNVIDIA_CONTAINER_TOOLS_VERSION := $(LIBNVIDIA_CONTAINER_VERSION)$(if $(LIBNVI --centos%: CONFIG_TOML_SUFFIX := rpm-yum --centos8%: BASEIMAGE = quay.io/centos/centos:stream8 -# private fedora target ---fedora%: OS := fedora ---fedora%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum ---fedora%: CONFIG_TOML_SUFFIX := rpm-yum -# The fedora(35) base image has very slow performance when building aarch64 packages. -# Since our primary concern here is glibc versions, we use the older glibc version available in centos8. ---fedora35%: BASEIMAGE = quay.io/centos/centos:stream8 - # private amazonlinux target --amazonlinux%: OS := amazonlinux --amazonlinux%: DOCKERFILE = $(CURDIR)/docker/Dockerfile.rpm-yum