diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 4f1239c249..b9ed149c71 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -89,7 +89,8 @@ cc: cc-cloud-hypervisor-tarball \ cc-tdx-qemu-tarball \ cc-tdx-td-shim-tarball \ cc-tdx-tdvf-tarball \ - cc-sev-ovmf-tarball + cc-sev-ovmf-tarball \ + cc-sev-rootfs-initrd-tarball cc-cloud-hypervisor-tarball: ${MAKE} $@-build @@ -103,6 +104,9 @@ cc-qemu-tarball: cc-rootfs-image-tarball: ${MAKE} $@-build +cc-sev-rootfs-initrd-tarball: cc-sev-kernel-tarball + ${MAKE} $@-build + cc-shim-v2-tarball: ${MAKE} $@-build 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 ef7d15b266..9331b333d4 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -90,6 +90,7 @@ options: cc-qemu cc-tdx-qemu cc-rootfs-image + cc-sev-initrd-image cc-shimv2 cc-virtiofsd cc-sev-ovmf @@ -113,13 +114,20 @@ install_cc_clh() { #Install cc capable guest image install_cc_image() { + export AA_KBC="${1:-offline_fs_kbc}" + image_type="${2:-image}" export SKOPEO="${SKOPEO:-yes}" export UMOCI=yes - export AA_KBC="offline_fs_kbc" export KATA_BUILD_CC=yes info "Create CC image configured with SKOPEO=${SKOPEO} UMOCI=${UMOCI} AA_KBC=${AA_KBC}" - "${rootfs_builder}" --imagetype=image --prefix="${cc_prefix}" --destdir="${destdir}" + "${rootfs_builder}" --imagetype="${image_type}" --prefix="${cc_prefix}" --destdir="${destdir}" +} + +install_cc_sev_image() { + AA_KBC="offline_sev_kbc" + image_type="initrd" + install_cc_image "${AA_KBC}" "${image_type}" } #Install CC kernel asset @@ -316,6 +324,7 @@ handle_build() { install_cc_image install_cc_shimv2 install_cc_virtiofsd + install_cc_sev_image ;; cc-cloud-hypervisor) install_cc_clh ;; @@ -326,6 +335,8 @@ handle_build() { cc-rootfs-image) install_cc_image ;; + cc-sev-initrd-image) install_cc_sev_image ;; + cc-shim-v2) install_cc_shimv2 ;; cc-virtiofsd) install_cc_virtiofsd ;;