From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319440798913658880 X-Received: by 2002:a05:6214:20e2:b0:67f:83f5:dab5 with SMTP id 2-20020a05621420e200b0067f83f5dab5mr428869qvk.12.1704785613175; Mon, 08 Jan 2024 23:33:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:5f4c:0:b0:67f:74d3:afb5 with SMTP id p12-20020ad45f4c000000b0067f74d3afb5ls33225qvg.1.-pod-prod-01-us; Mon, 08 Jan 2024 23:33:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IF63d0Xjh+yJP7u+m4e9y5EAvJCrjfafxZU9mjRUZn3Zzij6TCGxGeLjj6RxIaYH8CSyOlC X-Received: by 2002:ae9:f442:0:b0:783:73c:d597 with SMTP id z2-20020ae9f442000000b00783073cd597mr5660533qkl.101.1704785612386; Mon, 08 Jan 2024 23:33:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785612; cv=none; d=google.com; s=arc-20160816; b=mgA0PRiSjQxyE4fzD7LpITBL4Hl/8e+UaS7Mw9FCIpnMpyEOq9Wh/ZDvwJ8wjnlgFt X6QWhUQ2UZ5hp5yqpA3fynpyYJjM+3qn3Q1xukcjOrAxhqZ4XPaoQF/8YLlx/+yH4Qoi dpIkS0KNe6owtbXUfuxhksFQzrTVj8FHF7PYH6WpLGicHuOYowpTpmRUiQwra0iSsVK5 qwem9y5LSgZyCI5w0sLPL07ompw8Nnb6Mh3H1CpeesavkG1fxhrl0YzkV8xM6ZSTSel8 suhCaaeEj5l6uvYhknJH6fKwE5WCBrqOQ5Ed1XIkiEk1NFuu74BkK+2Zlp1RJ9gWgSIO Bn1A== 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=Qv9CRy2NA9hjGyQXqOyUQnW8Z8MQtHJ7TjgDDlDaC7W4b8wMVW5zSmy7thPSm5khfv dwRGu6cozCu6VVYqsalQQg34yVriwBPFgfQmy8wzlwNEAMpKDpi0Yow5VzHOSXOoOeMx FJE8rk8acgYnu4XkO5sOyevsSPyWoCX12QMJCBOleBzO2cvQf5JK8GcVHgSgppaN4hNX xLpqTaihLiAwd8b0chnQyri4dNKs2Z0XL4suyeyE6Y0p78wcI92gBXzbNwBEqvkheYOq vlEE7wHay/1BIeimZ2SZbykAZiTtyNFIGBTSUEBpq+G8a/iSk9wRbAui7O4/5OKU8VWs bjUw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CjJLsxKm; spf=pass (google.com: domain of fm-294854-20240109073331e2b64372235c25942a-asclvq@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073331e2b64372235c25942a-AsClvq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT 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 tv4-20020a05620a3e8400b007811b471a29si85011qkn.4.2024.01.08.23.33.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 23:33:32 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240109073331e2b64372235c25942a-asclvq@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=CjJLsxKm; spf=pass (google.com: domain of fm-294854-20240109073331e2b64372235c25942a-asclvq@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073331e2b64372235c25942a-AsClvq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240109073331e2b64372235c25942a for ; Tue, 09 Jan 2024 08:33:31 +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=CjJLsxKmHUpFXsJngWVhAcU+htEfhL2b96p1xFO/aV5xXsEMPqmOxKfeIL0ajA2xuU+N8X rStVyxqK99a7KatwJrlSMBap7umj1J60ZJ7NrHfMxsnCfMZ+SbCPRdM6On4FRvfyimZqurbg KYRF0swkY6GZ4AkA00EZi3tgex96A=; From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 1/8] crossvars: Account for PACKAGE_ARCH = "${BUILD_ARCH}" Date: Tue, 9 Jan 2024 08:33:17 +0100 Message-Id: <53436f40b81b741acc11a791d1cd1a7bebe4f0f9.1704785604.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: l0TZWQLgboG5 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