public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: "Yoann Congal" <yoann.congal@smile.fr>
To: <twoerner@gmail.com>, <openembedded-core@lists.openembedded.org>
Cc: "Bruce Ashfield" <bruce.ashfield@gmail.com>,
	"Mark Hatle" <mark.hatle@kernel.crashing.org>
Subject: Re: [OE-core] [PATCH v9 1/5] wic: add recipe
Date: Tue, 07 Apr 2026 17:48:54 +0200	[thread overview]
Message-ID: <DHN1HR17CNRM.1SPHVOOASAQ0G@smile.fr> (raw)
In-Reply-To: <20260403183541.2631883-2-twoerner@gmail.com>

On Fri Apr 3, 2026 at 8:35 PM CEST, Trevor Woerner via lists.openembedded.org wrote:
> Add a recipe for the external wic utility from
> https://git.yoctoproject.org/wic. Add wic to the list of native
> wic-tools, and make it a dependency of the image bbclass for wic images.
>
> Add myself as maintainer for this new recipe, as well as the wic-tools
> recipe (which did not have a maintainer).
>
> NOTE: this patch is in preparation for removing wic from oe-core
>       the wic oe-selftests work fine with this patch being added now
>
> Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
> Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
> changes in v9:
> - updated SRCREV as required (the standalone wic repository has
>   different commits)
> - updated commit message to indicate the change of maintainership
>
> changes in v8:
> - (skipped, the patch to add sector-size cmdline arg was upstreamed)
>
> changes in v7:
> - bump SRCREV to include a work-around for wic.Wic2.test_expand_mbr_image
> - changelog:
>         exec_cmd(): allow multiple success codes
>
> changes in v6:
> - the SRCREV was updated since any changes/revisions before the removal
>   need to be reflected in the repository
>
> changes in v5:
> - rebase with master
> - split patchset back out into smaller patches
> - do not add TOPDIR and WIC_SECTOR_SIZE to image_types_wic.bbclass if a
>   user wants them, they can add them to WICVARS in their config
>
> changes in v4:
> - (skipped)
>
> changes in v3:
> - squashed into one large patch
>
> changes in v2:
> - add wic as a native dependency of the image_types_wic.bbclass
> ---
>  meta/classes-recipe/image_types_wic.bbclass |  4 ++--
>  meta/conf/distro/include/maintainers.inc    |  3 ++-
>  meta/recipes-core/meta/wic-tools.bb         |  1 +
>  meta/recipes-support/wic/wic_0.3.0.bb       | 18 ++++++++++++++++++
>  4 files changed, 23 insertions(+), 3 deletions(-)
>  create mode 100644 meta/recipes-support/wic/wic_0.3.0.bb
>
> diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass
> index aea61d67e3ed..f613c59b2cbc 100644
> --- a/meta/classes-recipe/image_types_wic.bbclass
> +++ b/meta/classes-recipe/image_types_wic.bbclass
> @@ -111,14 +111,14 @@ 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 ('parted', 'gptfdisk', 'dosfstools', 'mtools'))}"
> +do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' % r for r in ('wic', 'parted', 'gptfdisk', 'dosfstools', 'mtools'))}"
>  
>  # We ensure all artfacts are deployed (e.g virtual/bootloader)
>  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 += "bmaptool-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native"
> +WKS_FILE_DEPENDS_DEFAULT += "wic-native bmaptool-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native"
>  # Unified kernel images need objcopy
>  WKS_FILE_DEPENDS_DEFAULT += "virtual/cross-binutils"
>  WKS_FILE_DEPENDS_BOOTLOADERS = ""
> diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
> index 1bd43211e23d..567cd98580d0 100644
> --- a/meta/conf/distro/include/maintainers.inc
> +++ b/meta/conf/distro/include/maintainers.inc
> @@ -892,7 +892,8 @@ RECIPE_MAINTAINER:pn-weston = "Denys Dmytriyenko <denis@denix.org>"
>  RECIPE_MAINTAINER:pn-weston-init = "Denys Dmytriyenko <denis@denix.org>"
>  RECIPE_MAINTAINER:pn-wget = "Yi Zhao <yi.zhao@windriver.com>"
>  RECIPE_MAINTAINER:pn-which = "Unassigned <unassigned@yoctoproject.org>"
> -RECIPE_MAINTAINER:pn-wic-tools = "Unassigned <unassigned@yoctoproject.org>"
> +RECIPE_MAINTAINER:pn-wic = "Trevor Woerner <twoerner@gmail.com>"
> +RECIPE_MAINTAINER:pn-wic-tools = "Trevor Woerner <twoerner@gmail.com>"
>  RECIPE_MAINTAINER:pn-wireless-regdb = "Unassigned <unassigned@yoctoproject.org>"
>  RECIPE_MAINTAINER:pn-wpa-supplicant = "Unassigned <unassigned@yoctoproject.org>"
>  RECIPE_MAINTAINER:pn-wpebackend-fdo = "Unassigned <unassigned@yoctoproject.org>"
> diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb
> index fa983ed5f12c..45fb873dd6bd 100644
> --- a/meta/recipes-core/meta/wic-tools.bb
> +++ b/meta/recipes-core/meta/wic-tools.bb
> @@ -3,6 +3,7 @@ SUMMARY = "A meta recipe to build native tools used by wic."
>  LICENSE = "MIT"
>  
>  DEPENDS = "\
> +           wic-native \
>             parted-native gptfdisk-native dosfstools-native \
>             mtools-native bmaptool-native grub-native cdrtools-native \
>             btrfs-tools-native squashfs-tools-native pseudo-native \
> diff --git a/meta/recipes-support/wic/wic_0.3.0.bb b/meta/recipes-support/wic/wic_0.3.0.bb
> new file mode 100644
> index 000000000000..b98408702300
> --- /dev/null
> +++ b/meta/recipes-support/wic/wic_0.3.0.bb
> @@ -0,0 +1,18 @@
> +SUMMARY = "OpenEmbedded Image Creator (wic) standalone CLI"
> +HOMEPAGE = "https://git.yoctoproject.org/wic"
> +LICENSE = "GPL-2.0-only"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=4ee23c52855c222cba72583d301d2338"
> +
> +SRC_URI = "git://git.yoctoproject.org/wic.git;branch=master;protocol=https"

