From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7286543990069919744 X-Received: by 2002:a7b:cd85:0:b0:406:5463:3f51 with SMTP id y5-20020a7bcd85000000b0040654633f51mr7653225wmj.25.1696606506233; Fri, 06 Oct 2023 08:35:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3c8f:b0:406:3d91:85e7 with SMTP id bg15-20020a05600c3c8f00b004063d9185e7ls1222252wmb.2.-pod-prod-01-eu; Fri, 06 Oct 2023 08:35:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGcENw2v98EwadMTWPDIWmsAi4KQ/V4JqKA5Zhc9Epg5kP4IXXa6FX+WVUxQFm2WPICz+nO X-Received: by 2002:a1c:7917:0:b0:405:3d27:70e8 with SMTP id l23-20020a1c7917000000b004053d2770e8mr7814367wme.36.1696606504177; Fri, 06 Oct 2023 08:35:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696606504; cv=none; d=google.com; s=arc-20160816; b=Q71vmRnihYJOzCpBCVVQok0SNz2nD4xzCoSkX5llIwRUGDa/3mybd1ICsFpyf1CiLo Sjj49DUS0YpJpbiFyqZdKOIObXCpZesKgs+PYjKS/YGEzNfOs0pMooNICSX/QMNLLGgd QvAwr/ZkHayAZd3do6WKuJuHS8BD7WxGdbtxFdW2++W/jKk3o7Rh7qzsdEKHHBhv+2Qq MloxHzx9qI0miFRWvY1pUX/I9qEvIoG1bKVP0/UEudazsBzEzqbiwl0p7kknKPNm5AQ8 bOjgzeO/P/jMLMZyvqkk6hThWqrHt+cMG4iwvzJIiX/QAU7/rWpAmRYVL4WxPVjw49Nc H54g== 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=LK3hhKaitvrL3tntJJkxrTQCu+ETvT3NqYR5oRs7cC8=; fh=oMwV7fLMNO6+b1+J7DgRaIeS6HOdhYK0IzT7NJ4piPQ=; b=n/Ij6GP0FAiKNjV+OkgoK6Q5UxAy50YeBKrGys/BVpOxNy/7Mg1XfL/pPdfb2eD9Tm LxRfFBVURdEIkMSni80fGtOl86vqNaKaCU9AWGLf108LAhpOMx5iaxDF6nbzxjCnJj9s YDKuGecWcd9SQkiv6uVAe5bpdTQ24lNaRxOHQSDdoA7/1DynRN1mbMSNaI03RwA5XjYV yG+M2rargjtNHiyXrmv5gfW84oIoBpDhV1Cm8GZeb6xeEAQObx0Cb2ROD4ZlKM3Uu8dB AZZNlX8FNb4+ydh1hpwx+sMJc2DSUT0WhcX/fq1NSC8npW+Cd/jGum9CnGxqz7iqJrvy zp2g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DDtwoSKC; spf=pass (google.com: domain of fm-294854-202310061535034131e74f8ffcd34859-jvabeu@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202310061535034131e74f8ffcd34859-jvAbEU@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id ay17-20020a05600c1e1100b00404ca34ab7csi250226wmb.1.2023.10.06.08.35.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Oct 2023 08:35:04 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202310061535034131e74f8ffcd34859-jvabeu@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DDtwoSKC; spf=pass (google.com: domain of fm-294854-202310061535034131e74f8ffcd34859-jvabeu@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-202310061535034131e74f8ffcd34859-jvAbEU@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 202310061535034131e74f8ffcd34859 for ; Fri, 06 Oct 2023 17:35:03 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=LK3hhKaitvrL3tntJJkxrTQCu+ETvT3NqYR5oRs7cC8=; b=DDtwoSKC9/f5YxyR8f+VT9vtaiJyl6i0sSSkZ0+A8zisFtJqjBTqw0Rkt4+r7m15hYZcX+ moj4OZaLWpFmHkD5hbfWX/CGwCzd2MWjJud70sUWAD5dUAS0Un2lncDCXcE8OF2Q4MvsMSQ6 icaxTkliv00Emqmo74UAs3oFtciJg=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt , Felix Moessbauer , Uladzimir Bely , Cedric Hombourger Subject: [PATCH v2 3/9] crossvars: Adjust logic to account for -native package builds in non-cross setups Date: Fri, 6 Oct 2023 17:34:56 +0200 Message-Id: <870fff204d5b52ff161e9b7c9c93514a92dc3404.1696606502.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: j9nq2n1crgr4 From: Jan Kiszka When selecting a -native version of a package while cross-building is disabled for it, we will use the target build env instead. That may work, just slowly, or even fail miserably. Extend the build env selection logic to take PACKAGE_ARCH into account as well. It defaults to DISTRO_ARCH for non-package recipe, thus should works fine for those as well. Reported-by: Cedric Hombourger Signed-off-by: Jan Kiszka --- meta/classes/crossvars.bbclass | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/meta/classes/crossvars.bbclass b/meta/classes/crossvars.bbclass index 22bc4714..87e45417 100644 --- a/meta/classes/crossvars.bbclass +++ b/meta/classes/crossvars.bbclass @@ -16,16 +16,21 @@ python __anonymous() { flavor_suffix = ('-' + flavor) if flavor else '' distro_arch = d.getVar('DISTRO_ARCH') - if mode == "0" or d.getVar('HOST_ARCH') == distro_arch or distro_arch == None: + host_arch = d.getVar('HOST_ARCH') + package_arch = d.getVar('PACKAGE_ARCH') + + if distro_arch != host_arch and \ + (package_arch == host_arch or \ + (package_arch == distro_arch and mode == "1")): + d.setVar('BUILD_ARCH', host_arch) + schroot_dir = d.getVar('SCHROOT_HOST_DIR', False) + sbuild_dep = "sbuild-chroot-host" + flavor_suffix + ":do_build" + sdk_toolchain = "crossbuild-essential-" + distro_arch + else: d.setVar('BUILD_ARCH', distro_arch) schroot_dir = d.getVar('SCHROOT_TARGET_DIR', False) sbuild_dep = "sbuild-chroot-target" + flavor_suffix + ":do_build" sdk_toolchain = "build-essential" - else: - d.setVar('BUILD_ARCH', d.getVar('HOST_ARCH')) - schroot_dir = d.getVar('SCHROOT_HOST_DIR', False) - sbuild_dep = "sbuild-chroot-host" + flavor_suffix + ":do_build" - sdk_toolchain = "crossbuild-essential-" + distro_arch d.setVar('SCHROOT_DIR', schroot_dir + flavor_suffix) d.setVar('SCHROOT_DEP', sbuild_dep) if isar_can_build_compat(d): -- 2.35.3