Re: [PATCH v3 0/9] HOST_ARCH, -native, riscv64, and all the rest

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

On 13.10.23 09:59, Uladzimir Bely wrote:
> On Thu, 2023-10-12 at 07:16 +0200, Jan Kiszka wrote:
>> Change in v3:
>>  - fix compat arch cross build regression
>>
>> Changes in v2:
>>  - drop merged revert
>>  - rename BUILD_HOST_ARCH to BUILD_ARCH
>>  - add fix for explicit -native build in non-cross setups
>>  - add missing debian-sid.conf
>>
>> This tries to resolve the native build issues of the visionfive2,
>> fixing
>> some remaining corner case of -native usage:
>>
>> If package A has B-native as build dependency but is then compiled
>> without cross-building, using qemu-user instead, it will incorrectly
>> request the build of B:, rather than B:. This
>> is resolved automatically now, and the solution is used for the
>> visionfive2.
>>
>> For that board to build again, we also need to switch from sid-ports
>> to
>> sid, for riscv64 in general.
>>
>> Furthermore, this reworks the crossvars logic to also account for the
>> corner case that a package is still requested as native although
>> ISAR_CROSS_COMPILE is off. While this is likely irrelvant in
>> practice,
>> the result is a more consistent logic of the crossvars class.
>>
>> Jan
>>
>> Jan Kiszka (9):
>>   Rename BUILD_HOST_ARCH to BUILD_ARCH
>>   dpkg: Drop redundant PACKAGE_ARCH initialization
>>   crossvars: Adjust logic to account for -native package builds in
>>     non-cross setups
>>   multiarch: Downgrade native dependencies when building in emulated
>>     environment
>>   meta-isar: jh7110-u-boot-spl-tool: Rely on native annotation
>>   meta-isar: jh7110-u-boot-spl-image: Fix native build
>>   meta-isar: u-boot-starfive-visionfive2: Simplify build dependencies
>>   linux-custom: Drop unused template variable
>>   Move riscv64 from sid-ports to regular sid
>>
>>  doc/user_manual.md                            |  4 ++--
>>  kas/distro/Kconfig                            |  6 +++---
>>  ...{debian-sid-ports.yaml => debian-sid.yaml} |  2 +-
>>  kas/machine/Kconfig                           |  6 +++---
>>  meta-isar/conf/mc.conf                        |  6 +++---
>>  ...64-sid-ports.conf => qemuriscv64-sid.conf} |  2 +-
>>  ...0-sid-ports.conf => sifive-fu540-sid.conf} |  2 +-
>>  ...rts.conf => starfive-visionfive2-sid.conf} |  2 +-
>>  .../jh7110-u-boot-spl-image_0.1.bb            |  6 +++---
>>  .../jh7110-u-boot-spl-tool_0.1.bb             |  3 ---
>>  ...-starfive-visionfive2_2021.10+VF2-3.0.4.bb |  4 +---
>>  meta/classes/crossvars.bbclass                | 20 +++++++++++------
>> -
>>  meta/classes/dpkg-base.bbclass                |  2 +-
>>  meta/classes/dpkg.bbclass                     |  4 +---
>>  meta/classes/multiarch.bbclass                | 12 +++++++++++
>>  meta/conf/bitbake.conf                        |  2 +-
>>  meta/conf/distro/debian-sid.conf              | 21
>> +++++++++++++++++++
>>  meta/recipes-kernel/linux/linux-custom.inc    |  1 -
>>  testsuite/citest.py                           |  6 +++---
>>  19 files changed, 71 insertions(+), 40 deletions(-)
>>  rename kas/distro/{debian-sid-ports.yaml => debian-sid.yaml} (78%)
>>  rename meta-isar/conf/multiconfig/{qemuriscv64-sid-ports.conf =>
>> qemuriscv64-sid.conf} (85%)
>>  rename meta-isar/conf/multiconfig/{sifive-fu540-sid-ports.conf =>
>> sifive-fu540-sid.conf} (76%)
>>  rename meta-isar/conf/multiconfig/{starfive-visionfive2-sid-
>> ports.conf => starfive-visionfive2-sid.conf} (78%)
>>  create mode 100644 meta/conf/distro/debian-sid.conf
>>
> 
> Well, this now completely passes CI, so we will merge it after the
> weekend if there are no objections.

\o/ :). Yeah, sorry, this really became much more tricky than I
originally thought. And thanks a lot for finding all my bugs along the way!

Jan

-- 
Siemens AG, Technology
Linux Expert Center