From 59486b855a9de666bd9596d98df555711e6b5e37 Mon Sep 17 00:00:00 2001
From: Carlos Venegas <jose.carlos.venegas.munoz@intel.com>
Date: Mon, 9 Aug 2021 20:13:03 +0000
Subject: [PATCH] kata-deploy: Add tarball suffix to makefile targets

Now that local-build kata-deploy makefile is inlucded in toplevel
makefile, lets use the suffix `-tarball` to avoid name collitions
and identify the tarball releted targets.

Signed-off-by: Carlos Venegas <jose.carlos.venegas.munoz@intel.com>
---
 .../kata-deploy/local-build/Makefile          | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile
index 85d0bb7545..65fdf630fe 100644
--- a/tools/packaging/kata-deploy/local-build/Makefile
+++ b/tools/packaging/kata-deploy/local-build/Makefile
@@ -21,33 +21,42 @@ endef
 kata-tarball: | all-parallel merge-builds
 
 all-parallel:
-	make -f $(MK_PATH) all -j$$(( $$(nproc) - 1  )) NO_TTY="true"
+	${MAKE} -f $(MK_PATH) all -j$$(( $$(nproc) - 1  )) NO_TTY="true"
 
-all: cloud-hypervisor firecracker kernel qemu rootfs-image rootfs-initrd shim-v2
+all: cloud-hypervisor-tarball \
+	firecracker-tarball \
+	kernel-tarball \
+	qemu-tarball \
+	rootfs-image-tarball \
+	rootfs-initrd-tarball \
+	shim-v2-tarball
 
-cloud-hypervisor:
-	$(call BUILD,$@)
+%-tarball-build:
+	$(call BUILD,$*)
 
-firecracker:
-	$(call BUILD,$@)
+cloud-hypervisor-tarball:
+	${MAKE} $@-build
 
-kernel:
-	$(call BUILD,$@)
+firecracker-tarball:
+	${MAKE} $@-build
 
-qemu:
-	$(call BUILD,$@)
+kernel-tarball:
+	${MAKE} $@-build
 
-rootfs-image:
-	$(call BUILD,$@)
+qemu-tarball:
+	${MAKE} $@-build
 
-rootfs-initrd:
-	$(call BUILD,$@)
+rootfs-image-tarball:
+	${MAKE} $@-build
 
-shim-v2:
-	$(call BUILD,$@)
+rootfs-initrd-tarball:
+	${MAKE} $@-build
+
+shim-v2-tarball:
+	${MAKE} $@-build
 
 merge-builds:
 	$(MK_DIR)/kata-deploy-merge-builds.sh build
 
-install:
+install-tarball:
 	tar -xvf ./kata-static.tar.xz -C /