Patchwork adt_installer: Fix sed file not found error

login
register
mail settings
Submitter Richard Purdie
Date June 30, 2014, 3:21 p.m.
Message ID <1404141677.6362.14.camel@ted>
Download mbox | patch
Permalink /patch/74485/
State New
Headers show

Comments

Richard Purdie - June 30, 2014, 3:21 p.m.
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>

Patch

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 432ba41..8d2ff57 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##*/}