From patchwork Wed Jan 17 11:19:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3299 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Jan 2024 12:19:45 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-yb1-f185.google.com (mail-yb1-f185.google.com [209.85.219.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40HBJh4x032504 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Jan 2024 12:19:44 +0100 Received: by mail-yb1-f185.google.com with SMTP id 3f1490d57ef6-dc22f3426aesf1565760276.1 for ; Wed, 17 Jan 2024 03:19:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705490377; cv=pass; d=google.com; s=arc-20160816; b=vg+tEN4UMTrJ0oXNmkbIXfoIvLR8w3yJkmP4DgPRKv73sT8NSJX0mNmsSJ5raCjCoV KnKqtBC6YARBclVlnMUXwjRZfGzadjH3MMucC/4t2IZq4AFzAv44u+MkVoHM59ED0km/ p+KUuyP+BK1/88yuA0pKumRPqoIL+st+zdDPRAaBwxwVt17ot6sqi1oeP5PP2VEpZT79 zd5vm7FjjsaaRWUf5kKZAi0FR5ikdTVOm1Umrj6oyVytLsGAak7wPnBE466bC2Ooyt4G EvsozRrcp5CpmwIkU/T1tXv5MbpbDBg2xwFf8dBRgTVVSV7N/8fnZvDusoIgulYAV8nH ZWzA== 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=zMCKk2I0dDrO2JrO8Vrlq3+nRelt1F5eBPwXqWxW7Ic=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=C6rzfvWINO3eV6skpr7fUtx0dI7befM8Y2pzTysK2uwpCV4am4vJlpmZarV+BTj2Fm xoyJcQjjEU2n1DxJCwFEaDGwzgpdOZuFpxF2RyB17exjCi7diEcaCtaqQjlMv9mq3arE vzFmcbaklA2EFn4ICX9ElHE4QX6QWfW2mOB/IvLtQL5d0u1Xd43V6OylLdkC/15Sv2qd cSy18aAnF2+LZoT5t/A65nO4L2A8fg+/4I3nLVhsC/41b2pU97R+l6XGfpmIQodksbKG HuvVoaDFFeAZnnOmlrw44v0uTUeF2g/4zbHQ6EVCrfpOSHyOpNz/unJ7YkNoMX+Pv6Tg Upag== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=qcEtX82R; spf=pass (google.com: domain of fm-294854-20240117111934412ee4a38f5078e665-1tgxo5@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240117111934412ee4a38f5078e665-1TgXO5@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=1705490377; x=1706095177; 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=zMCKk2I0dDrO2JrO8Vrlq3+nRelt1F5eBPwXqWxW7Ic=; b=dTsihK5A0mjnPdVcOSXxgJpTf7JYJH1hXQjtC2FbadQa/ijvBM9jTzGB7d+xbBNq/P 1v8LDXpB4i2iuynJvV02qFGf9KlZy/y0Jbq8aoHyQe6dnnpCxAk94csr5GWJe3XzBSPG EfbBAQdMp4QJqloW09YEWtB4rqezkHrSFu5Qv56zwQCelB5qJJiaAZol72v1SUX6sP+p GDx/6DiSnIU9RzyhZgr/FO6M3YpMuVv7LmvC4mjjIlUXUJ+9FSXJ1fuAGBEMsgpTBxBA YKrxmHN72i5j4wPWZmgVoTwlE0txv2l2UCtzrnyzH+2ogP2v03S/VwEjdyhEcyNdy1JF YgBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705490377; x=1706095177; 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=zMCKk2I0dDrO2JrO8Vrlq3+nRelt1F5eBPwXqWxW7Ic=; b=WL8OY7DhkL+yI1NUOPAVhEwPZNeKS1LVtPm/GnZqLupejlMgynwfJuScuBcDF5cCWe Ly2kSr1aZVabfdY66zAU020hfuTOuWjMGfbNOuKWAOoQFiN42F7sCS/wJuiUz1Kxzfy6 4T4mlfhK/TV43Iz8396vdsBcKW9Qa4nn5inZqyCLm/gL1Sb3ECkfsnV/hZ2T0v+h9PT7 HA+5HgBi9pGVclmVDZA9Z9tSnMS0uPloQG8uTWN/2jmBzH9TPAiyFKMy7PhU0syFUfS4 yqpqZJNVsvLEjG6ANKnBa7jTcY6HWCApeUi/8vui/VQOE3PaNnAztk+d/igEPm6a/CG6 2cRg== X-Gm-Message-State: AOJu0Yw7HKoSjvjIijT2hIzubE3Glz5X7frSUa6ajWfPJ0h+lAwubHA+ vb1Qx6BLhb1N08ZVgXSSEfwRYpQMZPqw+HAA1ja8fjEwFH9Xmz5H X-Google-Smtp-Source: AGHT+IF7F0ifr3bGBwINJp+dCB5+wN1igKyFw6JZvihvwcL3yZvVMmtVveajCOnuTWnDqbwhBQJ7Pg== X-Received: by 2002:a5b:888:0:b0:dc2:2327:4a24 with SMTP id e8-20020a5b0888000000b00dc223274a24mr335199ybq.7.1705490376933; Wed, 17 Jan 2024 03:19:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:d244:0:b0:dc2:1c63:41cd with SMTP id j65-20020a25d244000000b00dc21c6341cdls1122481ybg.0.-pod-prod-00-us; Wed, 17 Jan 2024 03:19:36 -0800 (PST) X-Received: by 2002:a81:6c06:0:b0:5ff:6551:11e0 with SMTP id h6-20020a816c06000000b005ff655111e0mr273112ywc.23.1705490375902; Wed, 17 Jan 2024 03:19:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490375; cv=none; d=google.com; s=arc-20160816; b=gcyUoc7jtyePw76fR/WsZRiH2W3g79F5jPeQunGeRcaBFa2/DdMseXb8Z+BfMONijX gCpCeLfl7bhqBdo+i8k13iMt/Lm4mt23NlxSWvsIGtZlbABGztuwu3uWE+4Nhlt+HlgW 0YVLcFBmXg3ZqZfRJX1RaK70ggPTjI8odDRx9X+mdZhJONRIAEMIJZMj2mifn3+5w272 4qufqKzEoD1mHTwhJL7NRqTQpvvKogh80xOAZ/PkIJiRjHpKrbQDEm9Nxrbij15uLoNH J5ZT77029rZwYYGLua6KVWB1CE2CbzOsTEWzxEEuIflB6y4GfAFs7FuGwxXu7no757gm KEdA== 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=oRzPrMSJdze+z/1QJyz5JM4TzuIkaatk67ItjDblLZs72z7oTnBVcIJQuehtq0YcjB omBQEcq2bVERjjJx7U0DBAtvaUsD1+/lRDD45UKNZf/67NcMa/xK9NRs80XhZz4keJh3 tHzNg9FxaT9+xdOXiBJRsDrarOsB0z+p7ebEZ2zT9f1jFStSIJ40P8mxMTcshPaC7Xox VpufRKqZLfNwmufSUjWV1BCcQELXV01iDG3788OuPYA0dro1EoLUow8OUx6NCFhp6/hS Bid2ihnSxArkKttzfc87rnkq/3cdUOCsp2bwcf1/e7m/EB8jBOuWVq87V4LUqDwuBznW +2Uw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=qcEtX82R; spf=pass (google.com: domain of fm-294854-20240117111934412ee4a38f5078e665-1tgxo5@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240117111934412ee4a38f5078e665-1TgXO5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id g189-20020a0dddc6000000b005ff5081b46fsi422842ywe.0.2024.01.17.03.19.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:35 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240117111934412ee4a38f5078e665-1tgxo5@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20240117111934412ee4a38f5078e665 for ; Wed, 17 Jan 2024 12:19:34 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 1/8] crossvars: Account for PACKAGE_ARCH = "${BUILD_ARCH}" Date: Wed, 17 Jan 2024 12:19:26 +0100 Message-Id: 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=qcEtX82R; spf=pass (google.com: domain of fm-294854-20240117111934412ee4a38f5078e665-1tgxo5@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240117111934412ee4a38f5078e665-1TgXO5@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"