From 35e4938e8ceadb0cbc82d468765e693ced1d584c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= <abombo@microsoft.com>
Date: Tue, 13 Jun 2023 10:56:49 -0700
Subject: [PATCH] tools: Fix no-op builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes the builds of `cloud-hypervisor-glibc` and
`rootfs-initrd-mariner` to properly create the `build/` directory.

Fixes: #7098

Signed-off-by: Aurélien Bombo <abombo@microsoft.com>
---
 tools/packaging/kata-deploy/local-build/Makefile              | 4 ++--
 .../packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
index c23f6b04ea..fc7ed41d21 100644
--- a/tools/packaging/kata-deploy/local-build/Makefile
+++ b/tools/packaging/kata-deploy/local-build/Makefile
@@ -56,7 +56,7 @@ cloud-hypervisor-tarball:
 	${MAKE} $@-build
 
 cloud-hypervisor-glibc-tarball:
-	exit 0
+	${MAKE} $@-build
 
 firecracker-tarball:
 	${MAKE} $@-build
@@ -110,7 +110,7 @@ rootfs-image-tdx-tarball: kernel-tdx-experimental-tarball
 	${MAKE} $@-build
 
 rootfs-initrd-mariner-tarball:
-	exit 0
+	${MAKE} $@-build
 
 rootfs-initrd-sev-tarball: kernel-sev-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 c65f4cd80e..a552aed122 100755
--- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
+++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
@@ -578,6 +578,8 @@ handle_build() {
 
 	cloud-hypervisor) install_clh ;;
 
+	cloud-hypervisor-glibc) ;;
+
 	firecracker) install_firecracker ;;
 
 	kernel) install_kernel ;;
@@ -614,6 +616,8 @@ handle_build() {
 
 	rootfs-initrd) install_initrd ;;
 
+	rootfs-initrd-mariner) ;;
+
 	rootfs-initrd-sev) install_initrd_sev ;;
 	
 	shim-v2) install_shimv2 ;;