Add a recipe to pull in the newly-externalized wic utility. Add wic to the list of native wic-tools, and make it a dependency of the image bbclass for wic images.
Add some bitbake variables to the default list of WICVARS that will likely be needed in the environment file when invoking wic. Signed-off-by: Trevor Woerner <[email protected]> --- 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, 24 insertions(+), 2 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 f2fd00e6d7ec..a81f9e370aaf 100644 --- a/meta/classes-recipe/image_types_wic.bbclass +++ b/meta/classes-recipe/image_types_wic.bbclass @@ -39,6 +39,8 @@ WICVARS ?= "\ STAGING_DIR_HOST \ STAGING_LIBDIR \ TARGET_SYS \ + TOPDIR \ + WIC_SECTOR_SIZE \ " inherit_defer ${@bb.utils.contains('INITRAMFS_IMAGE_BUNDLE', '1', 'kernel-artifact-names', '', d)} @@ -118,7 +120,7 @@ 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 e830648945f3..22f974cae890 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -885,7 +885,8 @@ RECIPE_MAINTAINER:pn-weston = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER:pn-weston-init = "Denys Dmytriyenko <[email protected]>" RECIPE_MAINTAINER:pn-wget = "Yi Zhao <[email protected]>" RECIPE_MAINTAINER:pn-which = "Unassigned <[email protected]>" -RECIPE_MAINTAINER:pn-wic-tools = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-wic = "Trevor Woerner <[email protected]>" +RECIPE_MAINTAINER:pn-wic-tools = "Trevor Woerner <[email protected]>" RECIPE_MAINTAINER:pn-wireless-regdb = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-wpa-supplicant = "Unassigned <[email protected]>" RECIPE_MAINTAINER:pn-wpebackend-fdo = "Unassigned <[email protected]>" 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..f0c58f527c70 --- /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://github.com/twoerner/wic"; +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.GPL-2.0-only;md5=4ee23c52855c222cba72583d301d2338" + +SRC_URI = "git://github.com/twoerner/wic.git;branch=master;protocol=https" +SRCREV = "c9305099546888d17b33c16e98bb2012e36d734a" + +inherit python_hatchling + +RDEPENDS:${PN} += " \ + python3-core \ + python3-json \ + python3-logging \ + python3-misc \ + " + +BBCLASSEXTEND = "native nativesdk" -- 2.51.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#230354): https://lists.openembedded.org/g/openembedded-core/message/230354 Mute This Topic: https://lists.openembedded.org/mt/117595869/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
