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:30:07 +0100
commitcee58f1d411e3321182f18bf2230aa5882178b1f (patch)
treecbc9a643cb872793e44f031a90d73ae4311f6e1d
parentbb1f418a618c3ef483495b9418e5b1fbcf92061e (diff)
downloadpoky-cee58f1d411e3321182f18bf2230aa5882178b1f.tar.gz
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. (From OE-Core rev: 1add68e4d6150e3038609d8ce7e3cff28fe8fbb8) 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"
5DEPENDS = "\ 5DEPENDS = "\
6 parted-native syslinux-native gptfdisk-native dosfstools-native \ 6 parted-native syslinux-native gptfdisk-native dosfstools-native \
7 mtools-native bmap-tools-native grub-efi-native cdrtools-native \ 7 mtools-native bmap-tools-native grub-efi-native cdrtools-native \
8 btrfs-tools-native squashfs-tools-native pseudo-native e2fsprogs-native \ 8 btrfs-tools-native squashfs-tools-native pseudo-native \
9 e2fsprogs-native util-linux-native \
9 " 10 "
10DEPENDS_append_x86 = " syslinux grub-efi systemd-boot" 11DEPENDS_append_x86 = " syslinux grub-efi systemd-boot"
11DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot" 12DEPENDS_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:
276 276
277 def __getattr__(self, name): 277 def __getattr__(self, name):
278 """Get path to the executable in a lazy way.""" 278 """Get path to the executable in a lazy way."""
279 if name in ("mdir", "mcopy", "mdel", "mdeltree"): 279 if name in ("mdir", "mcopy", "mdel", "mdeltree", "sfdisk", "e2fsck",
280 "resize2fs", "mkswap", "mkdosfs"):
280 aname = "_%s" % name 281 aname = "_%s" % name
281 if aname not in self.__dict__: 282 if aname not in self.__dict__:
282 setattr(self, aname, find_executable(name, self.paths)) 283 setattr(self, aname, find_executable(name, self.paths))