diff mbox series

[v5,3/6] wic: add runtime dependencies on the tools it invokes

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

Commit Message

Trevor Woerner July 31, 2026, 3:28 p.m. UTC
wic shells out to a range of host tools (parted, mkfs.*, mcopy, sfdisk,
and more) but, since the recipe was created, has declared none of them,
so an installed wic works only by chance depending on what the host
provides. Declare them as RDEPENDS so they are installed with wic.

AI-Generated: codex/claude-opus 4.8 (xhigh)
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes in v5:
- take the tool list from the shared conf/wic-helper-tools.inc
- drop the bootloader (grub, syslinux) RDEPENDS entirely; declare only
  the host tools wic runs
- trimmed the commit message; dropped the in-recipe comments

changes in v4:
- gate grub to x86 and aarch64; move syslinux into the same arch-gated
  appends
- also depend on syslinux-isolinux for isolinux.bin

changes in v3:
- list the tools on all variants rather than only the nativesdk variant

changes in v2:
- merge the tool list into the wic recipe as RDEPENDS; drop the separate
  .inc
---
 meta/conf/wic-helper-tools.inc        | 3 +++
 meta/recipes-support/wic/wic_0.3.1.bb | 3 +++
 2 files changed, 6 insertions(+)
diff mbox series

Patch

diff --git a/meta/conf/wic-helper-tools.inc b/meta/conf/wic-helper-tools.inc
index f3b2b698e2df..66f2f1b2bddc 100644
--- a/meta/conf/wic-helper-tools.inc
+++ b/meta/conf/wic-helper-tools.inc
@@ -14,3 +14,6 @@  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_PACKAGE_ONLY ?= "e2fsprogs-resize2fs"
+WIC_HELPER_TOOLS_RDEPENDS = "${WIC_HELPER_TOOLS} ${WIC_HELPER_TOOLS_PACKAGE_ONLY}"
diff --git a/meta/recipes-support/wic/wic_0.3.1.bb b/meta/recipes-support/wic/wic_0.3.1.bb
index d9b4cc05c4bd..d8b8c6905d87 100644
--- a/meta/recipes-support/wic/wic_0.3.1.bb
+++ b/meta/recipes-support/wic/wic_0.3.1.bb
@@ -10,11 +10,14 @@  CVE_PRODUCT = "yoctoproject:wic"
 
 inherit python_hatchling
 
+require conf/wic-helper-tools.inc
+
 RDEPENDS:${PN} += " \
     python3-core \
     python3-json \
     python3-logging \
     python3-misc \
+    ${WIC_HELPER_TOOLS_RDEPENDS} \
     "
 
 BBCLASSEXTEND = "native nativesdk"