Re: [PATCH 1/7] Revert "base: Fix HOST_ARCH for native builds"

[Jan Kiszka <jan.kiszka@siemens.com>]

On 06.10.23 07:44, Uladzimir Bely wrote:
> On Thu, 2023-10-05 at 20:31 +0200, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> 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 <jan.kiszka@siemens.com>
>> ---
>>  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} \
> 
> To bring CI to working state again, we tend to apply this revert today.
> (as soon as possible). Is it OK?

Sure!

Jan

-- 
Siemens AG, Technology
Linux Expert Center