[oe-commits] Richard Purdie : adt-installer: Fix to work with meta-environment changes
git at git.openembedded.org
git at git.openembedded.org
Mon Oct 6 14:16:18 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 3be7b59893ed77f63eeca35b686df06a1dafb53d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3be7b59893ed77f63eeca35b686df06a1dafb53d
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Fri Oct 3 12:24:21 2014 +0100
adt-installer: Fix to work with meta-environment changes
There is a proper sysroot specified in the meta-environment script now,
which isn't a bad thing. We adjust the sed expression to cope with this.
That means the SDK installations in non-default paths start to work again.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../installer/adt-installer/scripts/adt_installer_internal | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 00db301..2a8a30c 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -167,7 +167,7 @@ for target_type in $YOCTOADT_TARGETS; do
[ -e "$env_script_original" ] && env_script=$env_script_original
[ -e "$env_script_relocated" ] && env_script=$env_script_relocated
- $SUDO sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g" $env_script
+ $SUDO sed -i -e "s%SDKTARGETSYSROOT=.*%SDKTARGETSYSROOT=$target_sysroot%g" $env_script
done
if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" == "y" ]; then
More information about the Openembedded-commits
mailing list