diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-09-20 14:58:48 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-21 11:10:05 +0100 |
| commit | 6e4923c0c9b218271fd44d78df9987b5cabb1c03 (patch) | |
| tree | b9ce409ed3ff20d739329f8191824762f5cc4eb4 /meta | |
| parent | eba5cdf10aa49da844ac141f00b79327da0cb8c3 (diff) | |
| download | openembedded-core-6e4923c0c9b218271fd44d78df9987b5cabb1c03.tar.gz openembedded-core-6e4923c0c9b218271fd44d78df9987b5cabb1c03.tar.bz2 openembedded-core-6e4923c0c9b218271fd44d78df9987b5cabb1c03.zip | |
SDK: relocate symlinks too
The directory usr/libexec/ in the SDK sysroot contains the default
symlinks to the toolchain binaries and these, too, need to point to the
correct toolchain path.
[YOCTO #3090]
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 5 | ||||
| -rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 10f3975b98..42c0d39749 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -174,6 +174,11 @@ fi # replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc find $native_sysroot -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" +# change all symlinks pointing to ${SDKPATH} +for l in $(find $native_sysroot -type l); do + ln -sf $(readlink $l|sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l +done + echo done # delete the relocating script, so that user is forced to re-run the installer 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 fbcd2ceb3c..63fcf60012 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal @@ -215,6 +215,11 @@ $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_scr find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|\ xargs $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" +# change all symlinks pointing to /opt/${DISTRO}/${SDK_VERSION} +for l in $(find $NATIVE_INSTALL_DIR -type l); do + ln -sf $(readlink $l|sed -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:") $l +done + echo_info "\nSuccessfully installed selected native ADT!" } |