From: Richard Purdie Date: Tue, 29 Sep 2015 12:43:45 +0000 (+0100) Subject: toolchain-shar-extract: Correct environment-setup script names for multilib X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~28733 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2fa59f46bbc86985e6c8e4d5d514a07a9ade884;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 --- diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index dd92d0eb7f0..2ffc2d1c07d 100644 --- 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