From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a05:600c:a09:b0:3b5:2f6b:c7c5 with SMTP id z9-20020a05600c0a0900b003b52f6bc7c5mr1899278wmp.141.1664272301992; Tue, 27 Sep 2022 02:51:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d228:0:b0:228:ddd7:f40e with SMTP id k8-20020adfd228000000b00228ddd7f40els1922425wrh.3.-pod-prod-gmail; Tue, 27 Sep 2022 02:51:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6+QJSg9BkU/i482wiBIh4hzrsIxBLbi13YH1SSNw4AUWRUMNH3UuoeIe87nbfHNVr9UKgQ X-Received: by 2002:a5d:574a:0:b0:228:b90c:e5ee with SMTP id q10-20020a5d574a000000b00228b90ce5eemr16201209wrw.328.1664272300631; Tue, 27 Sep 2022 02:51:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664272300; cv=none; d=google.com; s=arc-20160816; b=sbZ0oTNmMpjBfsxUeDtSEGKSS6iA5aNebi/R+UNu9WeHin9J6F3yxysvu06T0O67w9 sXb+NorSIZxNDijKAJ7eGFAl8DHbeFCeNl9OcDvofwNR1B3Y0NyqHEmO+Ke4y513D054 Dm/YVd01lG/pUcjDi6kk92LBwKtz17Mx8dhjuWJ3WVNjgxvfvRhW9MaMsjGRlNshlNS/ /gPJxNgDv7xbBzyn2jWkleC51WYfL8IhsbRWPbG/QW2HvUxmpD3DI2scOVPYsfBzcywt XBkYSlQVZ9wT2jZsivSWptytJ/asTkZMJKIE+c0a2nHJv5q6Ox3OgONex/x/kfNh4JLn 0MPA== 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=sPPhBEiOXx54K/rkcjTuG5eH/IyIqQ+NOKfXqPVR2qbc0dYMQvOofKgKXYzuqruGw4 5SJhftP4LQq21t8aM46OoaTx4uM869dAxzGAxTjdfG7lpv+kMtRSQKDPagM7HP8jECI2 vCYcWNaSRWvgehuYAwy+duYvqDefkS7fEE82t35JBXqtOSZJx1aJHUud6hieCDj2f0NE TLOGGWMZ9XGui1UysyNdioe94TrNHYlxjwRmLLr5e4d926wfYf4NHlhmxwwvelJglLIQ wBVVNHTfaqSm4t1IoEPAvGlMAp51BoFVXYtjYTeQGnt296LboN2NGM2CilmLKK82CNLi Y+kA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=YmBqlOp7; spf=pass (google.com: domain of fm-72506-202209270951402d5409a742ed00685c-fl4kdq@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202209270951402d5409a742ed00685c-Fl4KDQ@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id az14-20020a05600c600e00b003b499f88f7esi475952wmb.1.2022.09.27.02.51.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Sep 2022 02:51:40 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202209270951402d5409a742ed00685c-fl4kdq@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=YmBqlOp7; spf=pass (google.com: domain of fm-72506-202209270951402d5409a742ed00685c-fl4kdq@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-202209270951402d5409a742ed00685c-Fl4KDQ@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 202209270951402d5409a742ed00685c for ; Tue, 27 Sep 2022 11:51:40 +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=YmBqlOp7Bk1ilJlJ3zD3J29YZHPld2zbl2ShPm1Oo8TygYiz7FXCGXMIyw4bokzAf7P9Dj Ynu4g4smxISW/DN7Kn1K+dGruzBHZMVD0Oj13OqngBvwKMSa5EugyeFNKL5GUVvtKKO6BGXn 8i6SCALo44vtIuPPak3bvHt2+AAEg=; From: Felix Moessbauer 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 Subject: [PATCH v7 1/6] do not crossbuild SDK for host-arch eq dist-arch Date: Tue, 27 Sep 2022 11:51:12 +0200 Message-Id: <20220927095117.958474-2-felix.moessbauer@siemens.com> In-Reply-To: <20220927095117.958474-1-felix.moessbauer@siemens.com> References: <20220927095117.958474-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: SH1siZTYYJaa 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