From 7e8e54ce7d7aef083ad2966af3989bb87f159ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 2 Dec 2022 10:20:29 +0100 Subject: [PATCH] packaging: Drop the TDX cloud hypervisor target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We're currently building Cloud Hypervusor with thE TDX feature regardless of using with TDX or not. Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/local-build/Makefile | 3 --- .../kata-deploy/local-build/kata-deploy-binaries.sh | 7 ------- tools/packaging/static-build/cache_components.sh | 1 - 3 files changed, 11 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index f522fbc35..8b87e0427 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -121,9 +121,6 @@ cc-shim-v2-tarball: cc-virtiofsd-tarball: ${MAKE} $@-build -cc-tdx-cloud-hypervisor-tarball: - ${MAKE} $@-build - cc-tdx-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 dc1ff041c..cff5cd6a0 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -253,11 +253,6 @@ install_cc_virtiofsd() { sudo install -D --owner root --group root --mode 0744 virtiofsd/virtiofsd "${destdir}/${cc_prefix}/libexec/virtiofsd" } -# Install static CC cloud-hypervisor asset -install_tdx_cc_clh() { - install_cc_clh -} - #Install CC kernel assert, with TEE support install_cc_tee_kernel() { tee="${1}" @@ -503,8 +498,6 @@ handle_build() { cc-virtiofsd) install_cc_virtiofsd ;; - cc-tdx-cloud-hypervisor) install_tdx_cc_clh ;; - cc-tdx-kernel) install_cc_tdx_kernel ;; cc-sev-kernel) install_cc_sev_kernel ;; diff --git a/tools/packaging/static-build/cache_components.sh b/tools/packaging/static-build/cache_components.sh index 5d0e9f396..102917442 100755 --- a/tools/packaging/static-build/cache_components.sh +++ b/tools/packaging/static-build/cache_components.sh @@ -30,7 +30,6 @@ cache_qemu_artifacts() { cache_clh_artifacts() { local clh_tarball_name="kata-static-cc-cloud-hypervisor.tar.xz" - [ -n "${TEE}" ] && clh_tarball_name="kata-static-cc-tdx-cloud-hypervisor.tar.xz" local current_clh_version=$(get_from_kata_deps "assets.hypervisor.cloud_hypervisor.version") create_cache_asset "${clh_tarball_name}" "${current_clh_version}" "" }