summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-07-22 11:16:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-23 21:59:14 +0100
commitfd1aacc7983c79757be31cb3c21834a5dd047ecf (patch)
treeb571ead8874029038248ef16a5f774c080e738c1 /meta/recipes-devtools
parentdc6a9a94359280822205a04d5ad11c64423c75e1 (diff)
downloadpoky-fd1aacc7983c79757be31cb3c21834a5dd047ecf.tar.gz
adt-installer: fix sed input file error
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] (From OE-Core rev: e0080f279d5ebb320c2ba285765048fcca523fe7) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal1
1 files changed, 1 insertions, 0 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 cdf93da206..00db301df0 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
163 163
164 # opkg will not install packagegroup-cross-canadian package if it was already 164 # opkg will not install packagegroup-cross-canadian package if it was already
165 # installed. So, the environment script is in one place or the other. 165 # installed. So, the environment script is in one place or the other.
166 [ -e "$INSTALL_FOLDER/$env_script_original" ] && env_script=$INSTALL_FOLDER/$env_script_original
166 [ -e "$env_script_original" ] && env_script=$env_script_original 167 [ -e "$env_script_original" ] && env_script=$env_script_original
167 [ -e "$env_script_relocated" ] && env_script=$env_script_relocated 168 [ -e "$env_script_relocated" ] && env_script=$env_script_relocated
168 169