toolchain-shar-extract: Correct environment-setup script names for multilib

Currently a lib32-core-image-* SDK prints an incorrect environment-setup-*
file name when installing the SDK. Instead of printing the wrong thing, list
the environment setup files present in the SDK.

As it happens this fixes the message printed with buildtools-tarball too
which someone reported to me about the same time as I finished this patch!

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index dd92d0eb7f0a11d263e7aae8601ca453703d54ad..2ffc2d1c07deade56cf7364104544b45b109197a 100644 (file)
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -182,7 +182,9 @@ fi
 
 echo "SDK has been successfully set up and is ready to be used."
 echo "Each time you wish to use the SDK in a new shell session, you need to source the environment setup script e.g."
-echo " \$ . $target_sdk_dir/environment-setup-@REAL_MULTIMACH_TARGET_SYS@"
+for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do
+       echo " \$ . $target_sdk_dir/$env_setup_script"
+done
 
 exit 0