[PATCH] binutils: fix symlinks

[PATCH] binutils: fix symlinks

[Achille Fouilleul]

For nativesdk, symlinks created by do_install contain ${SDKPATHNATIVE}.

This is a problem with SDKs that include nativesdk-binutils and nativesdk-gcc.
When extracting such an SDK dangling symlinks are created, because
relocate_sdk.py does not adjust symlinks. As a result gcc ends up calling the
host binutils.

Use the os.path.relpath function to obtain shorter relative paths, which do not
contain ${SDKPATHNATIVE}.

Signed-off-by: Achille Fouilleul <achille.fouilleul@gadz.org>
---
 meta/recipes-devtools/binutils/binutils.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 37813dd864..8af48e735b 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -128,12 +128,12 @@ do_install () {
 	# We don't really need these, so we'll remove them...
 	rm -rf ${D}${libdir}/ldscripts
 
+	bindir_rel=${@os.path.relpath('${bindir}', '${prefix}/${TARGET_SYS}/bin')}
+
 	# Fix the /usr/${TARGET_SYS}/bin/* links
 	for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
 		rm -f $l
-		ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
-			| tr -s / \
-			| sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+		ln -sf $bindir_rel/${TARGET_PREFIX}`basename $l` $l
 	done
 
 	# Install the libiberty header
-- 
2.18.0

Re: [PATCH] binutils: fix symlinks

[Khem Raj]

On Fri, Oct 5, 2018 at 7:38 AM Achille Fouilleul
<achille.fouilleul@gadz.org> wrote:
>
> For nativesdk, symlinks created by do_install contain ${SDKPATHNATIVE}.
>
> This is a problem with SDKs that include nativesdk-binutils and nativesdk-gcc.
> When extracting such an SDK dangling symlinks are created, because
> relocate_sdk.py does not adjust symlinks. As a result gcc ends up calling the
> host binutils.
>
> Use the os.path.relpath function to obtain shorter relative paths, which do not
> contain ${SDKPATHNATIVE}.
>

this seems to make sense, LGTM we need to test it out for other
classtypes though

> Signed-off-by: Achille Fouilleul <achille.fouilleul@gadz.org>
> ---
>  meta/recipes-devtools/binutils/binutils.inc | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
> index 37813dd864..8af48e735b 100644
> --- a/meta/recipes-devtools/binutils/binutils.inc
> +++ b/meta/recipes-devtools/binutils/binutils.inc
> @@ -128,12 +128,12 @@ do_install () {
>         # We don't really need these, so we'll remove them...
>         rm -rf ${D}${libdir}/ldscripts
>
> +       bindir_rel=${@os.path.relpath('${bindir}', '${prefix}/${TARGET_SYS}/bin')}
> +
>         # Fix the /usr/${TARGET_SYS}/bin/* links
>         for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
>                 rm -f $l
> -               ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
> -                       | tr -s / \
> -                       | sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
> +               ln -sf $bindir_rel/${TARGET_PREFIX}`basename $l` $l
>         done
>
>         # Install the libiberty header
> --
> 2.18.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core