github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-31 01:13:02 +00:00
Code Issues Projects Releases Wiki Activity

tools: Fix indentation of build static clh script

Browse Source 
This Pr removes single spaces and fix the indentation of the script.

Fixes #5528

Signed-off-by: Gabriela Cervantes <gabriela.cervantes.tellez@intel.com>
This commit is contained in:
Gabriela Cervantes
2022-10-27 21:09:34 +00:00
parent 0bb005093e
commit 0ed7da30d7
1 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,10 +25,10 @@ cloud_hypervisor_pr="${cloud_hypervisor_pr:-}"
cloud_hypervisor_pull_ref_branch="${cloud_hypervisor_pull_ref_branch:-main}" cloud_hypervisor_pull_ref_branch="${cloud_hypervisor_pull_ref_branch:-main}"
if [ -z "$cloud_hypervisor_repo" ]; then if [ -z "$cloud_hypervisor_repo" ]; then
info "Get cloud_hypervisor information from runtime versions.yaml" info "Get cloud_hypervisor information from runtime versions.yaml"
cloud_hypervisor_url=$(get_from_kata_deps "assets.hypervisor.cloud_hypervisor.url") cloud_hypervisor_url=$(get_from_kata_deps "assets.hypervisor.cloud_hypervisor.url")
[ -n "$cloud_hypervisor_url" ] || die "failed to get cloud_hypervisor url" [ -n "$cloud_hypervisor_url" ] || die "failed to get cloud_hypervisor url"
cloud_hypervisor_repo="${cloud_hypervisor_url}.git" cloud_hypervisor_repo="${cloud_hypervisor_url}.git"
fi fi
[ -n "$cloud_hypervisor_repo" ] || die "failed to get cloud_hypervisor repo" [ -n "$cloud_hypervisor_repo" ] || die "failed to get cloud_hypervisor repo"
@@ -41,61 +41,61 @@ else
fi fi
pull_clh_released_binary() { pull_clh_released_binary() {
info "Download cloud-hypervisor version: ${cloud_hypervisor_version}" info "Download cloud-hypervisor version: ${cloud_hypervisor_version}"
cloud_hypervisor_binary="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/${cloud_hypervisor_version}/cloud-hypervisor-static" cloud_hypervisor_binary="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/${cloud_hypervisor_version}/cloud-hypervisor-static"
curl --fail -L ${cloud_hypervisor_binary} -o cloud-hypervisor-static || return 1 curl --fail -L ${cloud_hypervisor_binary} -o cloud-hypervisor-static || return 1
mkdir -p cloud-hypervisor mkdir -p cloud-hypervisor
mv -f cloud-hypervisor-static cloud-hypervisor/cloud-hypervisor mv -f cloud-hypervisor-static cloud-hypervisor/cloud-hypervisor
chmod +x cloud-hypervisor/cloud-hypervisor chmod +x cloud-hypervisor/cloud-hypervisor
} }
build_clh_from_source() { build_clh_from_source() {
info "Build ${cloud_hypervisor_repo} version: ${cloud_hypervisor_version}" info "Build ${cloud_hypervisor_repo} version: ${cloud_hypervisor_version}"
repo_dir=$(basename "${cloud_hypervisor_repo}") repo_dir=$(basename "${cloud_hypervisor_repo}")
repo_dir="${repo_dir//.git}" repo_dir="${repo_dir//.git}"
rm -rf "${repo_dir}" rm -rf "${repo_dir}"
git clone "${cloud_hypervisor_repo}" git clone "${cloud_hypervisor_repo}"
git config --global --add safe.directory "$PWD/repo_dir" git config --global --add safe.directory "$PWD/repo_dir"
pushd "${repo_dir}" pushd "${repo_dir}"
if [ -n "${cloud_hypervisor_pr}" ]; then if [ -n "${cloud_hypervisor_pr}" ]; then
local pr_branch="PR_${cloud_hypervisor_pr}" local pr_branch="PR_${cloud_hypervisor_pr}"
git fetch origin "pull/${cloud_hypervisor_pr}/head:${pr_branch}" || return 1 git fetch origin "pull/${cloud_hypervisor_pr}/head:${pr_branch}" || return 1
git checkout "${pr_branch}" git checkout "${pr_branch}"
git rebase "origin/${cloud_hypervisor_pull_ref_branch}" git rebase "origin/${cloud_hypervisor_pull_ref_branch}"
git log --oneline main~1..HEAD git log --oneline main~1..HEAD
else else
git fetch || true git fetch || true
git checkout "${cloud_hypervisor_version}" git checkout "${cloud_hypervisor_version}"
fi fi
if [ -n "${features}" ]; then if [ -n "${features}" ]; then
info "Build cloud-hypervisor enabling the following features: ${features}" info "Build cloud-hypervisor enabling the following features: ${features}"
./scripts/dev_cli.sh build --release --libc musl --features "${features}" ./scripts/dev_cli.sh build --release --libc musl --features "${features}"
else else
./scripts/dev_cli.sh build --release --libc musl ./scripts/dev_cli.sh build --release --libc musl
fi 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
} }
if [ "${ARCH}" == "aarch64" ]; then if [ "${ARCH}" == "aarch64" ]; then
info "aarch64 binaries are not distributed as part of the Cloud Hypervisor releases, forcing to build from source" info "aarch64 binaries are not distributed as part of the Cloud Hypervisor releases, forcing to build from source"
force_build_from_source="true" force_build_from_source="true"
fi fi
if [ -n "${features}" ]; then if [ -n "${features}" ]; then
info "As an extra build argument has been passed to the script, forcing to build from source" info "As an extra build argument has been passed to the script, forcing to build from source"
force_build_from_source="true" force_build_from_source="true"
fi 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
else else
pull_clh_released_binary || pull_clh_released_binary ||
(info "Failed to pull cloud-hypervisor released binary, trying to build from source" && build_clh_from_source) (info "Failed to pull cloud-hypervisor released binary, trying to build from source" && build_clh_from_source)
fi fi