github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-22 12:29:49 +00:00
Code Issues Projects Releases Wiki Activity

gpu: Fix confidential build

Browse Source 
NVRC introduced the confidential feature flag and we
haven't updated the rootfs build to accomodate.
If rootfs_type==confidential user --feature=confidential

Signed-off-by: Zvonko Kaiser <zkaiser@nvidia.com>
This commit is contained in:
Zvonko Kaiser
2025-10-08 00:02:19 +00:00
committed by Fabiano Fidêncio
parent 2260f66339
commit 7061f64db5
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/osbuilder/rootfs-builder/nvidia/nvidia_chroot.sh
View File

@@ -197,6 +197,7 @@ prepare_distribution_drivers() {
eval "${APT_INSTALL}" nvidia-utils-"${driver_version}" eval "${APT_INSTALL}" nvidia-utils-"${driver_version}"
eval "${APT_INSTALL}" nvidia-headless-no-dkms-"${driver_version}${driver_type}" \ eval "${APT_INSTALL}" nvidia-headless-no-dkms-"${driver_version}${driver_type}" \
nvidia-firmware-"${driver_version}" \
nvidia-imex-"${driver_version}" \ nvidia-imex-"${driver_version}" \
libnvidia-cfg1-"${driver_version}" \ libnvidia-cfg1-"${driver_version}" \
libnvidia-gl-"${driver_version}" \ libnvidia-gl-"${driver_version}" \

8
tools/osbuilder/rootfs-builder/nvidia/nvidia_rootfs.sh
View File

@@ -31,9 +31,11 @@ else
die "Unsupported architecture: ${machine_arch}" die "Unsupported architecture: ${machine_arch}"
fi fi
# TODO: use only releases of NVRC
setup_nvidia-nvrc() { setup_nvidia-nvrc() {
local rootfs_type=${1:-""}
local TARGET="nvidia-nvrc" local TARGET="nvidia-nvrc"
local TARGET_VERSION="main"
local PROJECT="nvrc" local PROJECT="nvrc"
local TARGET_BUILD_DIR="${BUILD_DIR}/${TARGET}/builddir" local TARGET_BUILD_DIR="${BUILD_DIR}/${TARGET}/builddir"
local TARGET_DEST_DIR="${BUILD_DIR}/${TARGET}/destdir" local TARGET_DEST_DIR="${BUILD_DIR}/${TARGET}/destdir"
@@ -49,7 +51,7 @@ setup_nvidia-nvrc() {
pushd "${PROJECT}" > /dev/null || exit 1 pushd "${PROJECT}" > /dev/null || exit 1
cargo build --release --target="${machine_arch}"-unknown-linux-musl cargo build --release --target="${machine_arch}"-unknown-linux-musl --features="${rootfs_type}"
cp target/"${machine_arch}"-unknown-linux-musl/release/NVRC ../../destdir/bin/. cp target/"${machine_arch}"-unknown-linux-musl/release/NVRC ../../destdir/bin/.
popd > /dev/null || exit 1 popd > /dev/null || exit 1
@@ -73,7 +75,7 @@ setup_nvidia_gpu_rootfs_stage_one() {
info "nvidia: Setup GPU rootfs type=${rootfs_type}" info "nvidia: Setup GPU rootfs type=${rootfs_type}"
if [[ ! -e "${BUILD_DIR}/kata-static-nvidia-nvrc.tar.zst" ]]; then if [[ ! -e "${BUILD_DIR}/kata-static-nvidia-nvrc.tar.zst" ]]; then
setup_nvidia-nvrc setup_nvidia-nvrc "${rootfs_type}"
fi fi
cp "${SCRIPT_DIR}/nvidia_chroot.sh" ./nvidia_chroot.sh cp "${SCRIPT_DIR}/nvidia_chroot.sh" ./nvidia_chroot.sh