From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a05:6512:3e12:b0:48a:a64f:7228 with SMTP id i18-20020a0565123e1200b0048aa64f7228mr6549569lfv.159.1663586454528; Mon, 19 Sep 2022 04:20:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:6e14:0:b0:26b:ff81:b7cb with SMTP id j20-20020a2e6e14000000b0026bff81b7cbls602458ljc.6.-pod-prod-gmail; Mon, 19 Sep 2022 04:20:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7qOT5Ue1T39muXR9aRXXgFfnSJN1VGV7b+UTd0QrF/hBoSpYxcZx3If2ns3j45Cd9e5uq1 X-Received: by 2002:a05:651c:222c:b0:26b:dec5:a4f0 with SMTP id y44-20020a05651c222c00b0026bdec5a4f0mr5435035ljq.359.1663586452944; Mon, 19 Sep 2022 04:20:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663586452; cv=none; d=google.com; s=arc-20160816; b=qLNbVlVmK9ucv5m04IDfWeWT8i6pjjiP30G9GtXnYko27bKU7YpHvF8gB3VZiedCt/ JCjlBssGDD3KNbkQWuck341O8H6XdUNLKu9AfX6YevPatXBcUBOdGcgQcjnxdQADYRyb PGfyGG5cT+IVC6DdigLi1R8bE4CCrwQv17wVwYjSXugjn9l46sXo47Q328uRFwAUfP6e zrF/yVNWEpkuf0ymBFeuxt1iDzPtdUZJphiqZZ0zcfkjeYL0Q3xEGILAC9QDIdMdKvNh UlSCiKTqQc1JK2ENXUf0yIQRMhDfG+Z6fiQYYoS150cIWTV623r7jKBfvmzKMaJYWeBi N1aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=PKykkNyLGfGfK8clDt0femXXlq6p4cenNhmu4v/gL0o=; b=oF5XG4U6fUZIEJ06OrrOoqL8pSg2hEizOJ0Dbmgx4Bz706p7L4A9+PbcJgux5MXseO eganRu7Kh6W+YApuWrU8B7J4nV0c2TUI6es9Xg/ixl0CI9cmIKuOtYZzfbblvUR23bCF SNXxd9K73FcaMv/z6De+p7s//SdGEYYURLKTmtsQ0Cay9ky0LCTmpCkiv9cRgeUDBu+e 4XvIrVCzqx7B47b5z733VXLxOnt3IP5YW15+tV6s/XpSteFgNc/z1kk8L2ZAOuHfYQFV yokMqKqTv/NNBQjE0HqqUQ4q5BcO6ZxHyj0l/9CisnSt/algUbabstOGuaKcXpdgNsNB 3w+Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=dS6MVFJy; spf=pass (google.com: domain of fm-72506-202209191120525816f796a53093b6d5-_mz3ji@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-202209191120525816f796a53093b6d5-_mZ3ji@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id d15-20020a056512368f00b0048b38f379d7si770921lfs.0.2022.09.19.04.20.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Sep 2022 04:20:52 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202209191120525816f796a53093b6d5-_mz3ji@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=dS6MVFJy; spf=pass (google.com: domain of fm-72506-202209191120525816f796a53093b6d5-_mz3ji@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-72506-202209191120525816f796a53093b6d5-_mZ3ji@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202209191120525816f796a53093b6d5 for ; Mon, 19 Sep 2022 13:20:52 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=PKykkNyLGfGfK8clDt0femXXlq6p4cenNhmu4v/gL0o=; b=dS6MVFJypKnOn8CUTwZ2SbuEPmRO3IatrZNGFZiKinMEiinHpswk5gHpxQCMurBterWp7P tKAZbV7mGGLknpAWWBuvK7Blz4zukVjSJxuzBw/hTY+ARidAT01tQfDlH9ycQcIQo3GmrrET xPLH+uBCnhtlkvruOl8xrR6vgLcWc=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, ibr@ilbers.de, amikan@ilbers.de, Felix Moessbauer Subject: [PATCH v5 1/5] do not crossbuild SDK for host-arch eq dist-arch Date: Mon, 19 Sep 2022 13:20:31 +0200 Message-Id: <20220919112035.830233-2-felix.moessbauer@siemens.com> In-Reply-To: <20220919112035.830233-1-felix.moessbauer@siemens.com> References: <20220919112035.830233-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: EeAeRE42x/iH 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 --- 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