[oe-commits] Chong Lu : adt-installer: fix sed input file error
git at git.openembedded.org
git at git.openembedded.org
Fri Oct 10 14:06:52 UTC 2014
Module: openembedded-core.git
Branch: daisy
Commit: b0ac1ea1f7eaca92b613f874ee2cbf6830743a71
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b0ac1ea1f7eaca92b613f874ee2cbf6830743a71
Author: Chong Lu <Chong.Lu at windriver.com>
Date: Tue Jul 22 11:16:52 2014 +0800
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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../installer/adt-installer/scripts/adt_installer_internal | 1 +
1 file changed, 1 insertion(+)
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
More information about the Openembedded-commits
mailing list