summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-08-25 23:12:26 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-27 22:29:46 +0100
commit1add68e4d6150e3038609d8ce7e3cff28fe8fbb8 (patch)
tree05205c5ae041f7b184528a9b9bd87918ba982b99
parent7cffcdcfdf4f8934d212740a6d7cf136911ebdac (diff)
downloadopenembedded-core-contrib-1add68e4d6150e3038609d8ce7e3cff28fe8fbb8.tar.gz
openembedded-core-contrib-1add68e4d6150e3038609d8ce7e3cff28fe8fbb8.tar.bz2
openembedded-core-contrib-1add68e4d6150e3038609d8ce7e3cff28fe8fbb8.zip
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 <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/meta/wic-tools.bb3
-rw-r--r--scripts/lib/wic/engine.py3
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))