diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-03 12:24:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-06 15:15:50 +0100 |
commit | 63a07810051581d67ebd7462503f92f83177c12b (patch) | |
tree | e3e12d44fbf117fd15f2327f2fd55b9aab909a9c /meta/recipes-devtools/installer | |
parent | 6c3d1192c79d5b513169a734818f436b1ce645f0 (diff) | |
download | poky-63a07810051581d67ebd7462503f92f83177c12b.tar.gz |
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.
(From OE-Core rev: 3be7b59893ed77f63eeca35b686df06a1dafb53d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 2 |
1 files changed, 1 insertions, 1 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 00db301df0..2a8a30ccdc 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 | |||
167 | [ -e "$env_script_original" ] && env_script=$env_script_original | 167 | [ -e "$env_script_original" ] && env_script=$env_script_original |
168 | [ -e "$env_script_relocated" ] && env_script=$env_script_relocated | 168 | [ -e "$env_script_relocated" ] && env_script=$env_script_relocated |
169 | 169 | ||
170 | $SUDO sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g" $env_script | 170 | $SUDO sed -i -e "s%SDKTARGETSYSROOT=.*%SDKTARGETSYSROOT=$target_sysroot%g" $env_script |
171 | done | 171 | done |
172 | 172 | ||
173 | if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" == "y" ]; then | 173 | if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" == "y" ]; then |