github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-22 13:38:26 +00:00
Code Issues Projects Releases Wiki Activity

osbuilder: fix rootfs build on ppc64le

Browse Source 
The default toolchain used for building the
rust agent would be different for ppc64le.

Fixes: #678

Signed-off-by: Amulya Meka <amulmek1@in.ibm.com>
This commit is contained in:
Amulya Meka 2020-09-09 03:09:03 +00:00
parent e429f79d36
commit ebd3f316f2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -539,9 +539,10 @@ EOT
AGENT_DEST="${AGENT_DIR}/${AGENT_BIN}" AGENT_DEST="${AGENT_DIR}/${AGENT_BIN}"
if [ -z "${AGENT_SOURCE_BIN}" ] ; then if [ -z "${AGENT_SOURCE_BIN}" ] ; then
[ "$ARCH" == "ppc64le" ] && ([ "$LIBC" == "gnu" ] || die "LIBC type for ppc64le should be gnu")
bash ${script_dir}/../../../ci/install_musl.sh bash ${script_dir}/../../../ci/install_musl.sh
# rust agent needs ${arch}-unknown-linux-musl # rust agent needs ${arch}-unknown-linux-${LIBC}
rustup show | grep linux-musl > /dev/null || bash ${script_dir}/../../../ci/install_rust.sh rustup show | grep linux-${LIBC} > /dev/null || bash ${script_dir}/../../../ci/install_rust.sh
test -r "${HOME}/.cargo/env" && source "${HOME}/.cargo/env" test -r "${HOME}/.cargo/env" && source "${HOME}/.cargo/env"
[ "$ARCH" == "aarch64" ] && OLD_PATH=$PATH && export PATH=$PATH:/usr/local/musl/bin [ "$ARCH" == "aarch64" ] && OLD_PATH=$PATH && export PATH=$PATH:/usr/local/musl/bin