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

We're adding a new target for building TD-shim, a firmware used with
Cloud Hypervisor to start TDX capable VMs for CC.

Fixes: #4780

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

diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
index 6f35e4524d..ae13afa010 100644
--- a/tools/packaging/kata-deploy/local-build/Makefile
+++ b/tools/packaging/kata-deploy/local-build/Makefile
@@ -109,5 +109,8 @@ cc-tdx-kernel-tarball:
 cc-tdx-qemu-tarball:
 	${MAKE} $@-build
 
+cc-tdx-td-shim-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 170b80911c..5aa8bd336c 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -27,6 +27,7 @@ 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 td_shim_builder="${static_build_dir}/td-shim/build.sh"
 readonly virtiofsd_builder="${static_build_dir}/virtiofsd/build-static-virtiofsd.sh"
 
 readonly rootfs_builder="${repo_root_dir}/tools/packaging/guest-image/build_image.sh"
@@ -188,6 +189,11 @@ install_cc_tdx_qemu() {
 	install_cc_tee_qemu "tdx"
 }
 
+install_cc_tdx_td_shim() {
+	DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${td_shim_builder}"
+	tar xvf "${builddir}/td-shim.tar.gz" -C "${destdir}"
+}
+
 install_cc_tee_ovmf() {
 	tee="${1}"
 	tarball_name="${2}"
@@ -324,6 +330,8 @@ handle_build() {
 
 	cc-tdx-qemu) install_cc_tdx_qemu ;;
 
+	cc-tdx-td-shim) install_cc_tdx_td_shim ;;
+
 	cc-tdx-tdvf) install_cc_tdx_tdvf ;;
 
 	cloud-hypervisor) install_clh ;;