diff mbox series

[v6,6/6] image_types_wic: gate syslinux-native on the target, not the build host

Message ID 20260802021000.2886095-7-twoerner@gmail.com
State New
Headers show
Series wic: ship the tools it invokes | expand

Commit Message

Trevor Woerner Aug. 2, 2026, 2:10 a.m. UTC 
A .wks needs the syslinux installer only when the target is x86.
image_types_wic.bbclass selects syslinux-native on the build host
architecture instead, so the dependency lands like this:

                 | x86 target | non-x86 target
    -------------+------------+----------------
    x86 host     | yes        | yes
    non-x86 host | no         | no

Two of those cells are wrong. An x86 image cross-built on a non-x86 host
gets the target bootloader without the installer that writes it, and an
x86 host building a non-x86 image builds an installer nothing uses.

Gate on the target, as wic-tools does [1]:

                 | x86 target | non-x86 target
    -------------+------------+----------------
    x86 host     | yes        | no
    non-x86 host | yes        | no

Bug 13276 [2] was an aarch64 host failing to build syslinux-native for
an ARM target, at a time when syslinux was x86-only in every variant. It
was closed in 2019 by gating on BUILD_ARCH [3]. Since 7273e131bfc7 [4]
only syslinux's target code is x86-specific, so a host gate is no longer
needed, and gating on the target keeps 13276's case fixed.

[YOCTO #16383]

[1] https://git.openembedded.org/openembedded-core/tree/meta/recipes-core/meta/wic-tools.bb
[2] https://bugzilla.yoctoproject.org/show_bug.cgi?id=13276
[3] https://git.openembedded.org/openembedded-core/commit/?id=7e2ee2b59319
[4] https://git.openembedded.org/openembedded-core/commit/?id=7273e131bfc7

AI-Generated: codex/claude-opus 5 (xhigh)
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes in v6:
- retitled with an image_types_wic prefix, which is now the only file it
  touches
- gate WKS_FILE_DEPENDS_DEFAULT with target-arch appends instead of the
  removed shared variable; wic-tools keeps the arch-gated DEPENDS it
  already had

changes in v5:
- new in v5
---
 meta/classes-recipe/image_types_wic.bbclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass
index 2dbe89fd899a..cc7cf69edb74 100644
--- a/meta/classes-recipe/image_types_wic.bbclass
+++ b/meta/classes-recipe/image_types_wic.bbclass
@@ -118,8 +118,10 @@  do_image_wic[depends] += "wic-native:do_populate_sysroot"
 do_image_wic[recrdeptask] += "do_deploy"
 do_image_wic[deptask] += "do_image_complete"
 
-WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}'
-WKS_FILE_DEPENDS_DEFAULT += "cdrtools-native"
+WKS_FILE_DEPENDS_DEFAULT = "cdrtools-native"
+WKS_FILE_DEPENDS_DEFAULT:append:x86 = " syslinux-native"
+WKS_FILE_DEPENDS_DEFAULT:append:x86-64 = " syslinux-native"
+WKS_FILE_DEPENDS_DEFAULT:append:x86-x32 = " syslinux-native"
 WKS_FILE_DEPENDS_BOOTLOADERS = ""
 WKS_FILE_DEPENDS_BOOTLOADERS:aarch64 = "grub-efi systemd-boot"
 WKS_FILE_DEPENDS_BOOTLOADERS:arm = "systemd-boot"