* [PATCH] wic: Add dependencies for erofs-utils
@ 2023-07-17 4:44 Heiko Thole
2023-07-17 13:49 ` [OE-core] " Alexandre Belloni
0 siblings, 1 reply; 5+ messages in thread
From: Heiko Thole @ 2023-07-17 4:44 UTC (permalink / raw)
To: openembedded-core; +Cc: Heiko Thole
In order to build erofs filesystems, wic must have the erofs-utils package installed into its sysroot.
Signed-off-by: Heiko Thole <heiko.thole@entwicklung.eq-3.de>
---
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(-)
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index 6453dd1b74..8497916d48 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -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 = ""
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb
index daaf3ea576..9282d36a4d 100644
--- a/meta/recipes-core/meta/wic-tools.bb
+++ b/meta/recipes-core/meta/wic-tools.bb
@@ -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"
diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
index a8aab6c524..2b90821b30 100644
--- a/scripts/lib/wic/misc.py
+++ b/scripts/lib/wic/misc.py
@@ -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
eQ-3 Entwicklung GmbH, Maiburger Str. 36, 26789 Leer
Geschäftsführer: Prof. Heinz-G. Redeker
Registergericht: Amtsgericht Aurich, HRB 110388
eQ-3 AG, Maiburger Str. 29, 26789 Leer
Vorstand: Prof. Heinz-G. Redeker (Vorsitzender), Helga Redeker
Vorsitzende des Aufsichtsrats: Irmgard Keplin
Registergericht: Amtsgericht Aurich, HRB 200335
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [OE-core] [PATCH] wic: Add dependencies for erofs-utils
2023-07-17 4:44 [PATCH] wic: Add dependencies for erofs-utils Heiko Thole
@ 2023-07-17 13:49 ` Alexandre Belloni
2023-07-17 13:55 ` Heiko
0 siblings, 1 reply; 5+ messages in thread
From: Alexandre Belloni @ 2023-07-17 13:49 UTC (permalink / raw)
To: Heiko; +Cc: openembedded-core
Hello,
Commit 68e364340c43 ("wic: Add dependencies for erofs-utils") has
already done so for a while, maybe you want a backport instead?
On 17/07/2023 06:44:49+0200, Heiko wrote:
> In order to build erofs filesystems, wic must have the erofs-utils package installed into its sysroot.
>
> Signed-off-by: Heiko Thole <heiko.thole@entwicklung.eq-3.de>
> ---
> 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(-)
>
> diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
> index 6453dd1b74..8497916d48 100644
> --- a/meta/classes/image_types_wic.bbclass
> +++ b/meta/classes/image_types_wic.bbclass
> @@ -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 = ""
> diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb
> index daaf3ea576..9282d36a4d 100644
> --- a/meta/recipes-core/meta/wic-tools.bb
> +++ b/meta/recipes-core/meta/wic-tools.bb
> @@ -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"
> diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
> index a8aab6c524..2b90821b30 100644
> --- a/scripts/lib/wic/misc.py
> +++ b/scripts/lib/wic/misc.py
> @@ -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
>
> eQ-3 Entwicklung GmbH, Maiburger Str. 36, 26789 Leer
> Gesch?ftsf?hrer: Prof. Heinz-G. Redeker
> Registergericht: Amtsgericht Aurich, HRB 110388
> eQ-3 AG, Maiburger Str. 29, 26789 Leer
> Vorstand: Prof. Heinz-G. Redeker (Vorsitzender), Helga Redeker
> Vorsitzende des Aufsichtsrats: Irmgard Keplin
> Registergericht: Amtsgericht Aurich, HRB 200335
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#184427): https://lists.openembedded.org/g/openembedded-core/message/184427
> Mute This Topic: https://lists.openembedded.org/mt/100189195/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] wic: Add dependencies for erofs-utils
2023-07-17 13:49 ` [OE-core] " Alexandre Belloni
@ 2023-07-17 13:55 ` Heiko
2023-07-17 14:20 ` [OE-core] " Alexandre Belloni
0 siblings, 1 reply; 5+ messages in thread
From: Heiko @ 2023-07-17 13:55 UTC (permalink / raw)
To: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
Hello Alexandre,
I know. The patch is based on it.
I asked to cherrypick it. But Steve told me ( https://lists.openembedded.org/g/openembedded-core/message/184140 ) , that I should create a new patch.
Bye,
Heiko
[-- Attachment #2: Type: text/html, Size: 295 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [OE-core] [PATCH] wic: Add dependencies for erofs-utils
2023-07-17 13:55 ` Heiko
@ 2023-07-17 14:20 ` Alexandre Belloni
2023-07-17 14:25 ` Steve Sakoman
0 siblings, 1 reply; 5+ messages in thread
From: Alexandre Belloni @ 2023-07-17 14:20 UTC (permalink / raw)
To: Heiko; +Cc: openembedded-core
On 17/07/2023 06:55:42-0700, Heiko wrote:
> Hello Alexandre,
>
> I know. The patch is based on it.
>
> I asked to cherrypick it. But Steve told me ( https://lists.openembedded.org/g/openembedded-core/message/184140 ) , that I should create a new patch.
>
Please mark it for kirkstone then
> Bye,
> Heiko
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#184468): https://lists.openembedded.org/g/openembedded-core/message/184468
> Mute This Topic: https://lists.openembedded.org/mt/100189195/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [OE-core] [PATCH] wic: Add dependencies for erofs-utils
2023-07-17 14:20 ` [OE-core] " Alexandre Belloni
@ 2023-07-17 14:25 ` Steve Sakoman
0 siblings, 0 replies; 5+ messages in thread
From: Steve Sakoman @ 2023-07-17 14:25 UTC (permalink / raw)
To: alexandre.belloni; +Cc: Heiko, openembedded-core
On Mon, Jul 17, 2023 at 4:20 AM Alexandre Belloni via
lists.openembedded.org
<alexandre.belloni=bootlin.com@lists.openembedded.org> wrote:
>
> On 17/07/2023 06:55:42-0700, Heiko wrote:
> > Hello Alexandre,
> >
> > I know. The patch is based on it.
> >
> > I asked to cherrypick it. But Steve told me ( https://lists.openembedded.org/g/openembedded-core/message/184140 ) , that I should create a new patch.
> >
>
> Please mark it for kirkstone then
Yes, the patch subject should be something like: [oe-core] [kirkstone]
[PATCH] wic: Add dependencies for erofs-utils
No need to re-submit this time though, I've taken the patch into my test queue.
Steve
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-17 14:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-17 4:44 [PATCH] wic: Add dependencies for erofs-utils Heiko Thole
2023-07-17 13:49 ` [OE-core] " Alexandre Belloni
2023-07-17 13:55 ` Heiko
2023-07-17 14:20 ` [OE-core] " Alexandre Belloni
2023-07-17 14:25 ` Steve Sakoman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox