From patchwork Tue Jan 9 07:33:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3268 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jan 2024 08:33:39 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f64.google.com (mail-qv1-f64.google.com [209.85.219.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4097XcI1021571 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 08:33:39 +0100 Received: by mail-qv1-f64.google.com with SMTP id 6a1803df08f44-6805a03aeaesf51456396d6.0 for ; Mon, 08 Jan 2024 23:33:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704785613; cv=pass; d=google.com; s=arc-20160816; b=Nn/o2Dv2f+Zpb9ZEZmAp4R/eWfXdP+COX8QguL19+lvHIDySyADQG/uY1UIYh8QeGn 0w2u0CW6pRiRWty+zEWcCBa1XBPcfD29BqhqLaEFGaP9yjVGaRh18nuMdpu73znMFTvi NkgeINd/WC/F9u1FYzLmUyFqusIXITh5angHSrZm/cXWo4R5ZjpoX2QXhTrR8RMI+byG EW/AGhLEg0zXc10i0iJZwPyhE/bfIJz/D8tN8ScY+xuJEz3/uYE816Gg4w09XIYRXyhH efg8A6CeOElvFMak++z6oChfgK7jmbxFFHs1XZsK6uP74SP1+I2rVO/SkTQLAAMAQf2V MnqQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rSxIH19+3hfwsrBfTuhkpRfrYt7ii8HcI1j6cmX3QU8=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=HJLIB81vPYg2fR1qFB05QEhex6hMcO98zwB+9HKkb7ahaTQk8zS2fyuQnHl2BoCU/E z5KCYKyFBDRuWXge83mjGmNODmYeQsfUbnnrFBjPHSt0i4+w6Cs8dDutDE9n6GVqyN/W rwcnNcf/WAC4QFcgu574dgZ4nAtWfRdRlxr14/yOJr0ShVx6QwaI6yPfRx5KJhSx52uc qDImFJMm25AAT+ZU93qGFswa8ys3QBKZz5ziBKSmmzZFw7SxkcvkQ/LbHXKSOvS89mhX 2zrc8JE70YEQA4KjxfJlMhIhJW+ovjJmwn7XAoqeHtG4Y+KRReBatvgJIVOHw8bd1PWE LR8A== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704785613; x=1705390413; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=rSxIH19+3hfwsrBfTuhkpRfrYt7ii8HcI1j6cmX3QU8=; b=jr+tNjXLHu6mRc8y47nNhb1iDV4312O2ZQuLM3a5hFcOJinPsRvsBgm4ykBhHdz8QZ EcCljcIJApKJOGMPQUc6y5hR/Xfx0iMGidu08QDG69S4w7nYcHv1NIrI94w92lf7vBCr O3x4qnCBZXLuRlCNX033OR0O2Fc6Df83abP+a5dJPYNMeFgUUdup/8FXTeLI4NrKKqlB B2CX3bbab2sRsVoiIyY1w/w1BFFjjsuVx9WZTzdyC9c/8uVZrowMSUpWC1/BqpJw3WAc HdMkfbPFg8cpCXyTa8+9ddfVc4VIiVHNV3LBbJDASVycdfYx8tOk7rQcoXZgfERBZ9wI 4Y5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704785613; x=1705390413; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rSxIH19+3hfwsrBfTuhkpRfrYt7ii8HcI1j6cmX3QU8=; b=KQwXsxU7XB50zPaTR+E72UTo1zAQJocVB5GLWkVgT3GGxvti1/31O13zALuG7mxEQd XuCFQtb1TXo+oyNQFf5hcWJJW7l6A497nHWBkTGJ+N59BcYiBdqSzn+o96404Et7HCSv 8SO48Y/mXQD2iWDW5DUuE3/zSoCGB51YvPb/L85OTf4tQX4b5zty6Lo1gPpWEC5DBnsj 7R/k5CckbS5ZQVZyJlr8aOQ0KjbwP4saWPYVBvg99r3TmI0QtmisgHfXcaAeo/2wGxB8 mk766WFlEzMBLECxBuWlci9ZMM7CRKmhGOUTVArBAEh61l3BuKBi31GRsh0Ux5AqfhEf d4pg== X-Gm-Message-State: AOJu0YwiKCTJKYgd3oPS2Hwj58jpOOuZNty0mSSoqx8qejojPGc79WG3 tSlriawMlJMPxati3xxX67g= X-Google-Smtp-Source: AGHT+IHbvJ2uhousBTrS4V4J/gWBAGOQ03RHCSZT421Se0o7oAkYMWCH5fNYtn+OSBg/EUtYk/9eig== X-Received: by 2002:a05:6214:2422:b0:67f:7599:84ad with SMTP id gy2-20020a056214242200b0067f759984admr6721239qvb.84.1704785613087; 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-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 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; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240109073331e2b64372235c25942a for ; Tue, 09 Jan 2024 08:33:31 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-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 X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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"