From 4b4b20489672b8aef391cf05f2a0193c4f2879d2 Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Thu, 30 Apr 2026 00:48:46 +0000 Subject: [PATCH] build: replace prebuilt-components sed hack with DEPS= Mutating the Makefile in-place to strip prereqs was fragile and limited to one target per invocation. DEPS= skips deps declaratively and propagates through recursive make, so multi-target builds can opt out in one shot. Signed-off-by: Zvonko Kaiser --- .../workflows/build-kata-static-tarball-amd64.yaml | 8 ++++---- .../workflows/build-kata-static-tarball-arm64.yaml | 8 ++++---- .../workflows/build-kata-static-tarball-ppc64le.yaml | 8 ++++---- .../workflows/build-kata-static-tarball-s390x.yaml | 12 ++++++------ tools/packaging/kata-deploy/local-build/Makefile | 3 +++ 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml index 393d9d31ce..abad590469 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -210,8 +210,8 @@ jobs: - name: Build ${{ matrix.asset }} id: build run: | - ./tests/gha-adjust-to-use-prebuilt-components.sh kata-artifacts "${KATA_ASSET}" - make "${KATA_ASSET}-tarball" + make install-prebuilt-artifacts + make DEPS= "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink mkdir -p kata-build && cp "${build_dir}"/kata-static-"${KATA_ASSET}"*.tar.* kata-build/. @@ -310,8 +310,8 @@ jobs: - name: Build shim-v2 id: build run: | - ./tests/gha-adjust-to-use-prebuilt-components.sh kata-artifacts "${KATA_ASSET}" - make "${KATA_ASSET}-tarball" + make install-prebuilt-artifacts + make DEPS= "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink mkdir -p kata-build && cp "${build_dir}"/kata-static-"${KATA_ASSET}"*.tar.* kata-build/. diff --git a/.github/workflows/build-kata-static-tarball-arm64.yaml b/.github/workflows/build-kata-static-tarball-arm64.yaml index 445c7296c5..ebe196e062 100644 --- a/.github/workflows/build-kata-static-tarball-arm64.yaml +++ b/.github/workflows/build-kata-static-tarball-arm64.yaml @@ -196,8 +196,8 @@ jobs: - name: Build ${{ matrix.asset }} run: | - ./tests/gha-adjust-to-use-prebuilt-components.sh kata-artifacts "${KATA_ASSET}" - make "${KATA_ASSET}-tarball" + make install-prebuilt-artifacts + make DEPS= "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink mkdir -p kata-build && cp "${build_dir}"/kata-static-"${KATA_ASSET}"*.tar.* kata-build/. @@ -292,8 +292,8 @@ jobs: - name: Build shim-v2 run: | - ./tests/gha-adjust-to-use-prebuilt-components.sh kata-artifacts "${KATA_ASSET}" - make "${KATA_ASSET}-tarball" + make install-prebuilt-artifacts + make DEPS= "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink mkdir -p kata-build && cp "${build_dir}"/kata-static-"${KATA_ASSET}"*.tar.* kata-build/. diff --git a/.github/workflows/build-kata-static-tarball-ppc64le.yaml b/.github/workflows/build-kata-static-tarball-ppc64le.yaml index 09ef3cfaf4..f70991aea9 100644 --- a/.github/workflows/build-kata-static-tarball-ppc64le.yaml +++ b/.github/workflows/build-kata-static-tarball-ppc64le.yaml @@ -140,8 +140,8 @@ jobs: - name: Build ${{ matrix.asset }} run: | - ./tests/gha-adjust-to-use-prebuilt-components.sh kata-artifacts "${KATA_ASSET}" - make "${KATA_ASSET}-tarball" + make install-prebuilt-artifacts + make DEPS= "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink mkdir -p kata-build && cp "${build_dir}"/kata-static-"${KATA_ASSET}"*.tar.* kata-build/. @@ -218,8 +218,8 @@ jobs: - name: Build shim-v2 run: | - ./tests/gha-adjust-to-use-prebuilt-components.sh kata-artifacts "${KATA_ASSET}" - make "${KATA_ASSET}-tarball" + make install-prebuilt-artifacts + make DEPS= "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink mkdir -p kata-build && cp "${build_dir}"/kata-static-"${KATA_ASSET}"*.tar.* kata-build/. diff --git a/.github/workflows/build-kata-static-tarball-s390x.yaml b/.github/workflows/build-kata-static-tarball-s390x.yaml index 48e1599076..04f288578f 100644 --- a/.github/workflows/build-kata-static-tarball-s390x.yaml +++ b/.github/workflows/build-kata-static-tarball-s390x.yaml @@ -175,8 +175,8 @@ jobs: - name: Build ${{ matrix.asset }} id: build run: | - ./tests/gha-adjust-to-use-prebuilt-components.sh kata-artifacts "${KATA_ASSET}" - make "${KATA_ASSET}-tarball" + make install-prebuilt-artifacts + make DEPS= "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink mkdir -p kata-build && cp "${build_dir}"/kata-static-"${KATA_ASSET}"*.tar.* kata-build/. @@ -231,8 +231,8 @@ jobs: - name: Build boot-image-se run: | - ./tests/gha-adjust-to-use-prebuilt-components.sh kata-artifacts "boot-image-se" - make boot-image-se-tarball + make install-prebuilt-artifacts + make DEPS= boot-image-se-tarball build_dir=$(readlink -f build) sudo cp -r "${build_dir}" "kata-build" sudo chown -R "$(id -u)":"$(id -g)" "kata-build" @@ -305,8 +305,8 @@ jobs: - name: Build shim-v2 id: build run: | - ./tests/gha-adjust-to-use-prebuilt-components.sh kata-artifacts "${KATA_ASSET}" - make "${KATA_ASSET}-tarball" + make install-prebuilt-artifacts + make DEPS= "${KATA_ASSET}-tarball" build_dir=$(readlink -f build) # store-artifact does not work with symlink mkdir -p kata-build && cp "${build_dir}"/kata-static-"${KATA_ASSET}"*.tar.* kata-build/. diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index aeea5508d0..73128a089c 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -231,5 +231,8 @@ virtiofsd-tarball: merge-builds: $(MK_DIR)/kata-deploy-merge-builds.sh build "$(MK_DIR)/../../../../versions.yaml" +install-prebuilt-artifacts: + mv kata-artifacts $(MK_DIR)/build + install-tarball: tar --zstd -xf ./kata-static.tar.zst -C /