From: Chen Qi Date: Wed, 9 Oct 2024 08:56:47 +0000 (-0700) Subject: toolchain-shar-extract.sh: exit when post-relocate-setup.sh fails X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d75c64b6d4b57800c844993876840f281b877d9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git toolchain-shar-extract.sh: exit when post-relocate-setup.sh fails When LD_LIBRARY_PATH is set, post-relocate-setup.sh will fail and exit properly. But such failure is ignored and the SDK installation will continue and tell user that things succeed. This is misleading. So exit immediately if post-relocate-setup.sh fails. Fixes [Yocto #15586] Signed-off-by: Chen Qi Signed-off-by: Richard Purdie (cherry picked from commit c8e2dcc1f71aa33cc6e56dfdebebbe7ef010c944) Signed-off-by: Steve Sakoman --- diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 89d30005fd4..3b4647fca7b 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -286,6 +286,10 @@ post_relocate="$target_sdk_dir/post-relocate-setup.sh" if [ -e "$post_relocate" ]; then $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $post_relocate $SUDO_EXEC /bin/sh $post_relocate "$target_sdk_dir" "@SDKPATH@" + if [ $? -ne 0 ]; then + echo "Executing $post_relocate failed" + exit 1 + fi $SUDO_EXEC rm -f $post_relocate fi