From 9d0d5b93616c4bb58bfa8f25c5f85b3e259a5334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Wed, 3 Aug 2022 14:09:45 +0200
Subject: [PATCH] packaging: Build and ship TDVF
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We're adding a new target for building a TDVF, a firmware used with QEMU
to start TDX capable VMs for CC.

Fixes: #4625

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 tools/packaging/kata-deploy/local-build/Makefile  |  2 ++
 .../local-build/kata-deploy-binaries.sh           | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
index 64bfae4ab..6f35e4524 100644
--- a/tools/packaging/kata-deploy/local-build/Makefile
+++ b/tools/packaging/kata-deploy/local-build/Makefile
@@ -109,3 +109,5 @@ cc-tdx-kernel-tarball:
 cc-tdx-qemu-tarball:
 	${MAKE} $@-build
 
+cc-tdx-tdvf-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 05f0e69f1..170b80911 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -24,6 +24,7 @@ readonly versions_yaml="${repo_root_dir}/versions.yaml"
 readonly clh_builder="${static_build_dir}/cloud-hypervisor/build-static-clh.sh"
 readonly firecracker_builder="${static_build_dir}/firecracker/build-static-firecracker.sh"
 readonly kernel_builder="${static_build_dir}/kernel/build.sh"
+readonly ovmf_builder="${static_build_dir}/ovmf/build.sh"
 readonly qemu_builder="${static_build_dir}/qemu/build-static-qemu.sh"
 readonly shimv2_builder="${static_build_dir}/shim-v2/build.sh"
 readonly virtiofsd_builder="${static_build_dir}/virtiofsd/build-static-virtiofsd.sh"
@@ -187,6 +188,18 @@ install_cc_tdx_qemu() {
 	install_cc_tee_qemu "tdx"
 }
 
+install_cc_tee_ovmf() {
+	tee="${1}"
+	tarball_name="${2}"
+
+	DESTDIR="${destdir}" PREFIX="${cc_prefix}" ovmf_build="${tee}" "${ovmf_builder}"
+	tar xvf "${builddir}/${tarball_name}" -C "${destdir}"
+}
+
+install_cc_tdx_tdvf() {
+	install_cc_tee_ovmf "tdx" "edk2-staging-tdx.tar.gz"
+}
+
 #Install guest image
 install_image() {
 	info "Create image"
@@ -311,6 +324,8 @@ handle_build() {
 
 	cc-tdx-qemu) install_cc_tdx_qemu ;;
 
+	cc-tdx-tdvf) install_cc_tdx_tdvf ;;
+
 	cloud-hypervisor) install_clh ;;
 
 	firecracker) install_firecracker ;;