From: Bernhard Guillon <Bernhard.Guillon@hale.at>
Date: Thu, 4 Jul 2013 09:16:30 +0000 (+0200)
Subject: populate_sdk_base.bbclass: allow $OECORE_NATIVE_SYSROOT in sdk_env_script
X-Git-Tag: 2015-4~5888
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d084c31720f9c13a71c5981f4eda21e18ba2350f;p=openembedded-core.git

populate_sdk_base.bbclass: allow $OECORE_NATIVE_SYSROOT in sdk_env_script

Only grep for 'OECORE_NATIVE_SYSROOT=' otherwise things like

toolchain_create_sdk_env_script_append() {
    echo 'export MY_DIR_FOO=$OECORE_NATIVE_SYSROOT/my/dir/foo' >> $script
}

trigger the following error while executing the install script:

find: `$OECORE_NATIVE_SYSROOT/my/dir/foo': No such file or directory

Signed-off-by: Bernhard Guillon <Bernhard.Guillon@hale.at>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 6378af98a8..30c1d29a28 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -248,7 +248,7 @@ for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do
 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 '"')
+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 unable to find ld-linux.so. Abort!"