diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 4657d6217b..6f8e1a3e23 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -818,7 +818,7 @@ install_coco_guest_components() { && return 0 info "build static coco-guest-components" - "${coco_guest_components_builder}" + DESTDIR="${destdir}" "${coco_guest_components_builder}" } install_tools_helper() { diff --git a/tools/packaging/static-build/coco-guest-components/build-static-coco-guest-components.sh b/tools/packaging/static-build/coco-guest-components/build-static-coco-guest-components.sh index 09afb2c2b0..db3bcd4aa6 100755 --- a/tools/packaging/static-build/coco-guest-components/build-static-coco-guest-components.sh +++ b/tools/packaging/static-build/coco-guest-components/build-static-coco-guest-components.sh @@ -52,11 +52,11 @@ build_coco_guest_components_from_source() { git fetch --depth=1 origin "${coco_guest_components_version}" git checkout FETCH_HEAD - TEE_PLATFORM=${TEE_PLATFORM} make build + DESTDIR="${DESTDIR}/usr/local/bin" TEE_PLATFORM=${TEE_PLATFORM} make build strip target/${rust_arch}-unknown-linux-${LIBC}/release/confidential-data-hub strip target/${rust_arch}-unknown-linux-${LIBC}/release/attestation-agent strip target/${rust_arch}-unknown-linux-${LIBC}/release/api-server-rest - TEE_PLATFORM=${TEE_PLATFORM} make install + DESTDIR="${DESTDIR}/usr/local/bin" TEE_PLATFORM=${TEE_PLATFORM} make install popd } diff --git a/tools/packaging/static-build/coco-guest-components/build.sh b/tools/packaging/static-build/coco-guest-components/build.sh index 60ede9623b..f46ea52322 100755 --- a/tools/packaging/static-build/coco-guest-components/build.sh +++ b/tools/packaging/static-build/coco-guest-components/build.sh @@ -13,6 +13,8 @@ readonly coco_guest_components_builder="${script_dir}/build-static-coco-guest-co source "${script_dir}/../../scripts/lib.sh" +DESTDIR=${DESTDIR:-${PWD}} + coco_guest_components_repo="${coco_guest_components_repo:-}" coco_guest_components_version="${coco_guest_components_version:-}" coco_guest_components_toolchain="${coco_guest_components_toolchain:-}" @@ -38,6 +40,7 @@ sudo docker pull ${container_image} || \ sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \ -w "${PWD}" \ + --env DESTDIR="${DESTDIR}" \ --env TEE_PLATFORM=${TEE_PLATFORM:-all} \ --env coco_guest_components_repo="${coco_guest_components_repo}" \ --env coco_guest_components_version="${coco_guest_components_version}" \