diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh index 02d878ede4..b4745043f4 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh @@ -106,6 +106,7 @@ BUSYBOX_CONF_FILE=${BUSYBOX_CONF_FILE:-} NVIDIA_GPU_STACK="${NVIDIA_GPU_STACK:-}" KBUILD_SIGN_PIN=${KBUILD_SIGN_PIN:-} GUEST_HOOKS_TARBALL_NAME="${GUEST_HOOKS_TARBALL_NAME:-}" +EXTRA_PKGS="${EXTRA_PKGS:-}" docker run \ -v $HOME/.docker:/root/.docker \ @@ -139,6 +140,7 @@ docker run \ --env NVIDIA_GPU_STACK="${NVIDIA_GPU_STACK}" \ --env KBUILD_SIGN_PIN="${KBUILD_SIGN_PIN}" \ --env GUEST_HOOKS_TARBALL_NAME="${GUEST_HOOKS_TARBALL_NAME}" \ + --env EXTRA_PKGS="${EXTRA_PKGS}" \ --env AA_KBC="${AA_KBC:-}" \ --env HKD_PATH="$(realpath "${HKD_PATH:-}" 2> /dev/null || true)" \ --env SE_KERNEL_PARAMS="${SE_KERNEL_PARAMS:-}" \ diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index ffe0a9c860..6b13104ad3 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -50,6 +50,7 @@ ARTEFACT_REPOSITORY="${ARTEFACT_REPOSITORY:-kata-containers}" ARTEFACT_REGISTRY_USERNAME="${ARTEFACT_REGISTRY_USERNAME:-}" ARTEFACT_REGISTRY_PASSWORD="${ARTEFACT_REGISTRY_PASSWORD:-}" GUEST_HOOKS_TARBALL_NAME="${GUEST_HOOKS_TARBALL_NAME:-}" +EXTRA_PKGS="${EXTRA_PKGS:-}" TARGET_BRANCH="${TARGET_BRANCH:-main}" PUSH_TO_REGISTRY="${PUSH_TO_REGISTRY:-}" KERNEL_HEADERS_PKG_TYPE="${KERNEL_HEADERS_PKG_TYPE:-deb}" @@ -398,6 +399,10 @@ install_image() { export GUEST_HOOKS_TARBALL="$(get_guest_hooks_tarball_path)" fi + if [[ -n "${EXTRA_PKGS}" ]]; then + export EXTRA_PKGS + fi + "${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}" } @@ -484,6 +489,10 @@ install_initrd() { export GUEST_HOOKS_TARBALL="$(get_guest_hooks_tarball_path)" fi + if [[ -n "${EXTRA_PKGS}" ]]; then + export EXTRA_PKGS + fi + "${rootfs_builder}" --osname="${os_name}" --osversion="${os_version}" --imagetype=initrd --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${variant}" } @@ -516,7 +525,7 @@ install_initrd_confidential() { # Install NVIDIA GPU image install_image_nvidia_gpu() { export AGENT_POLICY="yes" - export EXTRA_PKGS="apt" + EXTRA_PKGS="apt ${EXTRA_PKGS}" NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute,dcgm"} install_image "nvidia-gpu" } @@ -524,7 +533,7 @@ install_image_nvidia_gpu() { # Install NVIDIA GPU initrd install_initrd_nvidia_gpu() { export AGENT_POLICY="yes" - export EXTRA_PKGS="apt" + EXTRA_PKGS="apt ${EXTRA_PKGS}" NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute,dcgm"} install_initrd "nvidia-gpu" } @@ -532,7 +541,7 @@ install_initrd_nvidia_gpu() { # Instal NVIDIA GPU confidential image install_image_nvidia_gpu_confidential() { export AGENT_POLICY="yes" - export EXTRA_PKGS="apt" + EXTRA_PKGS="apt ${EXTRA_PKGS}" # TODO: export MEASURED_ROOTFS=yes NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute"} install_image "nvidia-gpu-confidential" @@ -541,7 +550,7 @@ install_image_nvidia_gpu_confidential() { # Install NVIDIA GPU confidential initrd install_initrd_nvidia_gpu_confidential() { export AGENT_POLICY="yes" - export EXTRA_PKGS="apt" + EXTRA_PKGS="apt ${EXTRA_PKGS}" # TODO: export MEASURED_ROOTFS=yes NVIDIA_GPU_STACK=${NVIDIA_GPU_STACK:-"latest,compute"} install_initrd "nvidia-gpu-confidential"