From 0091b89184cf4f3a68405f61a83c0993dbe08a0d Mon Sep 17 00:00:00 2001 From: Jing Wang Date: Fri, 29 Jan 2021 20:22:31 +0000 Subject: [PATCH] osbuilder: Enforcing LIBC=gnu to rootfs build for ppc64le To enforce LIBC=gnu to rootfs.sh for ppc64le, instead of error and exit if not set. Fixes: #1339 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 b2330040b..df8cf1179 100755 --- a/tools/osbuilder/rootfs-builder/rootfs.sh +++ b/tools/osbuilder/rootfs-builder/rootfs.sh @@ -566,7 +566,7 @@ EOT AGENT_DEST="${AGENT_DIR}/${AGENT_BIN}" if [ -z "${AGENT_SOURCE_BIN}" ] ; then - [ "$ARCH" == "ppc64le" ] && ([ "$LIBC" == "gnu" ] || die "LIBC type for ppc64le should be gnu") + [ "$ARCH" == "ppc64le" ] && ([ "$LIBC" == "gnu" ] || (LIBC=gnu && echo "WARNING: LIBC type for ppc64le should be gnu")) 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