From patchwork Tue Sep 22 07:28:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 69 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470928ooj; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:adf:a49d:: with SMTP id g29mr6422479wrb.219.1600788540252; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=LhCWOrtJK22jA4zdDw0DkBDur533FC/0YpcT6zMzHnvlkchv478SYouMXHWU37pHE+ N7WchYK3NFFo5+WsPIKQH0eMMmNXvtkuwlktjFyBPkAiOL3cWqDg+ixp9GzLUWbkDzcl LAshnSJusbtNMt4jvsyhJG8LBrX4+AYCrbvj4KicjbuxMpEjdrvf2OyWr1lfW9+Za7nM xGVqwvt77fFDrViqDz9Aag9xJUZvC29R/XRlQespLb+wT7uMAEsYFGcDPcszaLozIQEq V0lSTj6JT4xDhWpA7oX6GHZmZ06rhx42w+Zrpl63naQMHLvzQT8ph+aCgpLoQ0KqG0Me xlIQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=QlQZ1lPsdjY69t1h8ttMnVWmx6tgzCxSBVA3lpf4Ths=; b=DRif6KDnJpxWx+2HenLAysTUcMPOt+Ycg0zulY4zrjPm6yc/tdVW7Q7UQeZB15Vzb7 WdZig5mUT/ovil5RQ2mNMdqOS5H0+cfBVvzd+76W1OKcJD0jrQYLlP3HXMgxDhkyw9RS m5uBz0XTa/BtayVTe02W1rdl/V6HweVnzBwDgk+XIW9iFPs3tyYewLmo8h3PVNl3tq57 0NnDagLkHJ+nmWqgqXACY/NuMWxw5ZIo7tSXoWP/WUhZLes+Ft4js5QfOqoXmwBXkp+N RIbnZ1KJi+O60JkucggOtAyI7JqI8SbQKuiHZ3+P/nxI2uA2LYkBDPWz15sY0l4DT9G6 1jBg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=s0PouOlN; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id x133sor2041521wmx.0.2020.09.22.08.29.00 (Google Transport Security); Tue, 22 Sep 2020 08:29:00 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=s0PouOlN; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbo5qvd5qkgqei2sabpi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBO5QVD5QKGQEI2SABPI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1600788540; cv=pass; d=google.com; s=arc-20160816; b=uoNLwuQOKuCEdoR/HIyZ6fxsI1SRCg5ZpikZ4eaKMvG64rwSzJv1HfiIQIm8MUwS/8 sRM72vtDv1BSMmCOtp0HLEqG4l5kZZiCZG9pQyMVw37Wq8o/yfHlITm6oOzjjOWNgOBV Shziji6dAaHRU2dO3lEPjDMhIPPuaCZVcMDzKrWTJ/9nH9cGHMtaVNRfCxNmBiSvV8bD rpIfwaF402fqBBtG3Bf8vAcrr6SmZPshZcP8SkOrcgqyvvnZ7lNOKz4ovRYxJ0l5ovPa LnTp08poA91KBZAyhYkPTKRLJ8yGFAk5o++QnD5UwWb8hCzkpND0hrp89hjC4eevRcDC 9I1g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:dkim-signature; bh=QlQZ1lPsdjY69t1h8ttMnVWmx6tgzCxSBVA3lpf4Ths=; b=Xk6mRIluZr8wp4DV8ScT7lqHQ/k5mwl6VawsjR0tWHi6eOXUzkkhN7IxB/U8WXyU9J TtFJKTDGt58cQdse+vNfvOOWNcmNh0sXzIqF0eZQjAyJorncQoIDLjMlkJgWRSvNxB+1 +3u+YAvkOdttuYXuFLOnVNc9sMYdBip2jVl9tsVgiON3oSCAFnlT4wM30Xk+7spdt6pg jEYcYVupdvz9gg0JLL1JPDXApcPo1h7HOLwPOLTDSU8XhLPEXjxvm8+pxv4Ms1eATUnK gNkL7hEiilE84Pp224nyGWr53oD7QpaORQ6hSbZr96/Seh6QCcjyC72K8GI1JyqHjK76 7M7g== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=QlQZ1lPsdjY69t1h8ttMnVWmx6tgzCxSBVA3lpf4Ths=; b=s0PouOlNAx66VV2PZ/fo0rIDHSy1kYHfhirSOPMKvXXHTlfIdxpBlJnctsVL1app2u wEJgdVgn9Zm/QQMp2sKrfYwgVuYZwvpGQdrd7qkJ990W0OabviJbxwGKJUy/p67cTJLj y5jr0kTZg9UjucWe2Ue4ADsERpwE1clvtHY/+QYV8NwhhQ2kqxTh5oaZUlL934YP808P 2szYeNd7YOfde3kgTOlc53xXs5baSJzO0xB2NzhrzOiA1jpUinD34LkQHiQNxo8wtCRl U9kt6yxRZn+LtH7mRyTAtEK+QFFF2hpGwvXOMlpAUeg0P1q5MnNwgU1JGFIiDQ1JXVwF CUeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=QlQZ1lPsdjY69t1h8ttMnVWmx6tgzCxSBVA3lpf4Ths=; b=YoPG//Szv/P1mSFBpqNit5+qeWKf0lkxrzdJIsTURVCX5oB4uN5+mCAdrs3zVjZk4a 0F+DwmIz681ttPUapXza4Vo6e+vijSSxE1oPVz/wuDDBPXrg5z1VEydZcq/y92cC1u6r 4ixWwdT+nOVKbo5vtW74yAD2UgYe6UyZ4oCD8uXfbAkjErlMNsi5uSm4/sSEgnJ1yUqM jAAQHgATeSOrTGbNwlyRv2Bm8UuuLCXTvvj+eab/E3ucqQswhiCxKdfpUsDWaJoAa8dC 6MdAfZzKUv2Ng8PBN5lnKnrP1z/XtZH4KamePlKgHZLdRxvL3rdiX4nFUQpkKehTkKsG lHxA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530QNkaVhtZ7Ou0z8aAl4lU+SkIDi8+B/JIpNbTQnQEMdWTOC02y 1BvN6eb1zVg5ClUqYsxKfyk= X-Google-Smtp-Source: ABdhPJy0rhu/ngtJN1Eqx+7USa4VKU11dMcZYJ03C+kI2CjOjkg0FFhWX04vucxVLzyur4llzWVdYA== X-Received: by 2002:a7b:cb82:: with SMTP id m2mr1755261wmi.56.1600788539890; Tue, 22 Sep 2020 08:28:59 -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-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 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; 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 X-Original-Sender: jan.kiszka@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1678548444305677214?= X-GMAIL-MSGID: =?utf-8?q?1678548444305677214?= 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} }