From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319440798913658880 X-Received: by 2002:a05:6e02:1ba9:b0:35f:f547:6c64 with SMTP id n9-20020a056e021ba900b0035ff5476c64mr21695802ili.117.1704190112719; Tue, 02 Jan 2024 02:08:32 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a92:6407:0:b0:35d:a38e:6b85 with SMTP id y7-20020a926407000000b0035da38e6b85ls154115ilb.0.-pod-prod-05-us; Tue, 02 Jan 2024 02:08:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IFRCHfSaMMRmuIVEX/tbmLoj2M+Rak9pDwdJnc2lWUksN/9CzXVVnQHTCVPQr+9tm5lMJS1 X-Received: by 2002:a6b:7109:0:b0:7b7:af85:fa16 with SMTP id q9-20020a6b7109000000b007b7af85fa16mr24527824iog.33.1704190111850; Tue, 02 Jan 2024 02:08:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704190111; cv=none; d=google.com; s=arc-20160816; b=T94hytGNeuIwYgfunvkRwsXQPpxJ6kL/tCFogHx3VmeICdWza9dkaDvNBII+Ijub/u oxelubGksRkEsyuRL4eOZruhsSQkkM3hgzB9LYrOiBKnfmKCRmU4uJJ6c6bZJyKa8+pK k3a19WlccN3gaz561yUbiHxW3WWDscqC51xYedbqlCfjZhtwt6sax+rrFqjROnIFi5uA 9bkCu/WXxpjXZ6Fn2cUBhWQwtKM+agFfcguW/WSUkKeKhcB8Tjm7Dm9WMSHAnsZ3BcD4 WajbAQZWj53Ou1woFFjKaPRmrEW1cm8pkBwazMQogi32etMEpn7Mv1G0StUJ0T+B75gu yW3w== 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=8dI8xROqgiUjgCxbylw+zQoBIyEsBIBteJm+ZWm5ed4=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=Nxbwe4of7attJ0GHrfrU1lBQ5P0I+NCl+2Pjs0jI4iAF1sP/2+B8v157MjzTsY+FWS Uy8Biz9qdxtIQaxrZbCZi5hVMCtULYQYsbUKOnpxIIws0MhM5eI51POK7QdT0pvmkL5W SsBTRnnXrWIlj9Sr0TMJJDz7UHF9RvnbcjRWyZC+QQRwPxSxGinK3IHp9JWeBMonBSbp +9X/njmN/YDKsu/isNiNWsyrvxvvVXR028eBjB9lQPltYSeZ3oerLLSHlrPaaMuW/0Rd ILJl2T8x0BfblX4BTz0XKT0YzWeU9+fm/PB9R7EUdN74JeiX+bXcnhG194IC9cAKuxjB xKhQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gV8kEn4A; spf=pass (google.com: domain of fm-294854-20240102100830d24dbc0e6b3b46873d-vlkxmn@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240102100830d24dbc0e6b3b46873d-vLkxmN@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT 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 v186-20020a6bc5c3000000b007bb71b2ab6fsi527986iof.3.2024.01.02.02.08.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jan 2024 02:08:31 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240102100830d24dbc0e6b3b46873d-vlkxmn@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=gV8kEn4A; spf=pass (google.com: domain of fm-294854-20240102100830d24dbc0e6b3b46873d-vlkxmn@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240102100830d24dbc0e6b3b46873d-vLkxmN@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240102100830d24dbc0e6b3b46873d for ; Tue, 02 Jan 2024 11:08:30 +0100 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=8dI8xROqgiUjgCxbylw+zQoBIyEsBIBteJm+ZWm5ed4=; b=gV8kEn4A/yzFiQl7j8TZzl/1TIqK9Vpw3+X+h/BD2MNJjA+XAChd66dCQXBwUvtPg0xYmw GAIB9s2MVs8i4eGzhIO4W7gaNmVw6UIfLXkaLs1co7riWqo7wcFc4EugoP2j7atMHif7MwLc cKVZO2Et2G8b8KBnCSf6llXVZW9xQ=; From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH 1/9] crossvars: Account for PACKAGE_ARCH = "${BUILD_ARCH}" Date: Tue, 2 Jan 2024 11:08:21 +0100 Message-Id: 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: W5Pn271auk7H From: Jan Kiszka 95427cc8 forgot about the case that PACKAGE_ARCH is to be derived from BUILD_ARCH - while that is considering PACKAGE_ARCH before setting BUILD_ARCH at all. Account for that case by adding the unresolved value of PACKAGE_ARCH into the cross-build case because that is what the statement is about: Set PACKAGE_ARCH to HOST_ARCH only if cross-building is enabled for a package. Fixes: 95427cc8a760 ("crossvars: Adjust logic to account for -native package builds in non-cross setups") Signed-off-by: Jan Kiszka --- meta/classes/crossvars.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/crossvars.bbclass b/meta/classes/crossvars.bbclass index a7834b99..828afe46 100644 --- a/meta/classes/crossvars.bbclass +++ b/meta/classes/crossvars.bbclass @@ -22,7 +22,7 @@ python __anonymous() { if distro_arch != host_arch and \ (package_arch == host_arch or \ - (package_arch in [distro_arch, compat_arch] and mode == "1")): + (package_arch in [distro_arch, compat_arch, '${BUILD_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" -- 2.35.3