On Tue, Sep 7, 2021 at 12:40 PM Andrey Zhizhikin via lists.openembedded.org <[email protected]> wrote: > > Hello Hongxu, > > On Tue, Sep 7, 2021 at 8:26 AM hongxu <[email protected]> wrote: > > > > The commit [7e71acd265 sdk: fix relocate symlink failed] is used to fix > > regression issue caused by commit [bc4ee54535 sdk: Decouple default install > > path from built in path], but hardknott does not contain commit bc4ee54535, > > so commit 7e71acd265 should not be in hardknott neither, otherwise it caused > > other regression issue. > > > > This reverts commit 7e71acd265637d54d5bf149ea36cefa581f60992. > > This has been already discussed for [dunfell], see [1]. > > The actual proposal was to take the second commit rather than > reverting the first one, which Steve did (see [2]). > > Can the same approach be applied to [hardknott]?
Ah, just saw Anuj took it for [hardknott] (https://lists.openembedded.org/g/openembedded-core/message/155735). :) > > > > > Signed-off-by: Hongxu Jia <[email protected]> > > --- > > 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 ba873373e2..5433741296 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.27.0 > > > > > > > > > > Link: [1]: > https://lists.openembedded.org/g/openembedded-core/topic/85311771#155603 > Link: [2]: https://lists.openembedded.org/g/openembedded-core/message/155670 > > -- > Regards, > Andrey. > > > -- Regards, Andrey.
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155755): https://lists.openembedded.org/g/openembedded-core/message/155755 Mute This Topic: https://lists.openembedded.org/mt/85429805/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
