From 4ee2b99e1e53bb718ee53c4515670245e01aaf75 Mon Sep 17 00:00:00 2001 From: Ryan Savino Date: Mon, 22 Aug 2022 16:28:54 -0500 Subject: [PATCH] kata-deploy: fix threading conflicts Fix threading conflicts when kata-deploy 'make kata-tarball' is called. Force the creation of rootfs tarballs to happen serially instead of in parallel. Fixes: #4787 Signed-Off-By: Ryan Savino --- tools/packaging/kata-deploy/local-build/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 9f9bdcd6c5..d68d101832 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -21,15 +21,19 @@ $(MK_DIR)/dockerbuild/install_yq.sh: all-parallel: $(MK_DIR)/dockerbuild/install_yq.sh ${MAKE} -f $(MK_PATH) all -j $(shell nproc ${CI:+--ignore 1}) V= -all: cloud-hypervisor-tarball \ +all: serial-targets \ firecracker-tarball \ kernel-tarball \ qemu-tarball \ - rootfs-image-tarball \ - rootfs-initrd-tarball \ shim-v2-tarball \ virtiofsd-tarball +serial-targets: + ${MAKE} -f $(MK_PATH) -j 1 V= \ + rootfs-image-tarball \ + rootfs-initrd-tarball \ + cloud-hypervisor-tarball + %-tarball-build: $(MK_DIR)/dockerbuild/install_yq.sh $(call BUILD,$*)