From 9f7a7a4f86fa070aad6b5251a7ca46809df244d5 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 5d51c81e89..6e6ea3bdf2 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" ] || 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