From 40c57a487ea617bfd744803dbc2fa463a1c2bb65 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 30 Nov 2012 19:34:08 +0000 Subject: 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. (From OE-Core rev: 206aa794933d41dfb037e9c654c818cd4d4f956d) Signed-off-by: Jason Wessel Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes/populate_sdk_base.bbclass') diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 02ade52d1c..f20d439036 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 -- cgit v1.2.3-54-g00ecf