Re: [PATCH v3 5/6] sdk: Inject sysroot path when calling relocated toolchain

[Jan Kiszka <jan.kiszka@siemens.com>]

On 14.07.20 22:22, [ext] Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This removes the need to specify --sysroot=/path/to/sdkroot when calling
> gcc or ld from the SDK.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> Changes in v3:
>  - fix ARMv7
> 
> I just had to pull this into another downstream layer today, so I 
> thought it would be good to send this update and remember the whole 
> series.
> 
>  meta/classes/image-sdk-extension.bbclass         |  8 ++++++++
>  .../sdkchroot/files/gcc-sysroot-wrapper.sh       | 16 ++++++++++++++++
>  .../sdkchroot/files/relocate-sdk.sh              |  3 +++
>  meta/recipes-devtools/sdkchroot/sdkchroot.bb     |  2 ++
>  4 files changed, 29 insertions(+)
>  create mode 100755 meta/recipes-devtools/sdkchroot/files/gcc-sysroot-wrapper.sh
> 
> diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass
> index 6e76b04d..ebc6f342 100644
> --- a/meta/classes/image-sdk-extension.bbclass
> +++ b/meta/classes/image-sdk-extension.bbclass
> @@ -32,6 +32,14 @@ do_populate_sdk() {
>          fi
>      done
>  
> +    # Set up sysroot wrapper
> +    for tool_pattern in "gcc-[0-9]*" "g++-[0-9]*" "cpp-[0-9]*" "ld.bfd" "ld.gold"; do
> +        for tool in $(find ${SDKCHROOT_DIR}/usr/bin -type f -name "*-linux-gnu*-${tool_pattern}"); do
> +            sudo mv "${tool}" "${tool}.bin"
> +            sudo ln -sf gcc-sysroot-wrapper.sh ${tool}
> +        done
> +    done
> +
>      # Copy mount_chroot.sh for convenience
>      sudo cp ${ISARROOT}/scripts/mount_chroot.sh ${SDKCHROOT_DIR}
>  
> diff --git a/meta/recipes-devtools/sdkchroot/files/gcc-sysroot-wrapper.sh b/meta/recipes-devtools/sdkchroot/files/gcc-sysroot-wrapper.sh
> new file mode 100755
> index 00000000..feead1a1
> --- /dev/null
> +++ b/meta/recipes-devtools/sdkchroot/files/gcc-sysroot-wrapper.sh
> @@ -0,0 +1,16 @@
> +#!/bin/sh
> +#
> +# This software is a part of ISAR.
> +# Copyright (c) Siemens AG, 2020
> +#
> +# SPDX-License-Identifier: MIT
> +
> +GCC_SYSROOT=
> +
> +NEXT_TARGET=$0
> +until [ "${NEXT_TARGET##*/}" = "gcc-sysroot-wrapper.sh" ]; do
> +	TARGET=${NEXT_TARGET}
> +	NEXT_TARGET=$(dirname ${TARGET})/$(readlink ${TARGET})
> +done
> +
> +${TARGET}.bin --sysroot=${GCC_SYSROOT} "$@"
> diff --git a/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh b/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh
> index 1c9b02fa..0d1c6330 100755
> --- a/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh
> +++ b/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh
> @@ -38,4 +38,7 @@ for binary in $(find ${sdkroot}/usr/bin ${sdkroot}/usr/sbin ${sdkroot}/usr/lib/g
>  	fi
>  done
>  
> +sed -i 's|^GCC_SYSROOT=.*|GCC_SYSROOT="'"${new_sdkroot}"'"|' \
> +    ${sdkroot}/usr/bin/gcc-sysroot-wrapper.sh
> +
>  echo "done"
> diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb
> index dc765046..bf3f6fb4 100644
> --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb
> +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb
> @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260
>  SRC_URI = " \
>      file://configscript.sh \
>      file://relocate-sdk.sh \
> +    file://gcc-sysroot-wrapper.sh \
>      file://README.sdk"
>  PV = "0.1"
>  
> @@ -54,6 +55,7 @@ sdkchroot_install_files() {
>      # Configure root filesystem
>      sudo install -m 644 ${WORKDIR}/README.sdk ${S}
>      sudo install -m 755 ${WORKDIR}/relocate-sdk.sh ${S}
> +    sudo install -m 755 ${WORKDIR}/gcc-sysroot-wrapper.sh ${S}/usr/bin
>      sudo install -m 755 ${WORKDIR}/configscript.sh ${S}
>      sudo chroot ${S} /configscript.sh  ${DISTRO_ARCH}
>  }
> 

Ping³ on the whole series. I carrying too many patches downstream for
too long.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux