From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: isar-users@googlegroups.com
Cc: henning.schild@siemens.com, jan.kiszka@siemens.com,
ibr@ilbers.de, amikan@ilbers.de, adriaan.schmidt@siemens.com,
Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH v6 1/6] do not crossbuild SDK for host-arch eq dist-arch
Date: Wed, 21 Sep 2022 09:33:43 +0200 [thread overview]
Message-ID: <20220921073348.169965-2-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20220921073348.169965-1-felix.moessbauer@siemens.com>
This patch adds logic to detect when ISAR_CROSS_COMPILE
is set, but host-arch equals dist-arch.
In this case, we do not add the crossbuild-essential package,
but instead add the build-essential one.
To implement this, we transfer the existing logic into a
anonymous python function to make it better readable.
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
meta/classes/sdk.bbclass | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass
index 32ee2de7..f42a2ba1 100644
--- a/meta/classes/sdk.bbclass
+++ b/meta/classes/sdk.bbclass
@@ -41,8 +41,18 @@ SDK_PREINSTALL += " \
devscripts \
equivs"
-TOOLCHAIN = "${@'crossbuild-essential-${DISTRO_ARCH}' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' else 'build-essential'}"
-TOOLCHAIN_append_compat-arch = " crossbuild-essential-${COMPAT_DISTRO_ARCH}"
+# Choose the correct toolchain: cross or native
+python __anonymous() {
+ mode = d.getVar('ISAR_CROSS_COMPILE', True)
+ distro_arch = d.getVar('DISTRO_ARCH')
+ if mode == "0" or d.getVar('HOST_ARCH') == distro_arch:
+ toolchain = "build-essential"
+ else:
+ toolchain = "crossbuild-essential-" + distro_arch
+ if d.getVar('ISAR_ENABLE_COMPAT_ARCH', True) == "1":
+ toolchain += " crossbuild-essential-" + d.getVar('COMPAT_DISTRO_ARCH')
+ d.setVar('TOOLCHAIN', toolchain)
+}
# rootfs/image overrides for the SDK
ROOTFS_ARCH_class-sdk = "${HOST_ARCH}"
--
2.30.2
next prev parent reply other threads:[~2022-09-21 7:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 7:33 [PATCH v6 0/6] use xz and gzip on host (outside chroot) Felix Moessbauer
2022-09-21 7:33 ` Felix Moessbauer [this message]
2022-09-21 7:33 ` [PATCH v6 2/6] run imager in buildchroot-host on cross Felix Moessbauer
2022-09-21 7:33 ` [PATCH v6 3/6] Revert "wic: move out all files ending on "direct*"" Felix Moessbauer
2022-09-21 7:33 ` [PATCH v6 4/6] add option to control deploy of raw wic partitions Felix Moessbauer
2022-09-21 7:33 ` [PATCH v6 5/6] add test for wic partition deploy logic Felix Moessbauer
2022-09-27 7:00 ` Anton Mikanovich
2022-09-21 7:33 ` [PATCH v6 6/6] add wic.xz image to qemuarm64-bookworm Felix Moessbauer
2022-09-21 8:23 ` [PATCH v6 0/6] use xz and gzip on host (outside chroot) Gylstorff Quirin
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=20220921073348.169965-2-felix.moessbauer@siemens.com \
--to=felix.moessbauer@siemens.com \
--cc=adriaan.schmidt@siemens.com \
--cc=amikan@ilbers.de \
--cc=henning.schild@siemens.com \
--cc=ibr@ilbers.de \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.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