(To repeat what was said during tech/review call)
Git tags in the repo for the wic versions and a ";tag=${PV}" appended to
SRC_URI would be nice (at least for the 0.3.0).

Thanks!

> +SRCREV = "79e2b06a1f9c97decdaf44f0806dbf3cc1e86bf9"
> +
> +inherit python_hatchling
> +
> +RDEPENDS:${PN} += " \
> +    python3-core \
> +    python3-json \
> +    python3-logging \
> +    python3-misc \
> +    "
> +
> +BBCLASSEXTEND = "native nativesdk"


-- 
Yoann Congal
Smile ECS



  reply	other threads:[~2026-04-07 15:49 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-03 18:35 [PATCH v9 0/5] standalone wic Trevor Woerner
2026-04-03 18:35 ` [PATCH v9 1/5] wic: add recipe Trevor Woerner
2026-04-07 15:48   ` Yoann Congal [this message]
2026-04-03 18:35 ` [PATCH v9 2/5] oe-selftest/cases/wic.py: update WicTestCase Trevor Woerner
2026-04-03 18:35 ` [PATCH v9 3/5] selftest/cases/wic.py: remove test_sparse_copy Trevor Woerner
2026-04-03 18:35 ` [PATCH v9 4/5] wic: move canned *wks files Trevor Woerner
2026-04-03 21:13   ` [OE-core] " Richard Purdie
2026-04-03 22:23     ` Trevor Woerner
2026-04-04  7:27       ` Richard Purdie
2026-04-04 15:46         ` Trevor Woerner
2026-04-04 18:19           ` Trevor Woerner
2026-04-04 18:36           ` Richard Purdie
2026-04-04 20:38             ` Trevor Woerner
2026-04-05  9:17               ` Richard Purdie
2026-04-05 12:04                 ` Trevor Woerner
2026-04-05 14:16                   ` Richard Purdie
2026-04-05 15:22                     ` Trevor Woerner
     [not found]   ` <18A2F52EC877AF22.657799@lists.openembedded.org>
2026-04-03 21:37     ` Richard Purdie
2026-04-03 18:35 ` [PATCH v9 5/5] wic: remove to standalone repository Trevor Woerner
2026-04-18 21:56   ` Vincent Davis Jr
2026-04-19 21:25     ` [OE-core] " Trevor Woerner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DHN1HR17CNRM.1SPHVOOASAQ0G@smile.fr \
    --to=yoann.congal@smile.fr \
    --cc=bruce.ashfield@gmail.com \
    --cc=mark.hatle@kernel.crashing.org \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=twoerner@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox