On Fri, 2026-07-31 at 11:28 -0400, Trevor Woerner via lists.openembedded.org wrote: > The tools wic shells out to are listed in both wic-tools and > image_types_wic.bbclass, and the copies have drifted. Add > conf/wic-helper-tools.inc as the single source of truth. > > Only wic-tools staged tar-native and util-linux-native before; images > now get them too. > > AI-Generated: codex/claude-opus 5 (xhigh) > Signed-off-by: Trevor Woerner <[email protected]> > --- > changes in v5: > - new in v5 > --- > meta/classes-recipe/image_types_wic.bbclass | 5 +++-- > meta/conf/wic-helper-tools.inc | 16 ++++++++++++++++ > meta/recipes-core/meta/wic-tools.bb | 7 +++---- > 3 files changed, 22 insertions(+), 6 deletions(-) > create mode 100644 meta/conf/wic-helper-tools.inc > > diff --git a/meta/classes-recipe/image_types_wic.bbclass > b/meta/classes-recipe/image_types_wic.bbclass > index ea8c1c94ca2f..3f25b7912b26 100644 > --- a/meta/classes-recipe/image_types_wic.bbclass > +++ b/meta/classes-recipe/image_types_wic.bbclass > @@ -112,14 +112,15 @@ do_image_wic[cleandirs] = "${WORKDIR}/build-wic" > USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' > '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" > WKS_FILE_CHECKSUM = "${@wks_checksums(d.getVar('WKS_FILES').split(), > d.getVar('WKS_SEARCH_PATH')) if '${USING_WIC}' else ''}" > do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" > -do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' % r > for r in ('wic', 'parted', 'gptfdisk', 'dosfstools', 'mtools'))}" > + > +require conf/wic-helper-tools.inc > +do_image_wic[depends] += "${@' '.join('%s:do_populate_sysroot' % r for r in > ('wic-native ' + d.getVar('WIC_HELPER_TOOLS_DEPENDS')).split())}"
If wic has the right RDEPENDS, doesn't this just simplify to: do_image_wic[depends] += "wic-native:do_populate_sysroot" ? Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#242455): https://lists.openembedded.org/g/openembedded-core/message/242455 Mute This Topic: https://lists.openembedded.org/mt/120536430/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
