From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7286543990069919744 X-Received: by 2002:a05:600c:2107:b0:405:48ba:9c with SMTP id u7-20020a05600c210700b0040548ba009cmr6832386wml.16.1696571074542; Thu, 05 Oct 2023 22:44:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5121:b0:406:3e39:f334 with SMTP id o33-20020a05600c512100b004063e39f334ls927778wms.1.-pod-prod-06-eu; Thu, 05 Oct 2023 22:44:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHonTURSsY8AN3pOM+zo3SBobgd5HIaFaEikBLREYNkvqpVFsA9y3qOcul2oZrd3Ej2fnTV X-Received: by 2002:a05:600c:b49:b0:406:7232:1431 with SMTP id k9-20020a05600c0b4900b0040672321431mr7170510wmr.33.1696571072417; Thu, 05 Oct 2023 22:44:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696571072; cv=none; d=google.com; s=arc-20160816; b=cmx8OYfy9L1lxTI3cWbT4O+yZXXWw6MatRAM7xVNp31AqSfE4fIlWEAOk+599Ulx6J KND6NTNQyJKEnmud1vFt1xB80DQFvWrnb/YoegGw/jp5DlqtVJ3KKFTrnBFz0MfqsrxY jvG+iBKyBVuCrUKeg34oWN96dEXGMVbWG4uT5h/1feJEk6oZTJ3NxgAfFC9BJWvBsuL+ VR+MXEcKCy0HoHvCJIAkkIzY0waFLn8V/TzEgu8J3vRNMMPMM2h0p7usUZYqydtLXc3m D6a3MiGsS849NqU7NxVeiWBqIbLiO7/VHnAA+uEO8DkLDP7aKG6OrK1zHIHirPlow3ar QsGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=tDW/QBuSfDZMhnfMBV62fwKAS+6qxSlG7y9F2fuTOkQ=; fh=IxbeHM4vWxalf1XNf2rnGcQL+r1v0Lr0C6ICsGNNkYw=; b=gepaigeCK5V5reX2CQFbrXFi2AvC+g7LmY5wej+FXPykl87+KZM+KTcBqvxRY8jnls KHrLDc2ktJ8/SWoWh0cYhaJxtCARCzhlUFZfyNSwhzB9iolEdp8O04lp9Uk1pz7abWKe KlR/LM+afxgghjfliKADRNjTGGdVRYoNmWCfChGF/wSp+BYCmmeA4XC5Sy/kbf0f2ECe td7TA9ha7UyYyZ7IOUuxkocxNcKxyIn8C3ByQroSBCl7qaBhF85/We601RKz2/Ko+AnF kpjGU9V48hgG6UgHSUTOpCe2Nt29jR6yw6krePlXmuHKcj0Lxy9jP7EN3XjBtDj/i+3B 7+qw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bn28-20020a056000061c00b00317e1e2b28asi30741wrb.4.2023.10.05.22.44.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Oct 2023 22:44:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 3965iUnS032185 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 6 Oct 2023 07:44:31 +0200 Message-ID: <97e458c5f21cc194466a1da58b51220390afa376.camel@ilbers.de> Subject: Re: [PATCH 1/7] Revert "base: Fix HOST_ARCH for native builds" From: Uladzimir Bely To: Jan Kiszka , isar-users Date: Fri, 06 Oct 2023 08:44:32 +0300 In-Reply-To: <23de6598a5b20bc289906493bc7563bacee8b916.1696530723.git.jan.kiszka@siemens.com> References: <23de6598a5b20bc289906493bc7563bacee8b916.1696530723.git.jan.kiszka@siemens.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: z8FoIg2rfIXY On Thu, 2023-10-05 at 20:31 +0200, Jan Kiszka wrote: > From: Jan Kiszka >=20 > This reverts commit 7bc68bb27f562257977bb5f701564ab08d4c5b3a. >=20 > 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. >=20 > Signed-off-by: Jan Kiszka > --- > =C2=A0meta/classes/base.bbclass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 6 += +---- > =C2=A0meta/classes/imagetypes.bbclass | 6 ++---- > =C2=A02 files changed, 4 insertions(+), 8 deletions(-) >=20 > 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): > =C2=A0# We need the oe module name space early (before INHERITs get added= ) > =C2=A0OE_IMPORTED :=3D "${@oe_import(d)}" > =C2=A0 > -def get_deb_host_arch(d): > +def get_deb_host_arch(): > =C2=A0=C2=A0=C2=A0=C2=A0 import subprocess > -=C2=A0=C2=A0=C2=A0 if d.getVar("ISAR_CROSS_COMPILE") !=3D "1": > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return d.getVar("DISTRO_ARCH"= ) > =C2=A0=C2=A0=C2=A0=C2=A0 host_arch =3D subprocess.check_output( > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ["dpkg", "--print-archit= ecture"] > =C2=A0=C2=A0=C2=A0=C2=A0 ).decode('utf-8').strip() > =C2=A0=C2=A0=C2=A0=C2=A0 return host_arch > -HOST_ARCH ??=3D "${@get_deb_host_arch(d)}" > +HOST_ARCH ??=3D "${@get_deb_host_arch()}" > =C2=A0HOST_DISTRO ??=3D "${DISTRO}" > =C2=A0 > =C2=A0die() { > 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 ?=3D > "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs" > =C2=A0 > =C2=A0# glibc bug 23960 > https://sourceware.org/bugzilla/show_bug.cgi?id=3D23960 > =C2=A0# should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 > -python() { > -=C2=A0=C2=A0=C2=A0 if d.getVar('DISTRO_ARCH') =3D=3D 'armhf' and > bb.utils.contains('IMAGE_BASETYPES', 'ubifs', True, False, d): > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 d.setVar('ISAR_CROSS_COMPILE'= , '1') > -} > +THIS_ISAR_CROSS_COMPILE :=3D "${ISAR_CROSS_COMPILE}" > +ISAR_CROSS_COMPILE:armhf =3D "${@bb.utils.contains('IMAGE_BASETYPES', > 'ubifs', '1', '${THIS_ISAR_CROSS_COMPILE}', d)}" > =C2=A0 > =C2=A0IMAGE_CMD:ubifs() { > =C2=A0=C2=A0=C2=A0=C2=A0 ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_AR= GS} \ To bring CI to working state again, we tend to apply this revert today. (as soon as possible). Is it OK?