summaryrefslogtreecommitdiffstats
path: root/meta/files/toolchain-shar-relocate.sh
diff options
context:
space:
mode:
authorhongxu <hongxu.jia@windriver.com>2021-08-10 21:33:56 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-26 08:32:18 +0100
commitd6f40be29bf56a835f5825692a22365f04aeb6c3 (patch)
tree5b58d689037c25fc18f6861d25f2c41e69db3c22 /meta/files/toolchain-shar-relocate.sh
parent77269f916312f42ba1f95ccc819dc8d131d20411 (diff)
downloadpoky-d6f40be29bf56a835f5825692a22365f04aeb6c3.tar.gz
poky-d6f40be29bf56a835f5825692a22365f04aeb6c3.tar.bz2
poky-d6f40be29bf56a835f5825692a22365f04aeb6c3.zip
sdk: fix relocate symlink failed
Install SDK to non-default dir, sysmlink mkfs.vfat is invalid $ ./sdk.sh -y -d ./dnf-2 -S -D $ ls sysroots/x86_64-wrlinuxsdk-linux/usr/bin/mkfs.vfat -al lrwxrwxrwx 1 hjia users 99 Aug 10 20:38 sysroots/x86_64-wrlinuxsdk-linux/usr/bin/mkfs.vfat -> /opt/windriver/wrlinux-graphics/21.32/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/mkfs.vfat.dosfstools Since commit [bc4ee54535 sdk: Decouple default install path from built in path] applied, sdk relocates symlink failed, it should replace $SDK_BUILD_PATH rather than $DEFAULT_INSTALL_DIR, just like above commit did Without this commit: ... |+ for l in $($SUDO_EXEC find $native_sysroot -type l) |++ readlink path-to/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/mkfs.vfat |++ sed -e s:/usr/local/oecore-x86_64:path-to: |+ ln -sfn /opt/windriver/wrlinux-graphics/21.32/sysroots/x86_64-wrlinuxsdk-linux/ usr/bin/mkfs.vfat.dosfstools path-to//sysroots/x86_64-wrlinuxsdk-linux/usr/bin/mkfs.vfat ... After appling this commit: ... |+ for l in $($SUDO_EXEC find $native_sysroot -type l) |++ readlink path-to/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/mkfs.vfat |++ sed -e s:/opt/windriver/wrlinux-graphics/21.31:path-to: |+ ln -sfn path-to/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/mkfs.vfat.dosfstools path-to/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/mkfs.vfat ... (From OE-Core rev: a155c4d4ca841ef492213a5f0b9121703c62e2b4) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 942c06a7348070b92f722fa5c439c8c4404485b7) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files/toolchain-shar-relocate.sh')
-rw-r--r--meta/files/toolchain-shar-relocate.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh
index 5433741296..ba873373e2 100644
--- a/meta/files/toolchain-shar-relocate.sh
+++ b/meta/files/toolchain-shar-relocate.sh
@@ -72,7 +72,7 @@ fi
# change all symlinks pointing to @SDKPATH@
for l in $($SUDO_EXEC find $native_sysroot -type l); do
- $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l
+ $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e "s:$SDK_BUILD_PATH:$target_sdk_dir:") $l
if [ $? -ne 0 ]; then
echo "Failed to setup symlinks. Relocate script failed. Abort!"
exit 1