Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 443A3EB64DA for ; Fri, 14 Jul 2023 04:28:51 +0000 (UTC) Subject: [kirkstone][PATCH] wic: Add dependencies for erofs-utils To: openembedded-core@lists.openembedded.org From: "Heiko" X-Originating-Location: Papenburg, Lower Saxony, DE (84.140.29.160) X-Originating-Platform: Windows Chrome 114 User-Agent: GROUPS.IO Web Poster MIME-Version: 1.0 Date: Thu, 13 Jul 2023 21:28:50 -0700 Message-ID: Content-Type: multipart/alternative; boundary="x6F7iEj9S4XrLHan5nwO" List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Jul 2023 04:28:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184251 --x6F7iEj9S4XrLHan5nwO Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From 2d8164ac97277c344bc7c9e11f0ed78235726bda Mon Sep 17 00:00:00 2001 From: Heiko Thole 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. Signed-off-by: Heiko Thole --- meta/classes/image_types_wic.bbclass | 2 +- meta/recipes-core/meta/wic-tools.bb=C2=A0 | 2 +- scripts/lib/wic/misc.py=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 1= + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_type= s_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] +=3D "do_deploy" do_image_wic[deptask] +=3D "do_image_complete" WKS_FILE_DEPENDS_DEFAULT =3D '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86= _64', 'i686' ], "syslinux-native", "",d)}' -WKS_FILE_DEPENDS_DEFAULT +=3D "bmap-tools-native cdrtools-native btrfs-too= ls-native squashfs-tools-native e2fsprogs-native" +WKS_FILE_DEPENDS_DEFAULT +=3D "bmap-tools-native cdrtools-native btrfs-too= ls-native squashfs-tools-native e2fsprogs-native erofs-utils-native" # Unified kernel images need objcopy WKS_FILE_DEPENDS_DEFAULT +=3D "virtual/${MLPREFIX}${TARGET_PREFIX}binutils" WKS_FILE_DEPENDS_BOOTLOADERS =3D "" diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/w= ic-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 =3D "\ parted-native gptfdisk-native dosfstools-native \ mtools-native bmap-tools-native grub-native cdrtools-native \ btrfs-tools-native squashfs-tools-native pseudo-native \ -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0e2fsprogs-native util-linux-nativ= e tar-native \ +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0e2fsprogs-native util-linux-nativ= e tar-native erofs-utils-native \ virtual/${TARGET_PREFIX}binutils \ " DEPENDS:append:x86 =3D " 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 =3D {"bmaptool": "bmap-tools", "mkdosfs": "dosfstools", "mkisofs": "cdrtools", "mkfs.btrfs": "btrfs-tools", +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "mkfs.erofs= ": "erofs-utils", "mkfs.ext2": "e2fsprogs", "mkfs.ext3": "e2fsprogs", "mkfs.ext4": "e2fsprogs", -- 2.41.0 --x6F7iEj9S4XrLHan5nwO Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable
From 2d8164ac97277c344bc7c9e11f0ed78235726bda Mon Sep 17 00:00:00 2001=
From: Heiko Thole <heiko.thole@entwicklung.eq-3.de>
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 pac= kage 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] +=3D "do_deploy"
 do_image_wic[deptask] +=3D "do_image_complete"
 
 WKS_FILE_DEPENDS_DEFAULT =3D '${@bb.utils.contains_any("BUILD_AR= CH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}'
-WKS_FILE_DEPENDS_DEFAULT +=3D "bmap-tools-native cdrtools-native btrf= s-tools-native squashfs-tools-native e2fsprogs-native"
+WKS_FILE_DEPENDS_DEFAULT +=3D "bmap-tools-native cdrtools-native btrf= s-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native"
 # Unified kernel images need objcopy
 WKS_FILE_DEPENDS_DEFAULT +=3D "virtual/${MLPREFIX}${TARGET_PREFI= X}binutils"
 WKS_FILE_DEPENDS_BOOTLOADERS =3D ""
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/m= eta/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 =3D "\
            parted-native gptfdisk-nativ= e dosfstools-native \
            mtools-native bmap-tools-nat= ive 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}binu= tils \
            "
 DEPENDS:append:x86 =3D " syslinux-native syslinux grub-efi syste= md-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 =3D {"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
 
--x6F7iEj9S4XrLHan5nwO--