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-04 23:34:13 +0100 |
| commit | 3be7b59893ed77f63eeca35b686df06a1dafb53d (patch) | |
| tree | c69ae13cab820c2c1d579626269e00d9942cf2a0 /meta/recipes-devtools/installer | |
| parent | 2b85b3f33af5157cd4b6f8a6dc737015c85018c3 (diff) | |
| download | openembedded-core-3be7b59893ed77f63eeca35b686df06a1dafb53d.tar.gz openembedded-core-3be7b59893ed77f63eeca35b686df06a1dafb53d.tar.bz2 openembedded-core-3be7b59893ed77f63eeca35b686df06a1dafb53d.zip | |
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@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 [ -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 |