Skip to content
This repository was archived by the owner on Jul 13, 2026. It is now read-only.

fix: build libnvidia-container without network access#49

Open
kvinwang wants to merge 1 commit into
base:main
Choose a base branch
from
Open

fix: build libnvidia-container without network access #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions meta-nvidia/recipes-graphics/libnvidia-container/libnvidia-container.inc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "\
"

ELF_TOOLCHAIN_VERSION = "0.7.1"
NVIDIA_MODPROBE_VERSION = "550.40.07"
NVIDIA_MODPROBE_VERSION = "550.54.14"
LIBTIRPC_VERSION = "1.3.4"

SRC_URI = "git://github.com/NVIDIA/libnvidia-container.git;protocol=https;name=libnvidia;branch=release-1.14 \
Expand All@@ -23,8 +23,8 @@ SRC_URI = "git://github.com/NVIDIA/libnvidia-container.git;protocol=https;name=l

# SRCREV = "a4ef85ebc86688eeef667271abbc7cd4f1110cf6"
SRCREV_libnvidia = "d2eb0afe86f0b643e33624ee64f065dd60e952d4"
# Nvidia modprobe version 495.44
SRCREV_modprobe = "d6bce304f30b6661c9ab6a993f49340eafca7a7e"
# Nvidia modprobe version 550.54.14
SRCREV_modprobe = "149440ca0654d928f27df5ebff485a122bfe43b1"
SRCREV_FORMAT = "libnvidia_modprobe"

DEPENDS = " \
Expand Down
10 changes: 7 additions & 3 deletions meta-nvidia/recipes-graphics/libnvidia-container/libnvidia-container_1.00.bb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,8 @@ PACKAGECONFIG[seccomp] = "WITH_SECCOMP=yes,WITH_SECCOMP=no,libseccomp"
# include bmake-native which does not exist at the moment.
EXTRA_OEMAKE = "EXCLUDE_BUILD_FLAGS=1 PLATFORM=${HOST_ARCH} WITH_NVCGO=yes WITH_LIBELF=yes WITH_SECCOMP=yes COMPILER=${@d.getVar('CC').split()[0]} REVISION=${SRCREV_libnvidia} ${PACKAGECONFIG_CONFARGS} \
NVIDIA_MODPROBE_EXTRA_CFLAGS=${NVIDIA_MODPROBE_EXTRA_CFLAGS} \
GOCACHE=${WORKDIR}/go-cache GOPATH=${WORKDIR}/go GOMODCACHE=${WORKDIR}/go-mod"
GOCACHE=${WORKDIR}/go-cache GOPATH=${WORKDIR}/go GOMODCACHE=${WORKDIR}/go-mod \
GOFLAGS=-mod=vendor"
NVIDIA_MODPROBE_EXTRA_CFLAGS ?= "-ffile-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
CFLAGS:prepend = " -I${RECIPE_SYSROOT_NATIVE}/usr/include/tirpc "

Expand All@@ -21,7 +22,11 @@ LDFLAGS += "-Wl,-z,lazy"
GO_LINKSHARED = ""
REQUIRED_DISTRO_FEATURES = "virtualization"
do_configure:append() {
# Mark Nvidia modprobe as downloaded
# Apply the nvidia-modprobe patch that the Makefile's download rule would
# normally apply after curl. Since we fetch via SRC_URI instead, we need
# to apply it here and then mark as downloaded.
cd ${S}/deps/src/nvidia-modprobe-${NVIDIA_MODPROBE_VERSION}
patch -p1 < ${S}/mk/nvidia-modprobe.patch
touch ${S}/deps/src/nvidia-modprobe-${NVIDIA_MODPROBE_VERSION}/.download_stamp
Comment on lines +28 to 30

CopilotAIApr 21, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do_configure:append() applies nvidia-modprobe.patch unconditionally. If the task is re-run (e.g., -c configure -f, sstate invalidation, or iterative dev builds), patch will typically fail with “Reversed (or previously applied) patch detected”, causing a hard build failure. Make the patch step idempotent (e.g., gate on a dedicated stamp file, or use patch --forward/--batch and handle the already-applied case) and only create the stamp after a successful apply.

Suggested change
cd${S}/deps/src/nvidia-modprobe-${NVIDIA_MODPROBE_VERSION}
patch -p1 < ${S}/mk/nvidia-modprobe.patch
touch${S}/deps/src/nvidia-modprobe-${NVIDIA_MODPROBE_VERSION}/.download_stamp
modprobe_src="${S}/deps/src/nvidia-modprobe-${NVIDIA_MODPROBE_VERSION}"
cd${modprobe_src}
if [ ! -e${modprobe_src}/.download_stamp ]; then
patch -p1 < ${S}/mk/nvidia-modprobe.patch
touch${modprobe_src}/.download_stamp
fi

Copilot uses AI. Check for mistakes.
}

Expand DownExpand Up@@ -58,7 +63,6 @@ FILES_${PN} += "/usr/local/bin /usr/local/lib"

RDEPENDS:${PN}:append = " ldconfig"

do_compile[network] = "1"

# Added to skip buildpath QA errors for files generated by rpcgen
INSANE_SKIP:${PN}-src = "buildpaths"
Expand Down
Loading