summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-09-20 14:58:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-21 11:10:23 +0100
commit04877f768ebc7ed76fe320befe0b405c78d94b0f (patch)
treea8259d68af8754300518eb650705cdf34a2a5411
parentb6867e80b9ecf0ede723aab845745e228442c46e (diff)
downloadpoky-04877f768ebc7ed76fe320befe0b405c78d94b0f.tar.gz
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] (From OE-Core rev: 6e4923c0c9b218271fd44d78df9987b5cabb1c03) 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>
-rw-r--r--meta/classes/populate_sdk_base.bbclass5
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal5
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
174# replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc 174# replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc
175find $native_sysroot -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" 175find $native_sysroot -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
176 176
177# change all symlinks pointing to ${SDKPATH}
178for l in $(find $native_sysroot -type l); do
179 ln -sf $(readlink $l|sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l
180done
181
177echo done 182echo done
178 183
179# delete the relocating script, so that user is forced to re-run the installer 184# 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
215find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|\ 215find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|\
216 xargs $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" 216 xargs $SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g"
217 217
218# change all symlinks pointing to /opt/${DISTRO}/${SDK_VERSION}
219for l in $(find $NATIVE_INSTALL_DIR -type l); do
220 ln -sf $(readlink $l|sed -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:") $l
221done
222
218echo_info "\nSuccessfully installed selected native ADT!" 223echo_info "\nSuccessfully installed selected native ADT!"
219} 224}
220 225