]> code.ossystems Code Review - openembedded-core.git/commitdiff
populate_sdk_base.bbclass: allow $OECORE_NATIVE_SYSROOT in sdk_env_script
authorBernhard Guillon <Bernhard.Guillon@hale.at>
Thu, 4 Jul 2013 09:16:30 +0000 (11:16 +0200)
committerSaul Wold <sgw@linux.intel.com>
Tue, 9 Jul 2013 14:56:14 +0000 (07:56 -0700)
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>
meta/classes/populate_sdk_base.bbclass

index 6378af98a8b72cff05672d57cae05277b1acc01a..30c1d29a28d68b426c252364c351d56a23710572 100644 (file)
@@ -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!"