diff --git a/meta-nvidia/recipes-graphics/libnvidia-container/libnvidia-container.inc b/meta-nvidia/recipes-graphics/libnvidia-container/libnvidia-container.inc index f93a1ac..f701892 100644 --- a/meta-nvidia/recipes-graphics/libnvidia-container/libnvidia-container.inc +++ b/meta-nvidia/recipes-graphics/libnvidia-container/libnvidia-container.inc @@ -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 \ @@ -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 = " \ diff --git a/meta-nvidia/recipes-graphics/libnvidia-container/libnvidia-container_1.00.bb b/meta-nvidia/recipes-graphics/libnvidia-container/libnvidia-container_1.00.bb index 107fee9..0bdcb1f 100644 --- a/meta-nvidia/recipes-graphics/libnvidia-container/libnvidia-container_1.00.bb +++ b/meta-nvidia/recipes-graphics/libnvidia-container/libnvidia-container_1.00.bb @@ -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 " @@ -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 } @@ -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"