[oe-commits] Bernhard Guillon : populate_sdk_base.bbclass: allow $OECORE_NATIVE_SYSROOT in sdk_env_script

[git at git.openembedded.org]

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

Author: Bernhard Guillon <Bernhard.Guillon at hale.at>
Date:   Thu Jul  4 11:16:30 2013 +0200

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 at hale.at>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

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

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 6378af9..30c1d29 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!"