From b4e8e1e2d228848ed2ecfc5137b2bfe06392ff7e Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Wed, 29 Apr 2026 23:59:05 +0000 Subject: [PATCH] build: allow overriding rootfs/boot tarball prereqs via DEPS Skipping prereq rebuilds is useful when artifacts are already staged from a prior run (CI splitting work across jobs, local iteration). Signed-off-by: Zvonko Kaiser --- .../kata-deploy/local-build/Makefile | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 49d6f9611b..aeea5508d0 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -174,37 +174,49 @@ qemu-cca-experimental-tarball: qemu-tarball: ${MAKE} $@-build -boot-image-se-tarball: kernel-tarball rootfs-initrd-confidential-tarball +# DEPS is rebound per target below; prereqs expand at parse time, so each rule +# freezes the current DEPS. `make DEPS=` from the command line zeros all of them. +DEPS := kernel-tarball rootfs-initrd-confidential-tarball +boot-image-se-tarball: $(DEPS) ${MAKE} $@-build stratovirt-tarball: ${MAKE} $@-build -rootfs-image-tarball: agent-tarball +DEPS := agent-tarball +rootfs-image-tarball: $(DEPS) ${MAKE} $@-build -rootfs-image-confidential-tarball: agent-tarball pause-image-tarball coco-guest-components-tarball kernel-tarball +DEPS := agent-tarball pause-image-tarball coco-guest-components-tarball kernel-tarball +rootfs-image-confidential-tarball: $(DEPS) ${MAKE} $@-build -rootfs-image-mariner-tarball: agent-tarball +DEPS := agent-tarball +rootfs-image-mariner-tarball: $(DEPS) ${MAKE} $@-build -rootfs-initrd-confidential-tarball: agent-tarball pause-image-tarball coco-guest-components-tarball kernel-tarball +DEPS := agent-tarball pause-image-tarball coco-guest-components-tarball kernel-tarball +rootfs-initrd-confidential-tarball: $(DEPS) ${MAKE} $@-build -rootfs-initrd-tarball: agent-tarball +DEPS := agent-tarball +rootfs-initrd-tarball: $(DEPS) ${MAKE} $@-build -rootfs-image-nvidia-gpu-tarball: agent-tarball busybox-tarball kernel-nvidia-gpu-tarball +DEPS := agent-tarball busybox-tarball kernel-nvidia-gpu-tarball +rootfs-image-nvidia-gpu-tarball: $(DEPS) ${MAKE} $@-build -rootfs-image-nvidia-gpu-confidential-tarball: agent-tarball busybox-tarball pause-image-tarball coco-guest-components-tarball kernel-nvidia-gpu-tarball +DEPS := agent-tarball busybox-tarball pause-image-tarball coco-guest-components-tarball kernel-nvidia-gpu-tarball +rootfs-image-nvidia-gpu-confidential-tarball: $(DEPS) ${MAKE} $@-build -rootfs-cca-confidential-image-tarball: agent-tarball pause-image-tarball coco-guest-components-tarball kernel-cca-confidential-tarball +DEPS := agent-tarball pause-image-tarball coco-guest-components-tarball kernel-cca-confidential-tarball +rootfs-cca-confidential-image-tarball: $(DEPS) ${MAKE} $@-build -rootfs-cca-confidential-initrd-tarball: agent-tarball pause-image-tarball coco-guest-components-tarball kernel-cca-confidential-tarball +DEPS := agent-tarball pause-image-tarball coco-guest-components-tarball kernel-cca-confidential-tarball +rootfs-cca-confidential-initrd-tarball: $(DEPS) ${MAKE} $@-build shim-v2-tarball: