From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6806948680239677440 X-Received: by 2002:a2e:88d9:: with SMTP id a25mr2049291ljk.267.1585394700096; Sat, 28 Mar 2020 04:25:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1103:: with SMTP id l3ls2145003lfg.6.gmail; Sat, 28 Mar 2020 04:24:59 -0700 (PDT) X-Google-Smtp-Source: APiQypJu3a7rgvFnOkjV4vxKB6GG/4j16/Q1kPupoMoFGUYkJ66jY7bdOqm9hwU8de+Eiqe+6MhK X-Received: by 2002:a05:6512:66:: with SMTP id i6mr2484020lfo.48.1585394699120; Sat, 28 Mar 2020 04:24:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585394699; cv=none; d=google.com; s=arc-20160816; b=f+VNnOBUsJ+GVXY+GSRDzveEPeGXJwcUeEl9xyoPILMoO1GmtHwKXdK3rhVcdRj4Xr ureeVjxdfMciw8w95D0OXqWjYLp5lwQ3Wb+zfQV/1L3bAPpc/v6g2PU+UAkFmFHDSHya CiZTTJOYAONIGpppkHeX9cAyBcSQaBdtW/9u9KBXunGrV2uTTRBvXxKcAlqmPkOF+8/u E4LT6erfQiEOxYeUWjqjbqPO0e5O8tHc897LO5zqZCjYv7EZH5BA7UytozrupZ7P7uGJ srMdGAZzGX4Wt/KSAATS24d3f2xfYX5x+Z6TFvRHzBC4i6uGrGLBQKn6dN+fe1xWjqV9 1J1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from; bh=YalwhS4eC5fTl7SJE1HtOIrt2gAGF+NZH9IhtF7alBA=; b=rYxTuyq+l3sBFLd6pGJRGjGBTDBJVdSvVE6YU+8nPcMbgxlWxJowC6b4dBkrtDbN5k NNCI9WKhErdQ8flv5EnJK2EECuZQw585SeiM95i4ghE5YMNZKMxAgZK8CMcsTaila5uF fO1O418i120/Toe6eEMzSrXNfH0DrpUrdIPgrdo5qoVq8mFuJd5mZcv8KB+ZKPFL6Aiz XUySW1H4V1KoykQTmphw7l8FJUsB4Fdt5RAl0fOL2TAVa8xf+eWfrIq99g1Nrt3FH208 cnPOD90MpaqXghGWFWzjA6USNq4E4vBWoWx7USeOcHMv12GPnkOaD31NDRb9604TuyuE iciw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id b26si377475ljk.4.2020.03.28.04.24.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Mar 2020 04:24:59 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 02SBOvV1001028 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Mar 2020 12:24:58 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.129.190]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02SBOlvs027066; Sat, 28 Mar 2020 12:24:56 +0100 From: Jan Kiszka To: isar-users Cc: Chao Zeng , Le Jin , Christopher Larson Subject: [PATCH v2 5/6] sdk: Inject sysroot path when calling relocated toolchain Date: Sat, 28 Mar 2020 12:24:45 +0100 Message-Id: <53614bba184fb544be69eacd7a90efffa8d319a6.1585394686.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: CUHQ35SHEIcL From: Jan Kiszka This removes the need to specify --sysroot=/path/to/sdkroot when calling gcc or ld from the SDK. Signed-off-by: Jan Kiszka --- meta/classes/image-sdk-extension.bbclass | 8 ++++++++ .../sdkchroot/files/gcc-sysroot-wrapper.sh | 16 ++++++++++++++++ meta/recipes-devtools/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..aed8408c 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} } -- 2.16.4