summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2012-11-30 19:34:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-03 14:47:59 +0000
commit40c57a487ea617bfd744803dbc2fa463a1c2bb65 (patch)
treec40ce9e2a06e50e9f9f29debf10c228d66016dc9 /meta
parent63de425730e8773d6b77c3c4b2bca9dea3abf6df (diff)
downloadpoky-40c57a487ea617bfd744803dbc2fa463a1c2bb65.tar.gz
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 <jason.wessel@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_base.bbclass4
1 files changed, 4 insertions, 0 deletions
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
218# fix dynamic loader paths in all ELF SDK binaries 218# fix dynamic loader paths in all ELF SDK binaries
219native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep OECORE_NATIVE_SYSROOT|cut -d'=' -f2|tr -d '"') 219native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep OECORE_NATIVE_SYSROOT|cut -d'=' -f2|tr -d '"')
220dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") 220dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*")
221if [ "$dl_path" = "" ] ; then
222 echo "SDK could not be set up. Relocate script to find ld-linux.so. Abort!"
223 exit 1
224fi
221executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm +111) 225executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm +111)
222$SUDO_EXEC ${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir $dl_path $executable_files 226$SUDO_EXEC ${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir $dl_path $executable_files
223if [ $? -ne 0 ]; then 227if [ $? -ne 0 ]; then