From 71aeb920aac434ca4b21b3cf9275e33b2801c1a3 Mon Sep 17 00:00:00 2001 From: Jing Wang Date: Tue, 2 Feb 2021 14:21:09 +0000 Subject: [PATCH] osbuilder: updates for feedback Updates for review feedback. Signed-off-by: Jing Wang --- tools/osbuilder/rootfs-builder/rootfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh index 6e6ea3bdf2..6ac1625756 100755 --- a/tools/osbuilder/rootfs-builder/rootfs.sh +++ b/tools/osbuilder/rootfs-builder/rootfs.sh @@ -560,7 +560,7 @@ EOT AGENT_DEST="${AGENT_DIR}/${AGENT_BIN}" if [ -z "${AGENT_SOURCE_BIN}" ] ; then - [ "$ARCH" == "ppc64le" ] && ([ "$LIBC" == "gnu" ] || (LIBC=gnu && echo "WARNING: LIBC type for ppc64le should be gnu")) + [ "$ARCH" == "ppc64le" ] && { LIBC=gnu; echo "WARNING: Forcing LIBC=gnu for ppc64le because musl toolchain is not supported on ppc64le"; } 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