From 48948810c975cf55ef54d8fed94f2f5792b95071 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 9 Oct 2024 01:56:47 -0700 Subject: [PATCH] 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] (From OE-Core rev: 7050f445081801555614b264e1932e55538a7127) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie (cherry picked from commit c8e2dcc1f71aa33cc6e56dfdebebbe7ef010c944) Signed-off-by: Steve Sakoman --- meta/files/toolchain-shar-extract.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 4386b985bb..ec5e4aa922 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -284,6 +284,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