From cddaf2ce97dd3200f17b3db00fc432582f6b7d0c Mon Sep 17 00:00:00 2001 From: ChengyuZhu6 Date: Wed, 21 Feb 2024 18:18:41 +0800 Subject: [PATCH 1/2] kata-deploy: Remove specific kernel/initrd/image leftovers in Makefile Remove specific kernel/initrd/image leftovers in Makefile of local-build, which is the part of #9026. Signed-off-by: ChengyuZhu6 --- .../kata-deploy/local-build/Makefile | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 472df2ace4..08a486e97d 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -24,10 +24,7 @@ BASE_TARBALLS = serial-targets \ kernel-dragonball-experimental-tarball \ kernel-nvidia-gpu-tarball \ kernel-nvidia-gpu-confidential-tarball \ - kernel-nvidia-gpu-snp-tarball \ - kernel-nvidia-gpu-tdx-experimental-tarball \ kernel-tarball \ - kernel-tdx-experimental-tarball \ nydus-tarball \ ovmf-sev-tarball \ ovmf-tarball \ @@ -40,10 +37,8 @@ BASE_TARBALLS = serial-targets \ virtiofsd-tarball BASE_SERIAL_TARBALLS = rootfs-image-tarball \ rootfs-image-confidential-tarball \ - rootfs-image-tdx-tarball \ rootfs-initrd-confidential-tarball \ rootfs-initrd-mariner-tarball \ - rootfs-initrd-sev-tarball \ rootfs-initrd-tarball \ cloud-hypervisor-tarball \ cloud-hypervisor-glibc-tarball @@ -123,24 +118,12 @@ kernel-nvidia-gpu-tarball: kernel-nvidia-gpu-confidential-tarball: ${MAKE} $@-build -kernel-nvidia-gpu-snp-tarball: - ${MAKE} $@-build - -kernel-nvidia-gpu-tdx-experimental-tarball: - ${MAKE} $@-build - kernel-tarball: ${MAKE} $@-build kernel-confidential-tarball: ${MAKE} $@-build -kernel-tdx-experimental-tarball: - ${MAKE} $@-build - -kernel-sev-tarball: - ${MAKE} $@-build - nydus-tarball: ${MAKE} $@-build @@ -171,18 +154,12 @@ rootfs-image-tarball: agent-tarball rootfs-image-confidential-tarball: agent-opa-tarball coco-guest-components-tarball kernel-confidential-tarball ${MAKE} $@-build -rootfs-image-tdx-tarball: agent-opa-tarball kernel-confidential-tarball - ${MAKE} $@-build - rootfs-initrd-mariner-tarball: agent-opa-tarball ${MAKE} $@-build rootfs-initrd-confidential-tarball: agent-opa-tarball coco-guest-components-tarball kernel-confidential-tarball ${MAKE} $@-build -rootfs-initrd-sev-tarball: agent-opa-tarball kernel-confidential-tarball - ${MAKE} $@-build - rootfs-initrd-tarball: agent-tarball ${MAKE} $@-build From f16f709a5e851ff9046c126f6e1a2547d4c4c3ca Mon Sep 17 00:00:00 2001 From: ChengyuZhu6 Date: Wed, 21 Feb 2024 16:03:40 +0800 Subject: [PATCH 2/2] kata-deploy: Add pause image to confidential rootfs For confidential containers, the pause image needs to be installed in the rootfs. Fixes: #9118 Signed-off-by: ChengyuZhu6 --- tools/packaging/kata-deploy/local-build/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 08a486e97d..2e976c4d17 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -151,13 +151,13 @@ stratovirt-tarball: rootfs-image-tarball: agent-tarball ${MAKE} $@-build -rootfs-image-confidential-tarball: agent-opa-tarball coco-guest-components-tarball kernel-confidential-tarball +rootfs-image-confidential-tarball: agent-opa-tarball pause-image-tarball coco-guest-components-tarball kernel-confidential-tarball ${MAKE} $@-build rootfs-initrd-mariner-tarball: agent-opa-tarball ${MAKE} $@-build -rootfs-initrd-confidential-tarball: agent-opa-tarball coco-guest-components-tarball kernel-confidential-tarball +rootfs-initrd-confidential-tarball: agent-opa-tarball pause-image-tarball coco-guest-components-tarball kernel-confidential-tarball ${MAKE} $@-build rootfs-initrd-tarball: agent-tarball