public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH v3 08/16] sdk: Add script to relocate SDK
Date: Tue, 22 Sep 2020 17:28:46 +0200	[thread overview]
Message-ID: <2d6a8a8d664a0c2023da1d7a8520496e0418a173.1600788534.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1600788534.git.jan.kiszka@siemens.com>

From: Jan Kiszka <jan.kiszka@siemens.com>

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 <jan.kiszka@siemens.com>
---
 .../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}
 }
-- 
2.26.2


  parent reply	other threads:[~2020-09-22 15:28 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-22 15:28 [PATCH v3 00/16] Complete backlog: SDK, compat arch, assorting fixed and cleanups Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 01/16] Split up isar-apt into distro-arch specific instances Jan Kiszka
2020-10-06  8:29   ` Baurzhan Ismagulov
2020-09-22 15:28 ` [PATCH v3 02/16] linux-custom: Clean up minor inconsistencies in rules.tmpl Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 03/16] sshd-regen-keys: Issue sync after regeneration Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 04/16] meta-isar: Drop outdated cross-compilation comment Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 05/16] qemuamd64: Fix OVMF path Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 06/16] sdk: Add support for adding self-defined sdk packages Jan Kiszka
2020-09-29 19:15   ` Baurzhan Ismagulov
2020-09-30 19:19     ` Jan Kiszka
2020-10-06  9:00       ` Baurzhan Ismagulov
2020-10-07  7:30         ` Jan Kiszka
2020-10-07  8:06           ` Baurzhan Ismagulov
2020-10-07 13:36             ` Jan Kiszka
2020-10-15 21:51               ` Baurzhan Ismagulov
2020-10-16  7:15                 ` Jan Kiszka
2020-11-01 15:17                   ` Baurzhan Ismagulov
2020-09-22 15:28 ` [PATCH v3 07/16] sdk: Make all links in the SDK chroot relative Jan Kiszka
2020-09-22 15:28 ` Jan Kiszka [this message]
2020-09-22 15:28 ` [PATCH v3 09/16] sdk: Make shipping the isar-apt repo opt-in Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 10/16] sdk: Inject sysroot path when calling relocated toolchain Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 11/16] sdk: Update README.sdk Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 12/16] Add compat architecture support via multiarch Jan Kiszka
2020-09-24 20:19   ` Baurzhan Ismagulov
2020-09-22 15:28 ` [PATCH v3 13/16] ci: Add compat arch support Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 14/16] doc: Enhance list of supported cross-archs, drop QEMU reference Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 15/16] doc: Describe new compat arch support Jan Kiszka
2020-09-22 15:28 ` [PATCH v3 16/16] isar-bootstrap: Connect to gpg-agent before adding keys Jan Kiszka
2020-09-22 21:03   ` Jan Kiszka
2020-09-23 20:29     ` Baurzhan Ismagulov
2020-09-24  9:10       ` [PATCH v4 " Jan Kiszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2d6a8a8d664a0c2023da1d7a8520496e0418a173.1600788534.git.jan.kiszka@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox