From 3fa936e4921614b8f1daf56bd9618aa7375c3e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Thu, 20 Jul 2023 23:46:35 +0200
Subject: [PATCH] kata-deploy-binaires: Remove CC virtiofsd build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We can simply ship the one from main.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 .../kata-deploy/local-build/Makefile          |  4 ----
 .../local-build/kata-deploy-binaries.sh       | 23 -------------------
 2 files changed, 27 deletions(-)

diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
index ab1d1b4117..25d395729b 100644
--- a/tools/packaging/kata-deploy/local-build/Makefile
+++ b/tools/packaging/kata-deploy/local-build/Makefile
@@ -155,7 +155,6 @@ cc-parallel: $(MK_DIR)/dockerbuild/install_yq.sh
 
 cc: cc-kernel-tarball \
 	cc-rootfs-image-tarball \
-	cc-virtiofsd-tarball \
 	cc-shim-v2-tarball \
 	${EXTRA_TARBALL}
 
@@ -180,9 +179,6 @@ cc-tdx-rootfs-image-tarball:
 cc-shim-v2-tarball:
 	${MAKE} $@-build
 
-cc-virtiofsd-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 fc55dddf12..a930cfa8e1 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -118,7 +118,6 @@ options:
 	cc-sev-rootfs-initrd
 	cc-se-image
 	cc-shimv2
-	cc-virtiofsd
 	cc-sev-ovmf
 	cc-x86_64-ovmf
 EOF
@@ -369,25 +368,6 @@ install_cc_shimv2() {
 	DESTDIR="${destdir}" PREFIX="${cc_prefix}" EXTRA_OPTS="${extra_opts}" "${shimv2_builder}"
 }
 
-# Install static CC virtiofsd asset
-install_cc_virtiofsd() {
-	local virtiofsd_version="$(get_from_kata_deps "externals.virtiofsd.version")-$(get_from_kata_deps "externals.virtiofsd.toolchain")"
-	install_cached_tarball_component \
-		"virtiofsd" \
-		"${jenkins_url}/job/kata-containers-2.0-virtiofsd-cc-$(uname -m)/${cached_artifacts_path}" \
-		"${virtiofsd_version}" \
-		"$(get_virtiofsd_image_name)" \
-		"${final_tarball_name}" \
-		"${final_tarball_path}" \
-		&& return 0
-
-	info "build static CC virtiofsd"
-	"${virtiofsd_builder}"
-	info "Install static CC virtiofsd"
-	mkdir -p "${destdir}/${cc_prefix}/libexec/"
-	sudo install -D --owner root --group root --mode 0744 virtiofsd/virtiofsd "${destdir}/${cc_prefix}/libexec/virtiofsd"
-}
-
 # Install cached kernel compoenent
 install_cached_kernel_component() {
 	tee="${1}"
@@ -973,7 +953,6 @@ handle_build() {
 		install_cc_kernel
 		install_cc_image
 		install_cc_shimv2
-		install_cc_virtiofsd
 		install_cc_sev_image
 		;;
 
@@ -991,8 +970,6 @@ handle_build() {
 
 	cc-shim-v2) install_cc_shimv2 ;;
 
-	cc-virtiofsd) install_cc_virtiofsd ;;
-
 	cc-tdx-kernel) install_cc_tdx_kernel ;;
 
 	cc-sev-kernel) install_cc_sev_kernel ;;