public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 07/25] engine: implement listing wic images
Date: Thu,  8 Jun 2017 19:12:49 +0300	[thread overview]
Message-ID: <c8b238f27476e37fb864bd1ba27b6c0608f6175a.1496938139.git.ed.bartosh@linux.intel.com> (raw)
In-Reply-To: <cover.1496938139.git.ed.bartosh@linux.intel.com>

Implemented 'wic ls' functionality:
 - list image partitions
 - list directory content of vfat partitions

[YOCTO #11283]

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/engine.py | 84 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 82 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index e58beb7..95c8d1c 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -30,10 +30,15 @@
 
 import logging
 import os
+import tempfile
+
+from collections import namedtuple, OrderedDict
+from distutils.spawn import find_executable
 
 from wic import WicError
+from wic.filemap import sparse_copy
 from wic.pluginbase import PluginMgr
-from wic.utils.misc import get_bitbake_var
+from wic.utils.misc import get_bitbake_var, exec_cmd
 
 logger = logging.getLogger('wic')
 
@@ -225,9 +230,84 @@ def wic_list(args, scripts_path):
 
     return False
 
+
+class Disk:
+    def __init__(self, imagepath, native_sysroot):
+        self.imagepath = imagepath
+        self.native_sysroot = native_sysroot
+        self._partitions = None
+        self._mdir = None
+        self._partimages = {}
+
+        # find parted
+        self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/"
+        if native_sysroot:
+            for path in self.paths.split(':'):
+                self.paths = "%s%s:%s" % (native_sysroot, path, self.paths)
+
+        self.parted = find_executable("parted", self.paths)
+        if not self.parted:
+            raise WicError("Can't find executable parted")
+
+    def __del__(self):
+        for path in self._partimages.values():
+            os.unlink(path)
+
+    @property
+    def partitions(self):
+        if self._partitions is None:
+            self._partitions = OrderedDict()
+            out = exec_cmd("%s -sm %s unit B print" % (self.parted, self.imagepath))
+            parttype = namedtuple("Part", "pnum start end size fstype")
+            for line in out.splitlines()[2:]:
+                pnum, start, end, size, fstype = line.split(':')[:5]
+                partition = parttype(pnum, int(start[:-1]), int(end[:-1]),
+                                     int(size[:-1]), fstype)
+                self._partitions[pnum] = partition
+
+        return self._partitions
+
+    @property
+    def mdir(self):
+        if self._mdir is None:
+            self._mdir = find_executable("mdir", self.paths)
+            if not self._mdir:
+                raise WicError("Can't find executable mdir")
+        return self._mdir
+
+    def _get_part_image(self, pnum):
+        if pnum not in self.partitions:
+            raise WicError("Partition %s is not in the image")
+        part = self.partitions[pnum]
+        if not part.fstype.startswith("fat"):
+            raise WicError("Not supported fstype: {}".format(part.fstype))
+        if pnum not in self._partimages:
+            tmpf = tempfile.NamedTemporaryFile(prefix="wic-part")
+            dst_fname = tmpf.name
+            tmpf.close()
+            sparse_copy(self.imagepath, dst_fname, skip=part.start, length=part.size)
+            self._partimages[pnum] = dst_fname
+
+        return self._partimages[pnum]
+
+    def dir(self, pnum, path):
+        return exec_cmd("{} -i {} ::{}".format(self.mdir,
+                                               self._get_part_image(pnum),
+                                               path))
+
 def wic_ls(args, native_sysroot):
     """List contents of partitioned image or vfat partition."""
-    pass
+    disk = Disk(args.path.image, native_sysroot)
+    if not args.path.part:
+        if disk.partitions:
+            print('Num     Start        End          Size      Fstype')
+            for part in disk.partitions.values():
+                print("{:2s}  {:12d} {:12d} {:12d}  {}".format(\
+                          part.pnum, part.start, part.end,
+                          part.size, part.fstype))
+    else:
+        path = args.path.path or '/'
+        print(disk.dir(args.path.part, path))
 
 def find_canned(scripts_path, file_name):
     """
-- 
2.1.4



  parent reply	other threads:[~2017-06-08 16:15 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-08 16:12 [PATCH 00/25] #11283 wic ls & cp & rm Ed Bartosh
2017-06-08 16:12 ` [PATCH 01/25] filemap: fix skip logic Ed Bartosh
2017-06-08 16:12 ` [PATCH 02/25] filemap: add parameter 'length' to sparse_copy Ed Bartosh
2017-06-08 16:12 ` [PATCH 03/25] bootimg-pcbios: make boot image file unique Ed Bartosh
2017-06-08 16:12 ` [PATCH 04/25] wic: add wic_init_parser_ls Ed Bartosh
2017-06-08 16:12 ` [PATCH 05/25] wic: add help and usage content for 'wic ls' Ed Bartosh
2017-06-08 16:12 ` [PATCH 06/25] wic: add 'wic ls' command Ed Bartosh
2017-06-08 16:12 ` Ed Bartosh [this message]
2017-06-08 16:12 ` [PATCH 08/25] selftest: add new test case test_wic_ls Ed Bartosh
2017-06-08 16:12 ` [PATCH 09/25] wic: add wic_init_parser_cp Ed Bartosh
2017-06-08 16:12 ` [PATCH 10/25] wic: add help and usage content for 'wic cp' Ed Bartosh
2017-06-08 16:12 ` [PATCH 11/25] wic: add 'wic cp' command Ed Bartosh
2017-06-08 16:12 ` [PATCH 12/25] wic: add Disk._prop helper Ed Bartosh
2017-06-08 16:12 ` [PATCH 13/25] wic: add mcopy property Ed Bartosh
2017-06-08 16:12 ` [PATCH 14/25] filemap: change signature of sparse_copy function Ed Bartosh
2017-06-08 16:12 ` [PATCH 15/25] filemap: check if dest is written for every block Ed Bartosh
2017-06-08 16:12 ` [PATCH 16/25] filemap: calculate dst size correctly Ed Bartosh
2017-06-08 16:12 ` [PATCH 17/25] wic: add Disk._put_part_image method Ed Bartosh
2017-06-08 16:13 ` [PATCH 18/25] wic: fully implement 'wic cp' Ed Bartosh
2017-06-08 16:13 ` [PATCH 19/25] selftest: add test_wic_cp test case Ed Bartosh
2017-06-08 16:13 ` [PATCH 20/25] wic: add wic_init_parser_rm Ed Bartosh
2017-06-08 16:13 ` [PATCH 21/25] wic: add help and usage content for 'wic rm' Ed Bartosh
2017-06-08 16:13 ` [PATCH 22/25] wic: add 'wic rm' command Ed Bartosh
2017-06-08 16:13 ` [PATCH 23/25] wic: implement removing files Ed Bartosh
2017-06-08 16:13 ` [PATCH 24/25] wic: implement removing directories Ed Bartosh
2017-06-08 16:13 ` [PATCH 25/25] selftest: add test_wic_rm test case Ed Bartosh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c8b238f27476e37fb864bd1ba27b6c0608f6175a.1496938139.git.ed.bartosh@linux.intel.com \
    --to=ed.bartosh@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox