diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 0a58d04e4f..de4852e2ac 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -55,6 +55,7 @@ BASE_TARBALLS = serial-targets \ kernel-cca-confidential-tarball \ kernel-tarball \ qemu-tarball \ + qemu-cca-experimental-tarball \ shim-v2-tarball \ virtiofsd-tarball BASE_SERIAL_TARBALLS = rootfs-image-tarball \ @@ -165,6 +166,9 @@ qemu-snp-experimental-tarball: qemu-tdx-experimental-tarball: ${MAKE} $@-build +qemu-cca-experimental-tarball: + ${MAKE} $@-build + qemu-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 4cfa0fb969..9c5609a1bc 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -124,6 +124,7 @@ options: ovmf ovmf-sev qemu + qemu-cca-experimental qemu-snp-experimental qemu-tdx-experimental stratovirt @@ -765,6 +766,17 @@ install_qemu() { "${qemu_builder}" } +install_qemu_cca_experimental() { + export qemu_suffix="cca-experimental" + export qemu_tarball_name="kata-static-qemu-${qemu_suffix}.tar.gz" + + install_qemu_helper \ + "assets.hypervisor.qemu-${qemu_suffix}.url" \ + "assets.hypervisor.qemu-${qemu_suffix}.tag" \ + "qemu-${qemu_suffix}" \ + "${qemu_experimental_builder}" +} + install_qemu_snp_experimental() { export qemu_suffix="snp-experimental" export qemu_tarball_name="kata-static-qemu-${qemu_suffix}.tar.gz" @@ -1273,6 +1285,8 @@ handle_build() { qemu) install_qemu ;; + qemu-cca-experimental) install_qemu_cca_experimental ;; + qemu-snp-experimental) install_qemu_snp_experimental ;; qemu-tdx-experimental) install_qemu_tdx_experimental ;; diff --git a/tools/packaging/qemu/patches/tag_patches/97345ddc501d3eb45bbbf15d97608fba0c2c0c7b/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/97345ddc501d3eb45bbbf15d97608fba0c2c0c7b/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/versions.yaml b/versions.yaml index db14f9c063..ba15120847 100644 --- a/versions.yaml +++ b/versions.yaml @@ -99,6 +99,11 @@ assets: https://github.com/qemu/qemu/tags .*/v?(\d\S+)\.tar\.gz + qemu-cca-experimental: + description: "QEMU with experimental CCA support" + url: "https://git.codelinaro.org/linaro/dcap/qemu.git" + tag: "97345ddc501d3eb45bbbf15d97608fba0c2c0c7b" + qemu-snp-experimental: description: "QEMU with GPU+SNP support" url: "https://github.com/confidential-containers/qemu.git"