[oe-commits] Jason Wessel : populate_sdk_base.bbclass: make failure to find ld-linux. so a hard error

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 206aa794933d41dfb037e9c654c818cd4d4f956d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=206aa794933d41dfb037e9c654c818cd4d4f956d

Author: Jason Wessel <jason.wessel at windriver.com>
Date:   Fri Nov 30 19:34:08 2012 +0000

populate_sdk_base.bbclass: make failure to find ld-linux.so a hard error

The shell archive that populates the external SDK should fail if it
cannot find the ld-linux.so else it will corrupt all binaries because
a random path will be used from the list of executables when dl_path
is empty.

Signed-off-by: Jason Wessel <jason.wessel at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/populate_sdk_base.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 02ade52..f20d439 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -218,6 +218,10 @@ done
 # fix dynamic loader paths in all ELF SDK binaries
 native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep OECORE_NATIVE_SYSROOT|cut -d'=' -f2|tr -d '"')
 dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*")
+if [ "$dl_path" = "" ] ; then
+	echo "SDK could not be set up. Relocate script to find ld-linux.so. Abort!"
+	exit 1
+fi
 executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm +111)
 $SUDO_EXEC ${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir $dl_path $executable_files
 if [ $? -ne 0 ]; then