Merge pull request #6038 from BbolroC/make-target-cc-payload

CC: Support s390x for target cc-payload in Makefile
This commit is contained in:
Steve Horsman 2023-01-11 17:23:28 +00:00 committed by GitHub
commit cbf2753a28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,6 +8,19 @@ MK_DIR := $(dir $(MK_PATH))
# Verbose build
V := 1
ARCH := $(shell uname -m)
ifeq ($(ARCH), x86_64)
EXTRA_TARBALL=cc-cloud-hypervisor-tarball \
cc-tdx-kernel-tarball \
cc-sev-kernel-tarball \
cc-tdx-qemu-tarball \
cc-tdx-td-shim-tarball \
cc-tdx-tdvf-tarball \
cc-sev-ovmf-tarball \
cc-sev-rootfs-initrd-tarball \
cc-tdx-rootfs-image-tarball
endif
define BUILD
$(MK_DIR)/kata-deploy-binaries-in-docker.sh $(if $(V),,-s) --build=$1
@ -82,20 +95,12 @@ cc-tarball: | cc merge-builds
cc-parallel: $(MK_DIR)/dockerbuild/install_yq.sh
${MAKE} -f $(MK_PATH) cc -j$$(( $$(nproc) - 1 )) V=
cc: cc-cloud-hypervisor-tarball \
cc-kernel-tarball \
cc: cc-kernel-tarball \
cc-qemu-tarball \
cc-rootfs-image-tarball \
cc-shim-v2-tarball \
cc-virtiofsd-tarball \
cc-tdx-kernel-tarball \
cc-sev-kernel-tarball \
cc-tdx-qemu-tarball \
cc-tdx-td-shim-tarball \
cc-tdx-tdvf-tarball \
cc-sev-ovmf-tarball \
cc-sev-rootfs-initrd-tarball \
cc-tdx-rootfs-image-tarball
cc-shim-v2-tarball \
${EXTRA_TARBALL}
cc-cloud-hypervisor-tarball:
${MAKE} $@-build