Patchwork [daisy] adt-installer: fix sed input file error

login
register
mail settings
Submitter Chong.Lu@windriver.com
Date July 31, 2014, 7:33 a.m.
Message ID <1406792036-14189-1-git-send-email-Chong.Lu@windriver.com>
Download mbox | patch
Permalink /patch/77005/
State Accepted
Commit fd1aacc7983c79757be31cb3c21834a5dd047ecf
Headers show

Comments

Chong.Lu@windriver.com - July 31, 2014, 7:33 a.m.
When use default install directory, we can't get the environment setup
script path. The reason is that opkg-cl list incorrect files paths.
This patch sets env_script variable to make us get correct environment
setup script path.

[YOCTO #6443]

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 .../installer/adt-installer/scripts/adt_installer_internal               | 1 +
 1 file changed, 1 insertion(+)

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..b25af35 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -163,6 +163,7 @@  for target_type in $YOCTOADT_TARGETS; do
 
   # opkg will not install packagegroup-cross-canadian package if it was already
   # installed. So, the environment script is in one place or the other.
+  [ -e "$INSTALL_FOLDER/$env_script_original" ] && env_script=$INSTALL_FOLDER/$env_script_original
   [ -e "$env_script_original" ] && env_script=$env_script_original
   [ -e "$env_script_relocated" ] && env_script=$env_script_relocated