summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-30 16:21:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-30 16:35:03 +0100
commit3042dcaecadee266b1e4dcae102030c7e4802b89 (patch)
tree1ffab9fc68314c7d76b479db428ba67663922238
parent173194493294574e49874858ee7003000f41b4d6 (diff)
downloadopenembedded-core-contrib-3042dcaecadee266b1e4dcae102030c7e4802b89.tar.gz
openembedded-core-contrib-3042dcaecadee266b1e4dcae102030c7e4802b89.tar.bz2
openembedded-core-contrib-3042dcaecadee266b1e4dcae102030c7e4802b89.zip
adt_installer: Fix sed file not found error
We need to look for the installed file within the sysroot we just installed so add in the missing prefix. This avoids errors like: Installing cross canadian packages for qemux86 ... sed: no input files [YOCTO #6443] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 432ba41237..8d2ff57821 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -157,7 +157,7 @@ for target_type in $YOCTOADT_TARGETS; do
# get the environment setup script paths: original (the one before relocation)
# and relocated
- env_script_original=`$OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR files meta-environment-$machine|\
+ env_script_original=$NATIVE_INSTALL_DIR`$OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR files meta-environment-$machine|\
grep environment-setup`
env_script_relocated=$INSTALL_FOLDER/${env_script_original##*/}