aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-02-10 17:14:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2863 from wainersm/osbuilder_dracut_rust

Browse Source 
osbuilder: Call detect_rust_version() right before install_rust.sh
This commit is contained in:
James O. D. Hunt
2021-10-19 11:48:39 +01:00
committed by GitHub
parent 1ba069b303 50da26d3e6
commit 9db56ffd85
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/osbuilder/rootfs-builder/rootfs.sh
View File

@@ -552,7 +552,13 @@ EOT
fi
[ "$LIBC" == "musl" ] && bash ${script_dir}/../../../ci/install_musl.sh
# rust agent needs ${arch}-unknown-linux-${LIBC}
rustup show | grep linux-${LIBC} > /dev/null || bash ${script_dir}/../../../ci/install_rust.sh ${RUST_VERSION}
if ! (rustup show | grep -v linux-${LIBC} > /dev/null); then
if [ "$RUST_VERSION" == "null" ]; then
detect_rust_version || \
die "Could not detect the required rust version for AGENT_VERSION='${AGENT_VERSION:-main}'."
fi
bash ${script_dir}/../../../ci/install_rust.sh ${RUST_VERSION}
fi
test -r "${HOME}/.cargo/env" && source "${HOME}/.cargo/env"
[ "$ARCH" == "aarch64" ] && OLD_PATH=$PATH && export PATH=$PATH:/usr/local/musl/bin