This reverts commit a155c4d4ca841ef492213a5f0b9121703c62e2b4.

Otherwise, SDK installing fails with:

Extracting SDK...........................................................done
Setting it up...sed: -e expression #1, char 0: no previous regular expression
sed: -e expression #1, char 0: no previous regular expression
... tonns of lines ...
sed: -e expression #1, char 0: no previous regular expression
done
SDK has been successfully set up and is ready to be used.

Original commit message mentions commit bc4ee54535 ("sdk: Decouple
default install path from built in path"), that is not part of
dunfell. Hence, revert this fix.

Signed-off-by: grygorii tertychnyi <grembe...@outlook.com>
---
 meta/files/toolchain-shar-relocate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/files/toolchain-shar-relocate.sh 
b/meta/files/toolchain-shar-relocate.sh
index ba873373e29e..54337412966c 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:$SDK_BUILD_PATH:$target_sdk_dir:") $l
+       $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e 
"s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l
        if [ $? -ne 0 ]; then
                echo "Failed to setup symlinks. Relocate script failed. Abort!"
                exit 1
-- 
2.30.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#155603): 
https://lists.openembedded.org/g/openembedded-core/message/155603
Mute This Topic: https://lists.openembedded.org/mt/85311771/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to