From 93a1780bdb0c861d0fd5f97504b29af94840931d Mon Sep 17 00:00:00 2001 From: Alex Carter Date: Mon, 29 Aug 2022 16:00:02 +0000 Subject: [PATCH] packaging: Add CC's AmdSev OVMF target for use in payload images Currently leaving the cc-sev-ovmf-tarball target out of the cc payload. I was not sure where discussion had landed on the number of payload bundles. e.g. could be included in a cc bundle along with tdx support or create an SEV bundle. Fixes: kata-containers#5025 Fixes: #5025 Signed-off-by: Alex Carter --- tools/packaging/kata-deploy/local-build/Makefile | 6 +++++- .../kata-deploy/local-build/kata-deploy-binaries.sh | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index a30479c7b6..4f1239c249 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -88,7 +88,8 @@ cc: cc-cloud-hypervisor-tarball \ cc-tdx-kernel-tarball \ cc-tdx-qemu-tarball \ cc-tdx-td-shim-tarball \ - cc-tdx-tdvf-tarball + cc-tdx-tdvf-tarball \ + cc-sev-ovmf-tarball cc-cloud-hypervisor-tarball: ${MAKE} $@-build @@ -122,3 +123,6 @@ cc-tdx-td-shim-tarball: cc-tdx-tdvf-tarball: ${MAKE} $@-build + +cc-sev-ovmf-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 b305ca4cbb..ef7d15b266 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -92,6 +92,7 @@ options: cc-rootfs-image cc-shimv2 cc-virtiofsd + cc-sev-ovmf EOF exit "${return_code}" @@ -207,6 +208,10 @@ install_cc_tdx_tdvf() { install_cc_tee_ovmf "tdx" "edk2-staging-tdx.tar.gz" } +install_cc_sev_ovmf(){ + install_cc_tee_ovmf "sev" "edk2-sev.tar.gz" +} + #Install guest image install_image() { info "Create image" @@ -335,6 +340,8 @@ handle_build() { cc-tdx-tdvf) install_cc_tdx_tdvf ;; + cc-sev-ovmf) install_cc_sev_ovmf ;; + cloud-hypervisor) install_clh ;; firecracker) install_firecracker ;;