From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6806948680239677440 X-Received: by 2002:adf:dd8f:: with SMTP id x15mr23422291wrl.201.1584866244249; Sun, 22 Mar 2020 01:37:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:6402:: with SMTP id y2ls935660wmb.1.canary-gmail; Sun, 22 Mar 2020 01:37:23 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv1aJrL2G22e5EoqCJL71oW3F4ZAYXE/Bl1jyj7QQA8Ko4e1fTcEjV9/G5NxjyC+D8nPrb3 X-Received: by 2002:a1c:44b:: with SMTP id 72mr21017022wme.116.1584866243488; Sun, 22 Mar 2020 01:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584866243; cv=none; d=google.com; s=arc-20160816; b=elkvngiek2APykffOy038Mv1wFBx18dLn9rpFdruH8mWvOY6b5aOklZ7b5AYnOufQr oC4UFK+YOUYdIB+WbgKN7PSHntqOvZt1VQdMS01FonH2/vzTJ7U+8vGS5HGmx0cB6klv X0nRMaRUIKGFLsucf4J/zZ+GpcZmubHiX03GMES7piUMiCo4SBq8H+k/DTSlbqqumQAl Iic0HG0Du+tTOeAkSg43Ry/3XhP8otXl9l2ioqKy2SlVUqIxjqy7ItlTYGKnldVdpWDx xHc2eEEJzplm1ntlbO2QxfCtBdDnlRsKBqyCpNmfxftL98GeWeWrqJ6HnzVb2aqD3GbF 0O2w== 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=H69ZHwdCnDoUs1Rt8wh+fQc5P7B2Z8noa+1DfpgV+5w=; b=m6T+uvGc3fXms2fPqNPSp3bfb4zyDnPM/EtteqW0htezGo6DCeN7ugBO90ce3p9JHS 9A5t9oVrTTOcHpdVsSoUyWr0n2c7zLGc1+fbHUmaxZvczcgjUeDQbewt2bS0ZurP7lCM 7gDu9kxjvU7l2X47G2ax8Xx337bUqiOyxYG4R3z1Z+5rq9ug7m7kB0+W69kmxLRX8Dzp SDXIpEYIvEEAqltU+pAmpoI2IUnHefsBe6DJj9U/uCwSDJZnxaq2P5XilxubKtyjuddw JoEm3xeq91FmBSMlWXcRvhPBaMZ2QO+Q/4dPZHhqoRtZgQSyFXDuOrnPYBG1aGCy9yeT BujQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id d16si527572wrv.4.2020.03.22.01.37.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Mar 2020 01:37:23 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 02M8bNNA028735 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 22 Mar 2020 09:37:23 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.6.154]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02M8bL9Z021520; Sun, 22 Mar 2020 09:37:22 +0100 From: Jan Kiszka To: isar-users Cc: Chao Zeng , Le Jin Subject: [PATCH 5/6] sdk: Inject sysroot path when calling relocated toolchain Date: Sun, 22 Mar 2020 09:37:20 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: mj93pu5hVDBa 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 ++++++++ meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh | 3 +++ meta/recipes-devtools/sdkchroot/sdkchroot.bb | 2 ++ 3 files changed, 13 insertions(+) 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/relocate-sdk.sh b/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh index 98827139..6be8d82f 100755 --- a/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh +++ b/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh @@ -26,4 +26,7 @@ for binary in $(find ${sdkroot}/usr/bin ${sdkroot}/usr/sbin ${sdkroot}/usr/lib/g fi done +sed -i 's|^GCC_SYSROOT=.*|GCC_SYSROOT="'"${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