From patchwork Tue Sep 22 07:28:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 77 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4470920ooj; Tue, 22 Sep 2020 08:29:00 -0700 (PDT) X-Received: by 2002:a5d:4b86:: with SMTP id b6mr4308580wrt.173.1600788539956; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1600788539; cv=pass; d=google.com; s=arc-20160816; b=AJEmqSCFUAddhozwh7De8X9SyBll59zbVV60e2fVC9br1iOvIuP/cKNBshEzrV+fZQ aeigl/98ORYxOi/qS0jor5TZM2QCQYM9qr6DCy4KlJxG0Cc59yskn0J7TE4Y4O/gLP3J O+C0AR3raugVig+xA1jEmGCB0D6rv/+WSiAVfBwNBdTj5JQA8CzgpBOkjrZoY1Y0lrJa 0SmOAt5fiJ68VBHaDIiVwlMSqI+YpiQuWiwntN8G640BTx13FV2gzoVnJ/2PwXM3LZt6 FfqK/yegIdld02NLTTYdPBCLeSGhqsZiEv+7yBi86ComRjy7zMZGAns1qJGneusbfT/6 /o/g== 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=JujcXGpbdUrCRbIc9cxd9nHvuqiQo4AgPDT9cww+RpU=; b=Rmyy3+W24n1/ZubpFBH4XGTG2FNiE7mcMkz4cHIwaSgkT3xj5W49jOUFG5y/+/Hado DguERQOBjoTTlrbceEfuoTcU1htgkDP/AuGhV9llxRvaQlpk4GNXwVy6SK/V1/I/2Joa mFF4yPtZVnI0LcdPLgiamS9BePlMe83aqyjlqoVvS6dkMovlxus7dSwGQLJTOb3i0B8m vJvdh1GFzAF5gitutQ4DO5nU2AlszvJFf7cU65bS16BjU4trLzFL0QCNydgXRIDGamL0 8A+HW3s7K67ViLNvlUfdA7d8zoDqYySSYQTjwJtXtKgedC7VG7BS6O40ktjAEIZQSo4u s5nw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=fxZEdfHI; 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 w128sor1950867wmb.28.2020.09.22.08.28.59 (Google Transport Security); Tue, 22 Sep 2020 08:28:59 -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=fxZEdfHI; 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=1600788539; cv=pass; d=google.com; s=arc-20160816; b=qClNyra9jAGSV4XOAWOHbrICg6SlDQ+H03dJs9QIkBRLg80AjNTGWKrQoq6az4aOrf Iif4e93joj7KWY7BIjVy7pLd7KGvlOIRpaadpF3VyMFDBJytFh0gLk62FA1uTPgcmQwR dDr2XHMP/00SSackLEnsNoWR4Q5Qp/AHpDVapM9aLavbkxJDIRe1MX0jWEM8Qe246apk Q/DzwBiunix7TkzYgPPskB4utYb9nRrA9izm6WAnCkzQb2gTQ/i7lZ8amH0HmsKUwFJl IhGUzLTrjWPwKynm9gsQq9qT2zPPTbvsO2XOoX0BuX4nJdA5+QCILztZEXnT0e6JKGWY /z6A== 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=JujcXGpbdUrCRbIc9cxd9nHvuqiQo4AgPDT9cww+RpU=; b=J/1jRBvMQJYYK4vDe5rNHk+yEfqUK6OdCFMYkV0c7DfBpzjwQCjpdWV3TZlO02Bcjg Npcr6SNjr2aEqyx0iDkxXaiGoHrejb3snn90koAOL848y25a/o5ufGH/fRZHL5b/kojW lVgRfIG5BngAJ+0we43kNAUI3WF+MO6aPVQ+HIta/vdC/tgf7HVkFDU/kE4IsU+TgXho IBChA57yypq4FC/hn6FewXz8QlxoSq0m8zR/iA++2BMrTW4Tkp6Ro9ruTCXVG8H/Jmjf tA5QaKuUkzWdjb9iAF/QjHZzhE33oRrtWHwqjcLLos7K/JbdGvb3/5T8aFFt6GDtgd08 4nJQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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=JujcXGpbdUrCRbIc9cxd9nHvuqiQo4AgPDT9cww+RpU=; b=fxZEdfHIANbvHXR6yjsrLxPw9nqjGgwqZ7OZSbcVBQaVC1hSms/hnp7w+dAxvOgwri wSeoRQJWCD7/rS5t9ffIOj7FXEumfSVNHy0qrM3fB6WPABERAzlTzVfvX8UXkuY/3r5S 0Ae3ff+/joV4XPevOQclhjQOYsoL0H43+hhPnPRKLlurd1onIGa7VSyp+bbKW6JLz6UC wBVN0/S74ei1KhVDSK86Lzzx2CRzZwW/Wkt+dhBl1SoxmEKN9XDaWTWnlpvpLEwGEG3q v3UUcH69+vhW8FAxQyBnd3Tcx/Svnql3Qgv9gSgpDKGO7+5WNFzjgvhHlDY8VC8pgKYO DIzA== 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=JujcXGpbdUrCRbIc9cxd9nHvuqiQo4AgPDT9cww+RpU=; b=JcmdfBQ248Uc1bEcJT61IzDiptqYHW8DEQtt8HsOV0FRUJNfbLfxCtU6V0LJhKMl7O QwjxYbmR5dtS8YnwVKbE/srJDemJ/IMvr+pkU4c3QH9d0BRqQToPVFBu1oL/9vNw7NNY UoAfMHCwrRyfUg+U0gLp88T652HGAmxHkf9q++AMx6jwU2qU2ohUagv6TcPQx6a69dmf PixgCmabDqXp+cYDczNFOsQqJQn8WZmmJsbCWWAfzRcgYkEeDobp7TQJq8c4iOuThadq YOIiybX2zR8xUZQnX98dy9Mi/7XDurMUws7XWnWznqks7qRNr4VKmVHmV70+wcSUHuXn cfXg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5333joung9EF44B7YLDBADzH1OLiHKDmWkcTgL+wpq/jdrzHrU7R ZM1Shh5VRd9sD7JP30UcpIU= X-Google-Smtp-Source: ABdhPJwATFZdFTJDkTR37tArluiRfpwflwLknwzvc/Kw270wDxBIq6X0C8KZ/du9UpKu4/WjjUSBNg== X-Received: by 2002:a1c:770c:: with SMTP id t12mr1686150wmi.121.1600788539656; Tue, 22 Sep 2020 08:28:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:c2c1:: with SMTP id s184ls1745195wmf.2.canary-gmail; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) X-Received: by 2002:a1c:ed09:: with SMTP id l9mr1607591wmh.89.1600788538650; Tue, 22 Sep 2020 08:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600788538; cv=none; d=google.com; s=arc-20160816; b=UhlpXXQQFb8yAkv9DZ8f4vZFFMTNQhWHKlJtscfkUKh7os4U9FynFIQqcGKU8fJ10G OCPL9mWyN8pRIFzMEeObxRcesKpnw0fXPFR+5Y07ci/cW2FZLDUacPAJC/3sRGj7AsWT iC9raPsas9IZem2EtBTWeDGuQqpucYC9XfXXTZNorNRMlJk3zIqu3E4qzm4D5SO0IC2O C80ZV6PlX1rjpzVlq4zU1YXAmBmT/aFkna5pquQLEVaA9Cy2SKBe+xcRL8ggdev8FgZK XC88s8gNEVsGG7ArodmqFSX03ejjAeBC4oSj4M5e/A5q4mz6jXjD4eDoESFE1GHbYK7F fo/Q== 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=q58MMxBk01Ow2bFJpau7WzmX6HvMorLpcQ8SGnd8i7s=; b=iMuDNlKwaT+bGN23UnKmtV7yMTQeUZt71erXRdsvt14XKXZYg75uB90Q1X10Dyjrft 4TtgAEW2oUJUzyWfZXVo4XvpmbqT9ycnA0RU0XZKGp3cbUh5I4KVBrb3i/+pvvie9njw BznLznG5lhRZ4YlPpMJ1L2ghc/qR0UracfAfWEQO3ts9Q/YPVkl+9gnncDcQAn1QqnB5 U5cipJPx2Anz0AD9B41ZU0rYhSi3smwwHUVks60YgusKVyc9MSZmHJfNY8wQR4BVi8VG 13C1ji9oOEeo5OdWpHb/yRZOgajYo2Wwr4UIG4g7AkkJ7ClrKmX/kLo8tGlAjD4HiAKd bEbg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id h2si113690wml.4.2020.09.22.08.28.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Sep 2020 08:28:58 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 08MFSvPQ002235 (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 08MFSsVB031723 for ; Tue, 22 Sep 2020 17:28:57 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v3 08/16] sdk: Add script to relocate SDK Date: Tue, 22 Sep 2020 17:28:46 +0200 Message-Id: <2d6a8a8d664a0c2023da1d7a8520496e0418a173.1600788534.git.jan.kiszka@siemens.com> 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 192.35.17.28 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?1678548444145941321?= X-GMAIL-MSGID: =?utf-8?q?1678548444145941321?= From: Jan Kiszka When run inside the unpacked SDK, this script tunes interp and rpath entry in relevant binaries so that the cross conpilation tool can be called outside of the chroot, irrespective of the host distribution. Then only "--sysroot /path/to/sdkroot" needs to be passed to the compiler. The script also supports restoring the original chroot-mode when invoked with the --restore-chroot option. Signed-off-by: Jan Kiszka --- .../sdkchroot/files/relocate-sdk.sh | 41 +++++++++++++++++++ meta/recipes-devtools/sdkchroot/sdkchroot.bb | 2 + 2 files changed, 43 insertions(+) create mode 100755 meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh diff --git a/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh b/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh new file mode 100755 index 00000000..1c9b02fa --- /dev/null +++ b/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +sdkroot=$(realpath $(dirname $0)) +arch=$(uname -m) + +new_sdkroot=$sdkroot + +case "$1" in +--help|-h) + echo "Usage: $0 [--restore-chroot|-r]" + exit 0 + ;; +--restore-chroot|-r) + new_sdkroot=/ + ;; +esac + +if [ -z $(which patchelf 2>/dev/null) ]; then + echo "Please install 'patchelf' package first." + exit 1 +fi + +echo -n "Adjusting path of SDK to '${new_sdkroot}'... " + +for binary in $(find ${sdkroot}/usr/bin ${sdkroot}/usr/sbin ${sdkroot}/usr/lib/gcc* -executable -type f); do + interpreter=$(patchelf --print-interpreter ${binary} 2>/dev/null) + oldpath=${interpreter%/lib*/ld-linux*} + interpreter=${interpreter#${oldpath}} + if [ -n "${interpreter}" ]; then + patchelf --set-interpreter ${new_sdkroot}${interpreter} \ + --set-rpath ${new_sdkroot}/usr/lib:${new_sdkroot}/usr/lib/${arch}-linux-gnu \ + $binary 2>/dev/null + fi +done + +echo "done" diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb index ab0a66dc..2bc9d291 100644 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ b/meta/recipes-devtools/sdkchroot/sdkchroot.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260 SRC_URI = " \ file://configscript.sh \ + file://relocate-sdk.sh \ file://README.sdk" PV = "0.1" @@ -58,6 +59,7 @@ ROOTFS_POSTPROCESS_COMMAND =+ "sdkchroot_install_files" 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}/configscript.sh ${S} sudo chroot ${S} /configscript.sh ${DISTRO_ARCH} }