aboutsummaryrefslogtreecommitdiffstats
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-10-10 15:05:51 +0100
commitb0ac1ea1f7eaca92b613f874ee2cbf6830743a71 (patch)
tree15d60f6f4eec4704fe3183f860eca36f2a2f871c /meta/recipes-devtools
parent947c1bab91993be149fba1d09aedbe8509902fbe (diff)
downloadopenembedded-core-b0ac1ea1f7eaca92b613f874ee2cbf6830743a71.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] 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 432ba41237..b25af359f6 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