summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-09-17 11:19:08 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-21 11:10:22 +0100
commitbd73a4b615f51d6a2330fcd21a33dcdd863497d2 (patch)
tree7f975a2552e1452c0c7279b47db378f7a83cd99d /meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
parentb9bd372666af10f5ff0635885f23a03a0daae2b2 (diff)
downloadpoky-bd73a4b615f51d6a2330fcd21a33dcdd863497d2.tar.gz
SDK: fix installation into symlinked directories
The SDK installation scripts should not canonicalize symlinked directories because the entire relocation would be done to the directory to which the symlink points. Instead, if the installation is a symlink, use that path to relocate the binaries. For example, if we have the following symlink: /opt/sdk -> ~/my/test/sdk the binaries will be relocated to /opt/sdk not ~/my/test/sdk as it is done now. [YOCTO #3102] (From OE-Core rev: 9e6a25e2e9a7f37c3baa0b2949a43ac4127868da) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
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 f113aa4b80..76acaa7e8a 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -207,7 +207,7 @@ $SUDO scripts/relocate_sdk_tmp.py $INSTALL_FOLDER $dl_path $executable_files
207check_result 207check_result
208 208
209# replace /opt/${DISTRO}/${SDK_VERSION} with the install folder in all configs 209# replace /opt/${DISTRO}/${SDK_VERSION} with the install folder in all configs
210env_setup_script=$(find $NATIVE_INSTALL_DIR -name "environment-setup-*") 210env_setup_script=$(find $NATIVE_INSTALL_DIR/ -name "environment-setup-*")
211$SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script 211$SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script
212 212
213find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|\ 213find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|\