From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a7b:cd8f:0:b0:3b4:92e4:c77b with SMTP id y15-20020a7bcd8f000000b003b492e4c77bmr4810203wmj.93.1663745640513; Wed, 21 Sep 2022 00:34:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d20c:0:b0:228:ddd7:f40e with SMTP id j12-20020adfd20c000000b00228ddd7f40els6243060wrh.3.-pod-prod-gmail; Wed, 21 Sep 2022 00:33:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM55Aq8fpkl8YAG8xKhywk22pS3zEZcPDpHH9t9qOk5EW1TTHYwlW4F7mKMS4TdUTYRx8vly X-Received: by 2002:adf:9cd0:0:b0:22a:7cea:d3c3 with SMTP id h16-20020adf9cd0000000b0022a7cead3c3mr17137176wre.196.1663745639168; Wed, 21 Sep 2022 00:33:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663745639; cv=none; d=google.com; s=arc-20160816; b=ErY+GUze+cqu4ep33oriKDb8HA8fcddsCSQMSI4jfAK4jXV6yCH2gzhHh6FnPLJNWS j7aA9cLFDdUKieErUCnQXOK+LsSsCSSQY0cM92d5wMgD0Z9hHaV9kzLVGeh8MLYxSsb+ EUIyQeZK3+hyozdSFetrH0OfTsMXD44ZyV6DmUmgBMR5saGMgtdImDcDDRHxuzDNy/U7 g5IWtk1ZUYNlCQig46FuN2kM5fjqLYHKtsWvB/+JdE7RUCQG+E5qpZK7CxuhoRpAIavQ wM/AdixjsIYY1lfI9P2qBjkNtfaratsPb5PV3nQiSdbV/fvBK3QDnNi6C5XD8y50Y7f+ V02A== 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=QBGUf2VhZGUgwsYmrYHPYv8/1iKg4okUzhpq+exqsUVfU+oLxaZ6q6Eh3bIPGvCiVG DiFx43RQgB/kpfdvUoj1PR3JYy1+jjXs86hxFWxn1qWNC+RFY9try4XuoP4jfI0u2PIp MvkmuGMWrYHzkXSG4pUeTuvXs8toV6FTZYXsYIZouJiJ572feuLjddv8eLsV4k7e5kJI JhT5amlUHQy4eccAFPIL4apx1NrBfxPj9b1YeUP0FnAaF374UffighUheuf4+6Xiu7Xu j4UtbFUoGvb2SIOtOCS/bTbDKRAV7/g5J6sblSUp7no1eve1zArUuAaCB1mCjjlRgcF0 BpvQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=mW5wZkv4; spf=pass (google.com: domain of fm-72506-2022092107335808941acfeafd13fe2c-pwszs5@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-2022092107335808941acfeafd13fe2c-pwSzS5@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 h3-20020a05600c350300b003a49e4e7e14si170661wmq.0.2022.09.21.00.33.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Sep 2022 00:33:59 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-2022092107335808941acfeafd13fe2c-pwszs5@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=mW5wZkv4; spf=pass (google.com: domain of fm-72506-2022092107335808941acfeafd13fe2c-pwszs5@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-72506-2022092107335808941acfeafd13fe2c-pwSzS5@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 2022092107335808941acfeafd13fe2c for ; Wed, 21 Sep 2022 09:33:58 +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=mW5wZkv4Ks7n3v5dpZ06Q4EUeDNxd4HouMPrvqJaCB1GL6H/DM4PNVA20cig45vU1siUEw aEGlm3F8ExY4jVzuuJp58x11t8fh2NCHPg5ap8FQdQnbS+j3Clf0vINrSQIcACPhEIdQ2N5c DF2+VodxEz1NOMCPvOz62v0YLMLZM=; 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 v6 1/6] do not crossbuild SDK for host-arch eq dist-arch Date: Wed, 21 Sep 2022 09:33:43 +0200 Message-Id: <20220921073348.169965-2-felix.moessbauer@siemens.com> In-Reply-To: <20220921073348.169965-1-felix.moessbauer@siemens.com> References: <20220921073348.169965-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: RKdhSi1E6HEC 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