From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7325025390560280576 X-Received: by 2002:a05:6902:563:b0:dc2:38dc:14a1 with SMTP id a3-20020a056902056300b00dc238dc14a1mr683294ybt.46.1705490377025; Wed, 17 Jan 2024 03:19:37 -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-Google-Smtp-Source: AGHT+IEpBlYhkQeLD3/zfvNTIBy7sy/y81Awis+n3BmLbWT9yA2t5RRRL1VKbM69wB8ayqqM5qLd 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 Return-Path: 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; 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 Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20240117111934412ee4a38f5078e665 for ; Wed, 17 Jan 2024 12:19:34 +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=qcEtX82RvFxXjHHdv8qtAIp/uZcurvwurppf5l+ugYRRRBw/jVTiLf+mp50aA/c0zqt/wJ 1bIa50rkQdHB/z2e6Gcr1Wm0I/72cigfr67MFR/DQPtMTj2fxGxcbhKPHgnAOY0Ew/e1e7y1 TI4dsPMXq+JJU14B4h9+MbQQq9KkQ=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: hho7KHwj1Q00 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