* [hardknott][PATCH] Revert "sdk: fix relocate symlink failed"
@ 2021-09-07 6:25 hongxu
2021-09-07 10:39 ` [OE-core] " Andrey Zhizhikin
[not found] ` <16A2841257B7E642.24606@lists.openembedded.org>
0 siblings, 2 replies; 4+ messages in thread
From: hongxu @ 2021-09-07 6:25 UTC (permalink / raw)
To: openembedded-core; +Cc: anuj.mittal
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.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.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 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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [OE-core] [hardknott][PATCH] Revert "sdk: fix relocate symlink failed"
2021-09-07 6:25 [hardknott][PATCH] Revert "sdk: fix relocate symlink failed" hongxu
@ 2021-09-07 10:39 ` Andrey Zhizhikin
2021-09-08 1:21 ` hongxu
[not found] ` <16A2841257B7E642.24606@lists.openembedded.org>
1 sibling, 1 reply; 4+ messages in thread
From: Andrey Zhizhikin @ 2021-09-07 10:39 UTC (permalink / raw)
To: hongxu; +Cc: OE Core mailing list, Mittal, Anuj
Hello Hongxu,
On Tue, Sep 7, 2021 at 8:26 AM hongxu <hongxu.jia@windriver.com> 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]?
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.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 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.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [OE-core] [hardknott][PATCH] Revert "sdk: fix relocate symlink failed"
2021-09-07 10:39 ` [OE-core] " Andrey Zhizhikin
@ 2021-09-08 1:21 ` hongxu
0 siblings, 0 replies; 4+ messages in thread
From: hongxu @ 2021-09-08 1:21 UTC (permalink / raw)
To: Andrey Zhizhikin; +Cc: OE Core mailing list, Mittal, Anuj
On 9/7/21 6:39 PM, Andrey Zhizhikin wrote:
> [Please note: This e-mail is from an EXTERNAL e-mail address]
>
> Hello Hongxu,
>
> On Tue, Sep 7, 2021 at 8:26 AM hongxu <hongxu.jia@windriver.com> 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]?
Yes, I think so
//Hongxu
>> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.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 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <16A2841257B7E642.24606@lists.openembedded.org>]
* Re: [OE-core] [hardknott][PATCH] Revert "sdk: fix relocate symlink failed"
[not found] ` <16A2841257B7E642.24606@lists.openembedded.org>
@ 2021-09-07 10:41 ` Andrey Zhizhikin
0 siblings, 0 replies; 4+ messages in thread
From: Andrey Zhizhikin @ 2021-09-07 10:41 UTC (permalink / raw)
To: Andrey Zhizhikin; +Cc: hongxu, OE Core mailing list, Mittal, Anuj
On Tue, Sep 7, 2021 at 12:40 PM Andrey Zhizhikin via
lists.openembedded.org <andrey.z=gmail.com@lists.openembedded.org>
wrote:
>
> Hello Hongxu,
>
> On Tue, Sep 7, 2021 at 8:26 AM hongxu <hongxu.jia@windriver.com> 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 <hongxu.jia@windriver.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 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-09-08 1:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-07 6:25 [hardknott][PATCH] Revert "sdk: fix relocate symlink failed" hongxu
2021-09-07 10:39 ` [OE-core] " Andrey Zhizhikin
2021-09-08 1:21 ` hongxu
[not found] ` <16A2841257B7E642.24606@lists.openembedded.org>
2021-09-07 10:41 ` Andrey Zhizhikin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.