From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7286543990069919744 X-Received: by 2002:a05:600c:2981:b0:403:8fb9:8d69 with SMTP id r1-20020a05600c298100b004038fb98d69mr5641418wmd.25.1696530727559; Thu, 05 Oct 2023 11:32:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c10:b0:3fe:1974:f893 with SMTP id j16-20020a05600c1c1000b003fe1974f893ls716304wms.0.-pod-prod-07-eu; Thu, 05 Oct 2023 11:32:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwHfDkeDtpacmRulNrqJbWLFVJgwky76HXwCe0/gpYsdkACwEtKmIVMxfZrfXcegojO4vE X-Received: by 2002:a1c:7407:0:b0:401:c338:ab94 with SMTP id p7-20020a1c7407000000b00401c338ab94mr5842686wmc.29.1696530725058; Thu, 05 Oct 2023 11:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696530725; cv=none; d=google.com; s=arc-20160816; b=IU5uAedrK+s3/aNQVCMaNU1ndhf0baMAkfuD4Djx0STIi05L+e1LvIRdi91/y/xuB1 r8s585TxiGXNlAN/LqkNvpSRkC3QNop2175OIzUHxb98MxDPl6kC9wRmLPh3vNbhh+5s G6F1I93y8IFEnvZL5XLKkgLPuYwb+mafmucsLybgb4QjgC/QadQi8GO05LlhKN95fIkT QV+9KlRGiqvFGJZg35+DHAuSAY5z8w3s5fhaQUFlWDenW5fZ4u+0BUc62Fv1PoextJ9x BAjiEAyHywD/lrSBd5LE9pYTKDJW3GI9vK1oSYuIXYjMIwJzFvAbhYhY28plltvex76r RgKg== 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=rWzqvJN+MaHBq/eIFkrBFjtpKllDP4651pyUv5fmk98=; fh=yRqbW8O3aFmOjK/UFxR7KoBHXIp/B4yCBNXRNY5QpV8=; b=Bq3ffk1jEJXsNxL8YuBkUZrcCk1Eq6bNproFnYnPEbyq67Vvu1WLzfRMIP8KXYza6O 5zV+V7BB7dGbGOC/GdFunDOg1+kPLB0c6v+0uUzjpWogOQCHHIfWGgd1w2Yv5UAfbKmQ 0WKKTeQ/fi8HjEz8PQQEsHeO8qtiU48I65eyDYPqPtjuyCiJcAopo2g+PTSoX49i8B+M u7PWQN51pmBHHz8XkdWNM6+xiCHPW6tiOo6byx/H+baUm7aIKKWsx21jfA6IQJfJ59bw dKvHljKlk5ebXlzE4e70yfdheYG28oA0VRsEi0WBiEvk7rCduugvi7uYVbVV+o3Sz8r1 SIhg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RX36YA3H; spf=pass (google.com: domain of fm-294854-20231005183204fba8c5398a60f9807a-nwhfpb@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20231005183204fba8c5398a60f9807a-NwHFPB@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id p7-20020a05600c1d8700b003fe2591111dsi313319wms.1.2023.10.05.11.32.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Oct 2023 11:32:05 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20231005183204fba8c5398a60f9807a-nwhfpb@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RX36YA3H; spf=pass (google.com: domain of fm-294854-20231005183204fba8c5398a60f9807a-nwhfpb@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20231005183204fba8c5398a60f9807a-NwHFPB@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20231005183204fba8c5398a60f9807a for ; Thu, 05 Oct 2023 20:32:04 +0200 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=rWzqvJN+MaHBq/eIFkrBFjtpKllDP4651pyUv5fmk98=; b=RX36YA3HbuOJEAGuNK33rA9OquIK4IIt1VSut09Ee8taTRhw2C18sLE3kAvOHdotZY7oiR s7Owl6E+/NweNx3nj+qk/NYuw08SCxSjb8jgkVbVHNGTEzYGmnJyQDOv7K5gyDYuUGEkIYfU TmMbz4tlj6L1gu4up+gJJIDj5P62E=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt , Felix Moessbauer , Uladzimir Bely Subject: [PATCH 1/7] Revert "base: Fix HOST_ARCH for native builds" Date: Thu, 5 Oct 2023 20:31:57 +0200 Message-Id: <23de6598a5b20bc289906493bc7563bacee8b916.1696530723.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: LCRFmPHab3sc From: Jan Kiszka This reverts commit 7bc68bb27f562257977bb5f701564ab08d4c5b3a. It was the wrong assumption that HOST_ARCH should depend on ISAR_CROSS_COMPILE - too much code assumes that it is statically bound to the builder machine. Instead, code that needs effective builder arch should use BUILD_HOST_ARCH. Signed-off-by: Jan Kiszka --- meta/classes/base.bbclass | 6 ++---- meta/classes/imagetypes.bbclass | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index f315a9d5..88004120 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -49,15 +49,13 @@ def oe_import(d): # We need the oe module name space early (before INHERITs get added) OE_IMPORTED := "${@oe_import(d)}" -def get_deb_host_arch(d): +def get_deb_host_arch(): import subprocess - if d.getVar("ISAR_CROSS_COMPILE") != "1": - return d.getVar("DISTRO_ARCH") host_arch = subprocess.check_output( ["dpkg", "--print-architecture"] ).decode('utf-8').strip() return host_arch -HOST_ARCH ??= "${@get_deb_host_arch(d)}" +HOST_ARCH ??= "${@get_deb_host_arch()}" HOST_DISTRO ??= "${DISTRO}" die() { diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass index 205377b1..a3be0a1d 100644 --- a/meta/classes/imagetypes.bbclass +++ b/meta/classes/imagetypes.bbclass @@ -65,10 +65,8 @@ UBIFS_IMG ?= "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs" # glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 # should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 -python() { - if d.getVar('DISTRO_ARCH') == 'armhf' and bb.utils.contains('IMAGE_BASETYPES', 'ubifs', True, False, d): - d.setVar('ISAR_CROSS_COMPILE', '1') -} +THIS_ISAR_CROSS_COMPILE := "${ISAR_CROSS_COMPILE}" +ISAR_CROSS_COMPILE:armhf = "${@bb.utils.contains('IMAGE_BASETYPES', 'ubifs', '1', '${THIS_ISAR_CROSS_COMPILE}', d)}" IMAGE_CMD:ubifs() { ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ -- 2.35.3