Skip to contentSkip to conversation

wic: Add dependencies for erofs-utils

PATCH In review Heiko 2 participants 2 messages Jul 14, 2023

lore
Share & tools
lore

Heiko

author
#0 lore raw

PATCH 1/1 wic: Add dependencies for erofs-utils

From 2d8164ac97277c344bc7c9e11f0ed78235726bda Mon Sep 17 00:00:00 2001
From: Heiko Thole <[email protected]>
Date: Wed, 12 Jul 2023 07:41:59 +0200
Subject: [kirkstone][PATCH] wic: Add dependencies for erofs-utils

In order to build erofs filesystems, wic must have the erofs-utils package installed into its sysroot.

---
meta/classes/image_types_wic.bbclass | 2 +-
meta/recipes-core/meta/wic-tools.bb  | 2 +-
scripts/lib/wic/misc.py              | 1 +

3 files changed, 3 insertions(+), 2 deletions(-)
meta/classes/image_types_wic.bbclass +0 -0
index 6453dd1b74..8497916d48 100644
@@ -83,7 +83,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 += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" +WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native" # Unified kernel images need objcopy
WKS_FILE_DEPENDS_DEFAULT += "virtual/${MLPREFIX}${TARGET_PREFIX}binutils"
WKS_FILE_DEPENDS_BOOTLOADERS = ""

meta/recipes-core/meta/wic-tools.bb +0 -0
index daaf3ea576..9282d36a4d 100644
@@ -6,7 +6,7 @@ DEPENDS = "\

parted-native gptfdisk-native dosfstools-native \
mtools-native bmap-tools-native grub-native cdrtools-native \
btrfs-tools-native squashfs-tools-native pseudo-native \
-           e2fsprogs-native util-linux-native tar-native \
+           e2fsprogs-native util-linux-native tar-native erofs-utils-native \
virtual/${TARGET_PREFIX}binutils \
"
DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot"

scripts/lib/wic/misc.py +0 -0
index a8aab6c524..2b90821b30 100644
@@ -36,6 +36,7 @@ NATIVE_RECIPES = {"bmaptool": "bmap-tools",

"mkdosfs": "dosfstools",
"mkisofs": "cdrtools",
"mkfs.btrfs": "btrfs-tools",
+                  "mkfs.erofs": "erofs-utils",
"mkfs.ext2": "e2fsprogs",
"mkfs.ext3": "e2fsprogs",
"mkfs.ext4": "e2fsprogs",
--
2.41.0

#1 lore raw

I am not able to apply this patch, something is broken in the formatting.

Please see below link for info on creating and submitting a patch:

https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

Steve

Quoted 65 lines · Heiko

From 2d8164ac97277c344bc7c9e11f0ed78235726bda Mon Sep 17 00:00:00 2001
From: Heiko Thole <[email protected]>
Date: Wed, 12 Jul 2023 07:41:59 +0200
Subject: [kirkstone][PATCH] wic: Add dependencies for erofs-utils

In order to build erofs filesystems, wic must have the erofs-utils package installed into its sysroot.

---
 meta/classes/image_types_wic.bbclass | 2 +-
 meta/recipes-core/meta/wic-tools.bb  | 2 +-
 scripts/lib/wic/misc.py              | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
meta/classes/image_types_wic.bbclass +1 -1
index 6453dd1b74..8497916d48 100644
@@ -83,7 +83,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 += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native"
+WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native"
 # Unified kernel images need objcopy
 WKS_FILE_DEPENDS_DEFAULT += "virtual/${MLPREFIX}${TARGET_PREFIX}binutils"
 WKS_FILE_DEPENDS_BOOTLOADERS = ""
meta/recipes-core/meta/wic-tools.bb +1 -1
index daaf3ea576..9282d36a4d 100644
@@ -6,7 +6,7 @@ DEPENDS = "\
            parted-native gptfdisk-native dosfstools-native \
            mtools-native bmap-tools-native grub-native cdrtools-native \
            btrfs-tools-native squashfs-tools-native pseudo-native \
-           e2fsprogs-native util-linux-native tar-native \
+           e2fsprogs-native util-linux-native tar-native erofs-utils-native \
            virtual/${TARGET_PREFIX}binutils \
            "
 DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot"
scripts/lib/wic/misc.py +1 -1
index a8aab6c524..2b90821b30 100644
@@ -36,6 +36,7 @@ NATIVE_RECIPES = {"bmaptool": "bmap-tools",
                   "mkdosfs": "dosfstools",
                   "mkisofs": "cdrtools",
                   "mkfs.btrfs": "btrfs-tools",
+                  "mkfs.erofs": "erofs-utils",
                   "mkfs.ext2": "e2fsprogs",
                   "mkfs.ext3": "e2fsprogs",
                   "mkfs.ext4": "e2fsprogs",
--

2.41.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#184251): https://lists.openembedded.org/g/openembedded-core/message/184251
Mute This Topic: https://lists.openembedded.org/mt/100135410/3620601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-