From patchwork Wed Oct 7 05:01:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 127 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp442096ooj; Wed, 7 Oct 2020 07:01:50 -0700 (PDT) X-Received: by 2002:ac2:4e92:: with SMTP id o18mr1092544lfr.527.1602079306666; Wed, 07 Oct 2020 07:01:46 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1602079306; cv=pass; d=google.com; s=arc-20160816; b=c8rk0q1PVVsTculTWMuXVvio4VREO3e/UMXmZsNV3yGk7/mhSn34Q0Lri9KZGmLx/Y 5tS1OuNnFcO8VQik2TI+UWx4ORMsHDnBivnowXETgy/Qlx0NG+09BHypDHLuO2GcghFr leqSTOnVijgj71elmvxu9BUIaQ6x4Xnruxp83K7hq07KI23Ol80INhmcJ3pLQNmzDEvF njYa1ssZvCVB3k0HPMMDX4GlxP5SQqs7ojvTdk/gLgsDT3yAy65hWciUYuopCrmQjGVA jzHEAIfTzTHZgJE3N5UNfdbryryKR69mWPt2zef30wdqQv1IjRWwHMoF/YhAFmbsgFNF 93kA== 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=DoIjIaV7TKzxsUP51nv2kllDN072qoyQB1WDeRcVRMA=; b=Qsmf7cdigOV6fwiqfsBE6ycYS2XfuJjlnyNo0HB+Ex7TjbRdONwRD0rKVv4vkCMjMK cqxcOeo1W5smDUQzVaPEnqJ92iGAo4OTdk9U3F0dtpex9ovyuqddXAHHmzXv/7U2Jr91 eWgeyb3e5TgmWnowqylVuUg4TeIsZyEOTauzWy+4HDjFCD1TnBJ3I/pTKKPRD7ZCVS+K 3jgKPaLUeZb4dAab1MfHrw48m9/hZOfrLaazT+YuOJODKRXkIkE5Kd4qZsQ3PPXzYhxX u7q/wrVJedYOX9z76Cq/hXggSP2/efkkR7nxX2r5FuZXSH7pS55AeXTjaJO3Zdgrdokt kP5Q== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=BZSB5drI; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbsmu675qkgqe7fp64cy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBSMU675QKGQE7FP64CY@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 h1sor1009842ljl.38.2020.10.07.07.01.46 (Google Transport Security); Wed, 07 Oct 2020 07:01:46 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbsmu675qkgqe7fp64cy@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=BZSB5drI; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbsmu675qkgqe7fp64cy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBSMU675QKGQE7FP64CY@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1602079306; cv=pass; d=google.com; s=arc-20160816; b=bjI8LEOGqH1umifSADrnGk3f7SEm+MWUswtvRPgQ/12wWYD4Dai+oRZcEUV/EPtbBG QvgAz43xa8ESg6yLLxfB+vRK3SYWKiH+ddJFcbT5AfC3vymoO61gIjFpjjsvfMvBXYrB ErfT0fauxaX8imWEUTRAybFDlk76uw8ay+/ArZ3fkWVjfRkHJZtnpqx7Trwp1QtikCib uYGMXDOv7lpdKnsRI3EvmA22gKVA4J3YaEDsSr9as8axd4NgJquAbmXPGfg3glRxlPln hN24szgwN4gQVBDKx3Zu0aED8axgqhPR6vRGWfqWI5HxsK68siQSr8Og3Yp541TpZexx /qlg== 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=DoIjIaV7TKzxsUP51nv2kllDN072qoyQB1WDeRcVRMA=; b=HFjeJDYmky5+wrQjjLiHrBI99y3TFHyup8MeqJ/1NOfchd6FhZhXMIP5Vd4v1tpozt LDvo4rbc9iHncaEv7oIyhYoJDNSMG375g5qCnq/7yqVvNjQENnQyDLUfNBlUZ/pkNer0 bu9XE1g2dQIWipgXCrxg/jWleuxuo6JB16DvL5Ik+YAp/ykxvkjC6Of0MgieUgQZ/WV7 qzn637uU9fetwmKjcrc3FwIIFHumHZWlebqIwhDh9g2QNBvaOmzPYfN0GBafGrY57r8u mxmnroDNDkq1OiDkvQtK+xyyNixEf9kBzpzDjalMIvu1C94NJEbeuWP8IHK9KZI0LC2H 8teA== 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=DoIjIaV7TKzxsUP51nv2kllDN072qoyQB1WDeRcVRMA=; b=BZSB5drITt7jMaSG6ES6+ZVP1PufitrK9Iu0f1Mkh+Eu6+06gN2SWfOYY8lmm+RnrQ /1o9/kp/q19krXWbNeg579WiV77w/JkMysX7vD/G3VlJmBaOcNTKcrs9jAPljXpKQuGa af5enrlBpwMFLiNEzgFuR5RLX+pZsdHlLzfodsvdf9NWyL199e1mRUhujhjglwxN4hRA LXm3nLTwI8Plm1jlyYGOj/F+XAHVDClSo2LXKGsFZ7sF1Mf9fQpT1WRqYpIMJWz47REv y0XSWg5b+pWDQiTuhsGIIopA04zA5VXPW/Br5/Wrsz0q3x2/75vQbw2My8itHaLmIG2O /CTg== 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=DoIjIaV7TKzxsUP51nv2kllDN072qoyQB1WDeRcVRMA=; b=GBvi0/pax9ujHf3OPeVIFlGhMUkHRLm1bG+fbRWbEHjNUydV+rlnWWVrnxd5Fl794Q lcXNLkAzxujpNAxeB0byYJ/6CUs2t0ESQchdJwXxGNY6HFvzDDiqEatk2sVF4mD2aJEB IrANpAQkvW1bFQkZgemq9O6Zw4oO4gTrXCc0mdFA0hZ9dXEUo10yOxS2TxajMjgPMeeX 1peVNLVo8lOOmjxRH43xPJHtspek8OSC7MHTk3iy/LGUtLuT11L0Qjy3F+9JR6nn29SH aj5pJNTykjLiaSpBItlcO6pWd7/31r+e5yhg/RN4twcnMcCQUq3kEWDmb0CNrTu7OGUM Cc+g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531S9i79MNAocKuKLqNfm/fCWaBp3Y0UjsKzRJ1XnFCfJ4ozYu6g 6P+tQWqpHcL5k3GvcU8aNdM= X-Google-Smtp-Source: ABdhPJzscULGOjs8Tommrp3/cCSV9al/SYD5LAUf4LHVERFKYoSfJnt2ULKVjY6/wGfDwesky9MIjA== X-Received: by 2002:a2e:3c08:: with SMTP id j8mr1179160lja.358.1602079305886; Wed, 07 Oct 2020 07:01:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a556:: with SMTP id e22ls366220ljn.9.gmail; Wed, 07 Oct 2020 07:01:44 -0700 (PDT) X-Received: by 2002:a2e:b711:: with SMTP id j17mr1331582ljo.20.1602079293019; Wed, 07 Oct 2020 07:01:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602079293; cv=none; d=google.com; s=arc-20160816; b=KrhqwqMvHjLpzcmPRYpsrxTjATSYaY76UCjxGOAVI4itmh1iPTV+UppN7Yd4ckFDfs U7J9ZBTnEQxg5hbjlFlQda0OQtf0ufJB2JblplpZ13MCb3WvDQWI7RiV/URikHwEkFuS y28h8ntk6a+WVrua/l9CC8NdInjJfoPQElw+naoENE1FY6XeC64yNOWfT+HS0Hj8MN9u ac3/jmEH78UPTVkZImm3moZ8NJUo9iysVb10zjloQS3FPDT6lUgNWq/8F/A/5lej5uQk ifsLZr9G6yHZsPV6GB20HPwbukdUBYYDYovnPHoR7g+oy8wkRhzMqYiYRuEh6xZbw+QS dh/g== 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=oqSUBvzoWu1iv2L2wwZ1x/ztcE4H57P7DkFv/I2BY1o=; b=CX5Ua3P0Voc7bcTTb/7r0XEsxkOmbT7P5yktTWBEYPDxh5EB7SRiQ9Sifx/n02Zauo hReJ4anHScVLgv8cldBvfL0L9VVu3SU+UgFZ5IXdOHZr0mptFfI04oHWtGXklsc9ywnq v0GK1r0WS08ricMS6MxhkMQtnNbAcqNsM9h++Hv0q3dHlyshikhGJqxwLJKK61TIoWLB 0iTPQU1YnXO/xvR3BuabDTzijyz9wIV8OIAuv7q/jow2jkmyLtH+6qJ3+msTE2aUS3d0 epPdWyjvWHhd0Na6txIAMpG2eQO1siHJJewsGurOGDyrx6ho3XTrXy31q1hSjvuQLN71 I7Vw== 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 o142si51684lff.6.2020.10.07.07.01.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2020 07:01:32 -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 097E1We6023096 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 7 Oct 2020 16:01:32 +0200 Received: from md1f2u6c.ad001.siemens.net ([139.22.113.50]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 097E1Uk6019880 for ; Wed, 7 Oct 2020 16:01:31 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v4 03/13] sdk: Add script to relocate SDK Date: Wed, 7 Oct 2020 16:01:20 +0200 Message-Id: <5926e0b8f0d2a70c6dd01d3ad217a92468950a7b.1602079290.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 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?1679901910874870082?= X-GMAIL-MSGID: =?utf-8?q?1679901910874870082?= 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 05320a03..5fba09c3 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" @@ -59,6 +60,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} }