From 1add68e4d6150e3038609d8ce7e3cff28fe8fbb8 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 25 Aug 2017 23:12:26 +0300 Subject: wic: extend list of used tools Added sfdisk, e2fsck, mkswap, resize2fs, mkdosfs to the list of used tools in Disk class. They're going to be used in 'wic write' implementation. Added dependency to util-linux to wic-tools to ensure that sfdisk and mkswap are available from wic-tools native sysroot. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- meta/recipes-core/meta/wic-tools.bb | 3 ++- scripts/lib/wic/engine.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb index 428befe862..57dd37a440 100644 --- a/meta/recipes-core/meta/wic-tools.bb +++ b/meta/recipes-core/meta/wic-tools.bb @@ -5,7 +5,8 @@ LICENSE = "MIT" DEPENDS = "\ parted-native syslinux-native gptfdisk-native dosfstools-native \ mtools-native bmap-tools-native grub-efi-native cdrtools-native \ - btrfs-tools-native squashfs-tools-native pseudo-native e2fsprogs-native \ + btrfs-tools-native squashfs-tools-native pseudo-native \ + e2fsprogs-native util-linux-native \ " DEPENDS_append_x86 = " syslinux grub-efi systemd-boot" DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot" diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 9f2e87f88b..4ffb08d1c8 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -276,7 +276,8 @@ class Disk: def __getattr__(self, name): """Get path to the executable in a lazy way.""" - if name in ("mdir", "mcopy", "mdel", "mdeltree"): + if name in ("mdir", "mcopy", "mdel", "mdeltree", "sfdisk", "e2fsck", + "resize2fs", "mkswap", "mkdosfs"): aname = "_%s" % name if aname not in self.__dict__: setattr(self, aname, find_executable(name, self.paths)) -- cgit 1.2.3-korg