From 8488d02c23e2fdd10aa64d28f8098a279806c57b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Wed, 13 Jul 2022 22:27:36 +0200
Subject: [PATCH] packaging: Build and ship Cloud Hypervisor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We're adding a new target for building a TDX capable Cloud Hypervisor
for CC.

As the current version of Cloud Hypervisor is already built with TDX
support, we just rely on calling the same `install_cc_clh()` function,
as done for the non-tee `cc` target.

Fixes: #4659

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        | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
index 496424a466..20e86eb7e5 100644
--- a/tools/packaging/kata-deploy/local-build/Makefile
+++ b/tools/packaging/kata-deploy/local-build/Makefile
@@ -85,6 +85,9 @@ cc: cc-cloud-hypervisor-tarball \
 cc-cloud-hypervisor-tarball:
 	${MAKE} $@-build
 
+cc-tdx-cloud-hypervisor-tarball:
+	${MAKE} $@-build
+
 cc-kernel-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 e1c6afcf81..30ea804f0b 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -108,6 +108,11 @@ install_cc_clh() {
 	sudo install -D --owner root --group root --mode 0744 cloud-hypervisor/cloud-hypervisor "${destdir}/${cc_prefix}/bin/cloud-hypervisor"
 }
 
+# Install static CC cloud-hypervisor asset
+install_tdx_cc_clh() {
+	install_cc_clh
+}
+
 #Install cc capable guest image
 install_cc_image() {
 	info "Create CC image"
@@ -291,6 +296,8 @@ handle_build() {
 
 	cc-cloud-hypervisor) install_cc_clh ;;
 
+	cc-tdx-cloud-hypervisor) install_tdx_cc_clh ;;
+
 	cc-kernel) install_cc_kernel ;;
 
 	cc-tdx-kernel) install_cc_tdx_kernel ;;