@@ -120,9 +120,8 @@ do_image_wic[depends] += "${@' '.join('%s:do_populate_sysroot' % r for r in ('wi
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)}'
# Unified kernel images need objcopy
-WKS_FILE_DEPENDS_DEFAULT += "virtual/cross-binutils"
+WKS_FILE_DEPENDS_DEFAULT = "virtual/cross-binutils"
WKS_FILE_DEPENDS_BOOTLOADERS = ""
WKS_FILE_DEPENDS_BOOTLOADERS:aarch64 = "grub-efi systemd-boot"
WKS_FILE_DEPENDS_BOOTLOADERS:arm = "systemd-boot"
@@ -14,6 +14,9 @@ WIC_HELPER_TOOLS ?= "\
WIC_HELPER_TOOLS_NATIVE_ONLY ?= "cdrtools"
WIC_HELPER_TOOLS_DEPENDS = "${@' '.join('%s-native' % t for t in (d.getVar('WIC_HELPER_TOOLS') + ' ' + d.getVar('WIC_HELPER_TOOLS_NATIVE_ONLY')).split())}"
+WIC_HELPER_TOOLS_DEPENDS:append:x86 = " syslinux-native"
+WIC_HELPER_TOOLS_DEPENDS:append:x86-64 = " syslinux-native"
+WIC_HELPER_TOOLS_DEPENDS:append:x86-x32 = " syslinux-native"
WIC_HELPER_TOOLS_PACKAGE_ONLY ?= "e2fsprogs-resize2fs"
WIC_HELPER_TOOLS_RDEPENDS = "${WIC_HELPER_TOOLS} ${WIC_HELPER_TOOLS_PACKAGE_ONLY}"
@@ -9,10 +9,6 @@ DEPENDS = "\
grub-native pseudo-native \
virtual/cross-binutils \
"
-DEPENDS:append:x86 = " syslinux-native"
-DEPENDS:append:x86-64 = " syslinux-native"
-DEPENDS:append:x86-x32 = " syslinux-native"
-
INHIBIT_DEFAULT_DEPS = "1"
PACKAGE_ARCH = "${MACHINE_ARCH}"
Whether wic needs the syslinux installer is decided by the .wks file, and so by the target: only an x86 image asks for syslinux. Currently image_types_wic.bbclass adds syslinux-native when the BUILD HOST is x86 instead, which is a different question. Does an image depend on syslinux-native today? | x86 target | non-x86 target -------------+------------+---------------- x86 host | yes | yes non-x86 host | no | no The answer varies by row when it should vary by column, and both of the wrong cells cost something. An x86 image built on a non-x86 host gets the target bootloader without the installer that puts it in place. An x86 host builds an installer that a non-x86 image will never use. Gate on the target instead, as wic-tools already does [1]: | x86 target | non-x86 target -------------+------------+---------------- x86 host | yes | no non-x86 host | yes | no Bug 13276 [2] reported the bottom-right cell failing, back when the syslinux recipe was x86-only for every variant, and it was closed in 2019 by gating on BUILD_ARCH [3]. The recipe has since been reworked so that only its target code is x86-specific [4], which leaves that gate unnecessary as well as misdirected. A non-x86 target never asks for syslinux, so 13276's case stays 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 v5: - new in v5 --- meta/classes-recipe/image_types_wic.bbclass | 3 +-- meta/conf/wic-helper-tools.inc | 3 +++ meta/recipes-core/meta/wic-tools.bb | 4 ---- 3 files changed, 4 insertions(+), 6 deletions(-)