diff options
| -rw-r--r-- | meta/classes/image_types_wic.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-core/meta/wic-tools.bb | 2 | ||||
| -rw-r--r-- | 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 e3863c88a9..79f8d93b94 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" | |||
| 83 | do_image_wic[deptask] += "do_image_complete" | 83 | do_image_wic[deptask] += "do_image_complete" |
| 84 | 84 | ||
| 85 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' | 85 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' |
| 86 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" | 86 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native" |
| 87 | WKS_FILE_DEPENDS_BOOTLOADERS = "" | 87 | WKS_FILE_DEPENDS_BOOTLOADERS = "" |
| 88 | WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" | 88 | WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" |
| 89 | WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release" | 89 | WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release" |
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb index ba0916cb56..b9580d7e33 100644 --- a/meta/recipes-core/meta/wic-tools.bb +++ b/meta/recipes-core/meta/wic-tools.bb | |||
| @@ -6,7 +6,7 @@ DEPENDS = "\ | |||
| 6 | parted-native gptfdisk-native dosfstools-native \ | 6 | parted-native gptfdisk-native dosfstools-native \ |
| 7 | mtools-native bmap-tools-native grub-native cdrtools-native \ | 7 | mtools-native bmap-tools-native grub-native cdrtools-native \ |
| 8 | btrfs-tools-native squashfs-tools-native pseudo-native \ | 8 | btrfs-tools-native squashfs-tools-native pseudo-native \ |
| 9 | e2fsprogs-native util-linux-native tar-native\ | 9 | e2fsprogs-native util-linux-native tar-native erofs-utils-native \ |
| 10 | " | 10 | " |
| 11 | DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot" | 11 | DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot" |
| 12 | DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot" | 12 | DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot" |
diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py index 3e11822996..3bc165fd7d 100644 --- a/scripts/lib/wic/misc.py +++ b/scripts/lib/wic/misc.py | |||
| @@ -36,6 +36,7 @@ NATIVE_RECIPES = {"bmaptool": "bmap-tools", | |||
| 36 | "mkdosfs": "dosfstools", | 36 | "mkdosfs": "dosfstools", |
| 37 | "mkisofs": "cdrtools", | 37 | "mkisofs": "cdrtools", |
| 38 | "mkfs.btrfs": "btrfs-tools", | 38 | "mkfs.btrfs": "btrfs-tools", |
| 39 | "mkfs.erofs": "erofs-utils", | ||
| 39 | "mkfs.ext2": "e2fsprogs", | 40 | "mkfs.ext2": "e2fsprogs", |
| 40 | "mkfs.ext3": "e2fsprogs", | 41 | "mkfs.ext3": "e2fsprogs", |
| 41 | "mkfs.ext4": "e2fsprogs", | 42 | "mkfs.ext4": "e2fsprogs", |
