github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 05:04:26 +00:00
Code Issues Projects Releases Wiki Activity

tools: clh: Allow passing down a build flag

Browse Source 
Let's allow passing down a build flag to cargo, when building Cloud
Hypervisor.

By doing this we allow calling this script with:
```
extra_build_flags="--features tdx" ./build-static-clh.sh
```

Fixes: #3671

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2022-02-15 13:59:24 +01:00
parent 55cdef2295
commit e07545a23c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/packaging/static-build/cloud-hypervisor/build-static-clh.sh
View File

@ -16,6 +16,7 @@ ARCH=$(uname -m)
script_dir=$(dirname $(readlink -f "$0")) script_dir=$(dirname $(readlink -f "$0"))
kata_version="${kata_version:-}" kata_version="${kata_version:-}"
force_build_from_source="${force_build_from_source:-false}" force_build_from_source="${force_build_from_source:-false}"
extra_build_args="${extra_build_args:-}"
source "${script_dir}/../../scripts/lib.sh" source "${script_dir}/../../scripts/lib.sh"
@ -50,7 +51,12 @@ build_clh_from_source() {
pushd "${repo_dir}" pushd "${repo_dir}"
git fetch || true git fetch || true
git checkout "${cloud_hypervisor_version}" git checkout "${cloud_hypervisor_version}"
if [ -n "${extra_build_args}" ]; then
info "Build cloud-hypervisor with extra args: ${extra_build_args}"
./scripts/dev_cli.sh build --release --libc musl -- ${extra_build_args}
else
./scripts/dev_cli.sh build --release --libc musl ./scripts/dev_cli.sh build --release --libc musl
fi
rm -f cloud-hypervisor rm -f cloud-hypervisor
cp build/cargo_target/$(uname -m)-unknown-linux-musl/release/cloud-hypervisor . cp build/cargo_target/$(uname -m)-unknown-linux-musl/release/cloud-hypervisor .
popd popd
@ -61,6 +67,11 @@ if [ "${ARCH}" == "aarch64" ]; then
force_build_from_source="true" force_build_from_source="true"
fi fi
if [ -n "${extra_build_args}" ]; then
info "As an extra build argument has been passed to the script, forcing to build from source"
force_build_from_source="true"
fi
if [ "${force_build_from_source}" == "true" ]; then if [ "${force_build_from_source}" == "true" ]; then
info "Build cloud-hypervisor from source as it's been request via the force_build_from_source flag" info "Build cloud-hypervisor from source as it's been request via the force_build_from_source flag"
build_clh_from_source build_clh_from_source