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

gpu: Use variable to differentiate rootfs variants

Browse Source 
With this change we namespace the stage one rootfs tarball name
and use the same name across all uses. This will help overcome
several subtle local build problems.

Signed-off-by: Manuel Huber <manuelh@nvidia.com>
This commit is contained in:
Manuel Huber
2025-10-09 20:54:54 +00:00
committed by Fabiano Fidêncio
parent 88c333f2a6
commit 8221361915
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,7 @@ setup_nvidia-nvrc() {
} }
setup_nvidia_gpu_rootfs_stage_one() { setup_nvidia_gpu_rootfs_stage_one() {
if [[ -e "${BUILD_DIR}/kata-static-nvidia-gpu-rootfs-stage-one.tar.zst" ]]; then if [[ -e "${BUILD_DIR}/kata-static-rootfs-${VARIANT}-stage-one.tar.zst" ]]; then
info "nvidia: GPU rootfs stage one already exists" info "nvidia: GPU rootfs stage one already exists"
return return
fi fi
@@ -129,7 +129,7 @@ setup_nvidia_gpu_rootfs_stage_one() {
rm ./nvidia_chroot.sh rm ./nvidia_chroot.sh
rm ./*.deb rm ./*.deb
tar cfa "${BUILD_DIR}"/kata-static-rootfs-nvidia-gpu-stage-one.tar.zst --remove-files -- * tar cfa "${BUILD_DIR}"/kata-static-rootfs-"${VARIANT}"-stage-one.tar.zst --remove-files -- *
popd >> /dev/null popd >> /dev/null
@@ -332,7 +332,7 @@ setup_nvidia_gpu_rootfs_stage_two() {
[[ -e "${stage_one}" ]] && rm -rf "${stage_one}" [[ -e "${stage_one}" ]] && rm -rf "${stage_one}"
[[ ! -e "${stage_one}" ]] && mkdir -p "${stage_one}" [[ ! -e "${stage_one}" ]] && mkdir -p "${stage_one}"
tar -C "${stage_one}" -xf "${BUILD_DIR}"/kata-static-rootfs-nvidia-gpu-stage-one.tar.zst tar -C "${stage_one}" -xf "${BUILD_DIR}"/kata-static-rootfs-"${VARIANT}"-stage-one.tar.zst
pushd "${stage_two}" >> /dev/null pushd "${stage_two}" >> /dev/null