From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6875334414772994048 X-Received: by 2002:adf:aa84:: with SMTP id h4mr6269393wrc.426.1600788540004; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:dd0a:: with SMTP id a10ls4724505wrm.2.gmail; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVv35wA1cHRzwrS2J7vg8zUyr90Ipv9x8DfPnl6M+7ZknmVZollK2NQdjWXc5Zdv4atQJb X-Received: by 2002:a5d:6886:: with SMTP id h6mr6177176wru.374.1600788539089; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788539; cv=none; d=google.com; s=arc-20160816; b=KTP1acj6AbfwzaN4O9wQ9mBIiTxpNXp/pYgiI+OXj00F9wUCbz2v4PbXwEba0wCjLS Ixxy8kgMcOkeZzOYV18wSRKPpc6QZihVt60gH9RgWxJ3zXv8wg8+uy1W9e6p1Ol6lM+C jyd/3YL8oXuqqkGCnAIw/XHygaQU0TLtGLLeunSM2odbnzggSAkT0N4Uqzs5+pJDAt1e w1soY0UVrIT6puBdjd1/5DHmnnT66KhZ512GiWnORTgSfqBlqSbarBXJyGmE24dHsI9W XWggWa6Xee53u4DAsHRWOwLWUBjba2FuQ70rqYFlUzwc79MTVtMkzFw6BRhSmfTuFK3a TLvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=yZ47VETkl3kf52cYqORZWEr8EDNknsK+uC8wZrPsAC0=; b=YYoAm5P45dQiDQxkwuDTd+/QbTXB8PFf/xgwlpgY13b6xBD1LEjBUK5RbDvj8oRmUd /16G1reFqWRYZQwV6I9rIA8r69cpALEfPI6Bby6z+gHsuSKQOuQIvdG7FV4EsWG0r0fD 1eN8S9v88K1sttArxPCpEyoBqwk4fHiLRUoQI9fzAZD1nKgsLq0338DWqp7Ba+ji/WpN wSDbDn1btL2Pzmp8SjVe2HNKh6DxDZzmRQ9FkW7JVpbs3LeXASzQNFfIPw7xVjR2mbjD H84QKzufRbs/eWKPfs0bHv8cqEFtO8snXsAmFVAjrgZH6k7/EpIOwpkWDUdS11G8jUQb UUzg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id z17si361678wrm.2.2020.09.22.08.28.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:59 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 08MFSwNw016765 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Sep 2020 17:28:58 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.130.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 08MFSsVD031723 for ; Tue, 22 Sep 2020 17:28:58 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 10/16] sdk: Inject sysroot path when calling relocated toolchain Date: Tue, 22 Sep 2020 17:28:48 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: xVVC6nqGCHZI 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 ++++++++++++++++ .../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 07a53410..59d16cd0 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -37,6 +37,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 e5d44e73..82b430b3 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" @@ -62,6 +63,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.26.2