summaryrefslogtreecommitdiffstats
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:06:05 +0100
commit4dada3c0921ec8e2444e3647d136ee5b9a9048bc (patch)
tree8d0fa5a4a83175b9e1c9617557e24b559cdf57e4
parent43903a5bfd278273baa03d2f65a35e3a0e7681f0 (diff)
downloadpoky-4dada3c0921ec8e2444e3647d136ee5b9a9048bc.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: b0ac1ea1f7eaca92b613f874ee2cbf6830743a71) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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
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