[PATCH 0/9] #10619: refactor wic codebase (continuation)

[PATCH 0/9] #10619: refactor wic codebase (continuation)

[Ed Bartosh]

Hi,

This patchset simplifies interfaces of DirectPlugin and underlying
set of APIs located in partitionedfs module. It also removes one of
two different structures for partitioning info.

The following changes since commit a624cf7f95c8cf4ff764cc997fd1db4601b97dcc:

  oeqa/selftest/pkgdata: use m4 instead of bash (2017-02-07 14:50:10 +0000)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ed/wic/wip
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/wip

Ed Bartosh (9):
  wic: partitionedfs: merged __format_disks and create
  wic: partitionedfs: get rid of __add_partition
  wic: partitionedfs: rename __create_partition and __add_disk
  wic: direct: get rid of _get_parts getter
  wic: use the same partition object in direct and partitionedfs
  wic: make sure layout_partitions is called once
  wic: direct: remove unused plugin attributes
  wic: direct: remove unused import
  wic: remove unused argument scripts_path

 scripts/lib/wic/engine.py                |   7 +-
 scripts/lib/wic/partition.py             |   2 +
 scripts/lib/wic/plugins/imager/direct.py |  54 ++-------
 scripts/lib/wic/utils/partitionedfs.py   | 197 ++++++++++++-------------------
 scripts/wic                              |   2 +-
 5 files changed, 95 insertions(+), 167 deletions(-)

--
Regards,
Ed

[PATCH 1/9] wic: partitionedfs: merged __format_disks and create

[Ed Bartosh]

Private method __format_disks is called only from create
method making the code less readable. Merged the code
into one method.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/utils/partitionedfs.py | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 5fc5765..08ae52f 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -238,7 +238,11 @@ class Image():
 
         return exec_native_cmd(cmd, self.native_sysroot)
 
-    def __format_disks(self):
+    def create(self):
+        for dev in self.disks:
+            disk = self.disks[dev]
+            disk['disk'].create()
+
         self.layout_partitions()
 
         for dev in self.disks:
@@ -375,12 +379,3 @@ class Image():
                 partimage = image_file + '.p%d' % part['num']
                 os.rename(source, partimage)
                 self.partimages.append(partimage)
-
-    def create(self):
-        for dev in self.disks:
-            disk = self.disks[dev]
-            disk['disk'].create()
-
-        self.__format_disks()
-
-        return
-- 
2.1.4

[PATCH 2/9] wic: partitionedfs: get rid of __add_partition

[Ed Bartosh]

3 lines long private method __add_partition is called only
from add_partition method. Merged them together to increase
readability.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/utils/partitionedfs.py | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 08ae52f..2cfdf70 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -80,15 +80,6 @@ class Image():
         self.disks[disk_name]['disk'] = disk_obj
         self.disks[disk_name]['identifier'] = identifier
 
-    def __add_partition(self, part):
-        """ This is a helper function for 'add_partition()' which adds a
-        partition to the internal list of partitions. """
-
-        assert not self._partitions_layed_out
-
-        self.partitions.append(part)
-        self.__add_disk(part['disk_name'])
-
     def add_partition(self, size, disk_name, mountpoint, source_file=None, fstype=None,
                       label=None, fsopts=None, boot=False, align=None, no_table=False,
                       part_type=None, uuid=None, system_id=None):
@@ -117,7 +108,10 @@ class Image():
                 'uuid': uuid, # Partition UUID
                 'system_id': system_id} # Partition system id
 
-        self.__add_partition(part)
+        assert not self._partitions_layed_out
+
+        self.partitions.append(part)
+        self._add_disk(part['disk_name'])
 
     def layout_partitions(self, ptable_format="msdos"):
         """ Layout the partitions, meaning calculate the position of every
-- 
2.1.4

[PATCH 3/9] wic: partitionedfs: rename __create_partition and __add_disk

[Ed Bartosh]

Renamed private methods with leading double underscores:
__create_partition -> _create_partition
__add_disk -> _add_disk

There is no point to have those names mangled, one underscore
is enough.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/utils/partitionedfs.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 2cfdf70..b7ab1d5 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -49,7 +49,7 @@ class Image():
         self._partitions_layed_out = False
         self.native_sysroot = native_sysroot
 
-    def __add_disk(self, disk_name):
+    def _add_disk(self, disk_name):
         """ Add a disk 'disk_name' to the internal list of disks. Note,
         'disk_name' is the name of the disk in the target system
         (e.g., sdb). """
@@ -76,7 +76,7 @@ class Image():
         can be added. In case of multiple disks, disk partitions have to be
         added for each disk separately with 'add_partition()". """
 
-        self.__add_disk(disk_name)
+        self._add_disk(disk_name)
         self.disks[disk_name]['disk'] = disk_obj
         self.disks[disk_name]['identifier'] = identifier
 
@@ -217,7 +217,7 @@ class Image():
 
             disk['min_size'] *= self.sector_size
 
-    def __create_partition(self, device, parttype, fstype, start, size):
+    def _create_partition(self, device, parttype, fstype, start, size):
         """ Create a partition on an image described by the 'device' object. """
 
         # Start is included to the size so we need to substract one from the end.
@@ -272,9 +272,9 @@ class Image():
                 # starts a sector before the first logical partition,
                 # add a sector at the back, so that there is enough
                 # room for all logical partitions.
-                self.__create_partition(disk['disk'].device, "extended",
-                                        None, part['start'] - 1,
-                                        disk['offset'] - part['start'] + 1)
+                self._create_partition(disk['disk'].device, "extended",
+                                       None, part['start'] - 1,
+                                       disk['offset'] - part['start'] + 1)
 
             if part['fstype'] == "swap":
                 parted_fs_type = "linux-swap"
@@ -297,8 +297,8 @@ class Image():
                             part['mountpoint'])
                 part['size'] -= 1
 
-            self.__create_partition(disk['disk'].device, part['type'],
-                                    parted_fs_type, part['start'], part['size'])
+            self._create_partition(disk['disk'].device, part['type'],
+                                   parted_fs_type, part['start'], part['size'])
 
             if part['part_type']:
                 msger.debug("partition %d: set type UID to %s" % \
-- 
2.1.4

[PATCH 4/9] wic: direct: get rid of _get_parts getter

[Ed Bartosh]

Replaced _get_parts getter with direct attribute
access to self.parts

Removed code that implicitly created partition
if there are no partitions mentioned in .wks file

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/plugins/imager/direct.py | 36 +++++++-------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index ae420a6..71ffc36 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -94,6 +94,7 @@ class DirectPlugin(ImagerPlugin):
         self._disk_format = "direct"
         self._disk_names = []
         self.ptable_format = self.ks.bootloader.ptable
+        self.parts = self.ks.partitions
 
     def do_create(self):
         """
@@ -140,7 +141,7 @@ class DirectPlugin(ImagerPlugin):
         with open(fstab_path) as fstab:
             fstab_lines = fstab.readlines()
 
-        if self._update_fstab(fstab_lines, self._get_parts()):
+        if self._update_fstab(fstab_lines, self.parts):
             shutil.copyfile(fstab_path, fstab_path + ".orig")
 
             with open(fstab_path, "w") as fstab:
@@ -179,22 +180,6 @@ class DirectPlugin(ImagerPlugin):
         """
         self.bootimg_dir = bootimg_dir
 
-    def _get_parts(self):
-        if not self.ks:
-            raise CreatorError("Failed to get partition info, "
-                               "please check your kickstart setting.")
-
-        # Set a default partition if no partition is given out
-        if not self.ks.partitions:
-            partstr = "part / --size 1900 --ondisk sda --fstype=ext3"
-            args = partstr.split()
-            part = self.ks.parse(args[1:])
-            if part not in self.ks.partitions:
-                self.ks.partitions.append(part)
-
-        # partitions list from kickstart file
-        return self.ks.partitions
-
     def _full_path(self, path, name, extention):
         """ Construct full file path to a file we generate. """
         return os.path.join(path, "%s-%s.%s" % (self.name, name, extention))
@@ -208,12 +193,10 @@ class DirectPlugin(ImagerPlugin):
         filesystems from the artifacts directly and combine them into
         a partitioned image.
         """
-        parts = self._get_parts()
-
         self._image = Image(self.native_sysroot)
 
         disk_ids = {}
-        for num, part in enumerate(parts, 1):
+        for num, part in enumerate(self.parts, 1):
             # as a convenience, set source to the boot partition source
             # instead of forcing it to be set via bootloader --source
             if not self.ks.bootloader.source and part.mountpoint == "/boot":
@@ -227,11 +210,11 @@ class DirectPlugin(ImagerPlugin):
                     if part.disk not in disk_ids:
                         disk_ids[part.disk] = int.from_bytes(os.urandom(4), 'little')
                     disk_id = disk_ids[part.disk]
-                    part.uuid = '%0x-%02d' % (disk_id, self._get_part_num(num, parts))
+                    part.uuid = '%0x-%02d' % (disk_id, self._get_part_num(num, self.parts))
 
         fstab_path = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR"))
 
-        for part in parts:
+        for part in self.parts:
             # get rootfs size from bitbake variable if it's not set in .ks file
             if not part.size:
                 # and if rootfs name is specified for the partition
@@ -323,8 +306,6 @@ class DirectPlugin(ImagerPlugin):
         """
         msg = "The new image(s) can be found here:\n"
 
-        parts = self._get_parts()
-
         for disk_name in self._image.disks:
             extension = "direct" + {"gzip": ".gz",
                                     "bzip2": ".bz2",
@@ -334,7 +315,7 @@ class DirectPlugin(ImagerPlugin):
             msg += '  %s\n\n' % full_path
 
         msg += 'The following build artifacts were used to create the image(s):\n'
-        for part in parts:
+        for part in self.parts:
             if part.rootfs_dir is None:
                 continue
             if part.mountpoint == '/':
@@ -357,14 +338,13 @@ class DirectPlugin(ImagerPlugin):
 
         Assume partition order same as in wks
         """
-        parts = self._get_parts()
-        for num, part in enumerate(parts, 1):
+        for num, part in enumerate(self.parts, 1):
             if part.mountpoint == "/":
                 if part.uuid:
                     return "PARTUUID=%s" % part.uuid
                 else:
                     suffix = 'p' if part.disk.startswith('mmcblk') else ''
-                    pnum = self._get_part_num(num, parts)
+                    pnum = self._get_part_num(num, self.parts)
                     return "/dev/%s%s%-d" % (part.disk, suffix, pnum)
 
     def cleanup(self):
-- 
2.1.4

[PATCH 5/9] wic: use the same partition object in direct and partitionedfs

[Ed Bartosh]

Partition attributes were copied to the dictionary in partitionedfs
code, which makes the code hard to follow.

Used partition object passed from direct.py module as is in
partitionedfs.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/partition.py             |   2 +
 scripts/lib/wic/plugins/imager/direct.py |   9 +-
 scripts/lib/wic/utils/partitionedfs.py   | 158 ++++++++++++++-----------------
 3 files changed, 73 insertions(+), 96 deletions(-)

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 69b369c..754ad75 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -38,12 +38,14 @@ class Partition():
         self.active = args.active
         self.align = args.align
         self.disk = args.disk
+        self.device = None
         self.extra_space = args.extra_space
         self.fsopts = args.fsopts
         self.fstype = args.fstype
         self.label = args.label
         self.mountpoint = args.mountpoint
         self.no_table = args.no_table
+        self.num = None
         self.overhead_factor = args.overhead_factor
         self.part_type = args.part_type
         self.rootfs_dir = args.rootfs_dir
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 71ffc36..663655a 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -237,14 +237,7 @@ class DirectPlugin(ImagerPlugin):
             part.prepare(self, self.workdir, self.oe_builddir, self.rootfs_dir,
                          self.bootimg_dir, self.kernel_dir, self.native_sysroot)
 
-
-            self._image.add_partition(part.disk_size, part.disk,
-                                      part.mountpoint, part.source_file,
-                                      part.fstype, part.label,
-                                      fsopts=part.fsopts, boot=part.active,
-                                      align=part.align, no_table=part.no_table,
-                                      part_type=part.part_type, uuid=part.uuid,
-                                      system_id=part.system_id)
+            self._image.add_partition(part)
 
         if fstab_path:
             shutil.move(fstab_path + ".orig", fstab_path)
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index b7ab1d5..fb5c0c2 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -71,47 +71,29 @@ class Image():
                  'ptable_format': "msdos", # Partition table format
                  'identifier': None} # Disk system identifier
 
-    def add_disk(self, disk_name, disk_obj, identifier):
+    def add_disk(self, name, disk_obj, identifier):
         """ Add a disk object which have to be partitioned. More than one disk
         can be added. In case of multiple disks, disk partitions have to be
         added for each disk separately with 'add_partition()". """
 
-        self._add_disk(disk_name)
-        self.disks[disk_name]['disk'] = disk_obj
-        self.disks[disk_name]['identifier'] = identifier
+        self._add_disk(name)
+        self.disks[name]['disk'] = disk_obj
+        self.disks[name]['identifier'] = identifier
 
-    def add_partition(self, size, disk_name, mountpoint, source_file=None, fstype=None,
-                      label=None, fsopts=None, boot=False, align=None, no_table=False,
-                      part_type=None, uuid=None, system_id=None):
-        """ Add the next partition. Partitions have to be added in the
-        first-to-last order. """
-
-        ks_pnum = len(self.partitions)
+    def add_partition(self, part):
+        """
+        Add the next partition. Partitions have to be added in the
+        first-to-last order.
+        """
+        part.ks_pnum = len(self.partitions)
 
         # Converting kB to sectors for parted
-        size = size * 1024 // self.sector_size
-
-        part = {'ks_pnum': ks_pnum, # Partition number in the KS file
-                'size': size, # In sectors
-                'mountpoint': mountpoint, # Mount relative to chroot
-                'source_file': source_file, # partition contents
-                'fstype': fstype, # Filesystem type
-                'fsopts': fsopts, # Filesystem mount options
-                'label': label, # Partition label
-                'disk_name': disk_name, # physical disk name holding partition
-                'device': None, # kpartx device node for partition
-                'num': None, # Partition number
-                'boot': boot, # Bootable flag
-                'align': align, # Partition alignment
-                'no_table' : no_table, # Partition does not appear in partition table
-                'part_type' : part_type, # Partition type
-                'uuid': uuid, # Partition UUID
-                'system_id': system_id} # Partition system id
+        part.size_sec = part.disk_size * 1024 // self.sector_size
 
         assert not self._partitions_layed_out
 
         self.partitions.append(part)
-        self._add_disk(part['disk_name'])
+        self._add_disk(part.disk)
 
     def layout_partitions(self, ptable_format="msdos"):
         """ Layout the partitions, meaning calculate the position of every
@@ -129,11 +111,11 @@ class Image():
         for num in range(len(self.partitions)):
             part = self.partitions[num]
 
-            if part['disk_name'] not in self.disks:
+            if part.disk not in self.disks:
                 raise ImageError("No disk %s for partition %s" \
-                                 % (part['disk_name'], part['mountpoint']))
+                                 % (part.disk, part.mountpoint))
 
-            if ptable_format == 'msdos' and part['part_type']:
+            if ptable_format == 'msdos' and part.part_type:
                 # The --part-type can also be implemented for MBR partitions,
                 # in which case it would map to the 1-byte "partition type"
                 # filed at offset 3 of the partition entry.
@@ -141,9 +123,9 @@ class Image():
                                  "implemented for msdos partitions")
 
             # Get the disk where the partition is located
-            disk = self.disks[part['disk_name']]
+            disk = self.disks[part.disk]
             disk['numpart'] += 1
-            if not part['no_table']:
+            if not part.no_table:
                 disk['realpart'] += 1
             disk['ptable_format'] = ptable_format
 
@@ -163,50 +145,50 @@ class Image():
                     disk['offset'] += 1
 
 
-            if part['align']:
+            if part.align:
                 # If not first partition and we do have alignment set we need
                 # to align the partition.
                 # FIXME: This leaves a empty spaces to the disk. To fill the
                 # gaps we could enlargea the previous partition?
 
                 # Calc how much the alignment is off.
-                align_sectors = disk['offset'] % (part['align'] * 1024 // self.sector_size)
+                align_sectors = disk['offset'] % (part.align * 1024 // self.sector_size)
 
                 if align_sectors:
                     # If partition is not aligned as required, we need
                     # to move forward to the next alignment point
-                    align_sectors = (part['align'] * 1024 // self.sector_size) - align_sectors
+                    align_sectors = (part.align * 1024 // self.sector_size) - align_sectors
 
                     msger.debug("Realignment for %s%s with %s sectors, original"
                                 " offset %s, target alignment is %sK." %
-                                (part['disk_name'], disk['numpart'], align_sectors,
-                                 disk['offset'], part['align']))
+                                (part.disk, disk['numpart'], align_sectors,
+                                 disk['offset'], part.align))
 
                     # increase the offset so we actually start the partition on right alignment
                     disk['offset'] += align_sectors
 
-            part['start'] = disk['offset']
-            disk['offset'] += part['size']
+            part.start = disk['offset']
+            disk['offset'] += part.size_sec
 
-            part['type'] = 'primary'
-            if not part['no_table']:
-                part['num'] = disk['realpart']
+            part.type = 'primary'
+            if not part.no_table:
+                part.num = disk['realpart']
             else:
-                part['num'] = 0
+                part.num = 0
 
             if disk['ptable_format'] == "msdos":
                 # only count the partitions that are in partition table
-                if len([p for p in self.partitions if not p['no_table']]) > 4:
+                if len([p for p in self.partitions if not p.no_table]) > 4:
                     if disk['realpart'] > 3:
-                        part['type'] = 'logical'
-                        part['num'] = disk['realpart'] + 1
+                        part.type = 'logical'
+                        part.num = disk['realpart'] + 1
 
             disk['partitions'].append(num)
             msger.debug("Assigned %s to %s%d, sectors range %d-%d size %d "
                         "sectors (%d bytes)." \
-                            % (part['mountpoint'], part['disk_name'], part['num'],
-                               part['start'], disk['offset'] - 1,
-                               part['size'], part['size'] * self.sector_size))
+                            % (part.mountpoint, part.disk, part.num,
+                               part.start, disk['offset'] - 1,
+                               part.size_sec, part.size_sec * self.sector_size))
 
         # Once all the partitions have been layed out, we can calculate the
         # minumim disk sizes.
@@ -256,11 +238,11 @@ class Image():
         msger.debug("Creating partitions")
 
         for part in self.partitions:
-            if part['num'] == 0:
+            if part.num == 0:
                 continue
 
-            disk = self.disks[part['disk_name']]
-            if disk['ptable_format'] == "msdos" and part['num'] == 5:
+            disk = self.disks[part.disk]
+            if disk['ptable_format'] == "msdos" and part.num == 5:
                 # Create an extended partition (note: extended
                 # partition is described in MBR and contains all
                 # logical partitions). The logical partitions save a
@@ -273,16 +255,16 @@ class Image():
                 # add a sector at the back, so that there is enough
                 # room for all logical partitions.
                 self._create_partition(disk['disk'].device, "extended",
-                                       None, part['start'] - 1,
-                                       disk['offset'] - part['start'] + 1)
+                                       None, part.start - 1,
+                                       disk['offset'] - part.start + 1)
 
-            if part['fstype'] == "swap":
+            if part.fstype == "swap":
                 parted_fs_type = "linux-swap"
-            elif part['fstype'] == "vfat":
+            elif part.fstype == "vfat":
                 parted_fs_type = "fat32"
-            elif part['fstype'] == "msdos":
+            elif part.fstype == "msdos":
                 parted_fs_type = "fat16"
-            elif part['fstype'] == "ontrackdm6aux3":
+            elif part.fstype == "ontrackdm6aux3":
                 parted_fs_type = "ontrackdm6aux3"
             else:
                 # Type for ext2/ext3/ext4/btrfs
@@ -290,47 +272,47 @@ class Image():
 
             # Boot ROM of OMAP boards require vfat boot partition to have an
             # even number of sectors.
-            if part['mountpoint'] == "/boot" and part['fstype'] in ["vfat", "msdos"] \
-               and part['size'] % 2:
+            if part.mountpoint == "/boot" and part.fstype in ["vfat", "msdos"] \
+               and part.size_sec % 2:
                 msger.debug("Subtracting one sector from '%s' partition to " \
                             "get even number of sectors for the partition" % \
-                            part['mountpoint'])
-                part['size'] -= 1
+                            part.mountpoint)
+                part.size_sec -= 1
 
-            self._create_partition(disk['disk'].device, part['type'],
-                                   parted_fs_type, part['start'], part['size'])
+            self._create_partition(disk['disk'].device, part.type,
+                                   parted_fs_type, part.start, part.size_sec)
 
-            if part['part_type']:
+            if part.part_type:
                 msger.debug("partition %d: set type UID to %s" % \
-                            (part['num'], part['part_type']))
+                            (part.num, part.part_type))
                 exec_native_cmd("sgdisk --typecode=%d:%s %s" % \
-                                         (part['num'], part['part_type'],
+                                         (part.num, part.part_type,
                                           disk['disk'].device), self.native_sysroot)
 
-            if part['uuid'] and disk['ptable_format'] == "gpt":
+            if part.uuid and disk['ptable_format'] == "gpt":
                 msger.debug("partition %d: set UUID to %s" % \
-                            (part['num'], part['uuid']))
+                            (part.num, part.uuid))
                 exec_native_cmd("sgdisk --partition-guid=%d:%s %s" % \
-                                (part['num'], part['uuid'], disk['disk'].device),
+                                (part.num, part.uuid, disk['disk'].device),
                                 self.native_sysroot)
 
-            if part['label'] and disk['ptable_format'] == "gpt":
+            if part.label and disk['ptable_format'] == "gpt":
                 msger.debug("partition %d: set name to %s" % \
-                            (part['num'], part['label']))
+                            (part.num, part.label))
                 exec_native_cmd("parted -s %s name %d %s" % \
-                                (disk['disk'].device, part['num'], part['label']),
+                                (disk['disk'].device, part.num, part.label),
                                 self.native_sysroot)
 
-            if part['boot']:
+            if part.active:
                 flag_name = "legacy_boot" if disk['ptable_format'] == 'gpt' else "boot"
                 msger.debug("Set '%s' flag for partition '%s' on disk '%s'" % \
-                            (flag_name, part['num'], disk['disk'].device))
+                            (flag_name, part.num, disk['disk'].device))
                 exec_native_cmd("parted -s %s set %d %s on" % \
-                                (disk['disk'].device, part['num'], flag_name),
+                                (disk['disk'].device, part.num, flag_name),
                                 self.native_sysroot)
-            if part['system_id']:
+            if part.system_id:
                 exec_native_cmd("sfdisk --part-type %s %s %s" % \
-                                (disk['disk'].device, part['num'], part['system_id']),
+                                (disk['disk'].device, part.num, part.system_id),
                                 self.native_sysroot)
 
             # Parted defaults to enabling the lba flag for fat16 partitions,
@@ -339,9 +321,9 @@ class Image():
             if parted_fs_type == "fat16":
                 if disk['ptable_format'] == 'msdos':
                     msger.debug("Disable 'lba' flag for partition '%s' on disk '%s'" % \
-                                (part['num'], disk['disk'].device))
+                                (part.num, disk['disk'].device))
                     exec_native_cmd("parted -s %s set %d lba off" % \
-                                    (disk['disk'].device, part['num']),
+                                    (disk['disk'].device, part.num),
                                     self.native_sysroot)
 
     def cleanup(self):
@@ -360,16 +342,16 @@ class Image():
         msger.debug("Installing partitions")
 
         for part in self.partitions:
-            source = part['source_file']
+            source = part.source_file
             if source:
                 # install source_file contents into a partition
-                sparse_copy(source, image_file, part['start'] * self.sector_size)
+                sparse_copy(source, image_file, part.start * self.sector_size)
 
                 msger.debug("Installed %s in partition %d, sectors %d-%d, "
                             "size %d sectors" % \
-                            (source, part['num'], part['start'],
-                             part['start'] + part['size'] - 1, part['size']))
+                            (source, part.num, part.start,
+                             part.start + part.size_sec - 1, part.size_sec))
 
-                partimage = image_file + '.p%d' % part['num']
+                partimage = image_file + '.p%d' % part.num
                 os.rename(source, partimage)
                 self.partimages.append(partimage)
-- 
2.1.4

[PATCH 6/9] wic: make sure layout_partitions is called once

[Ed Bartosh]

Removed artificial _partitions_layed_out attribute and
unneeded call of layout_partitions method.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/utils/partitionedfs.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index fb5c0c2..5397bb7 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -46,7 +46,6 @@ class Image():
         self.partimages = []
         # Size of a sector used in calculations
         self.sector_size = SECTOR_SIZE
-        self._partitions_layed_out = False
         self.native_sysroot = native_sysroot
 
     def _add_disk(self, disk_name):
@@ -58,8 +57,6 @@ class Image():
             # We already have this disk
             return
 
-        assert not self._partitions_layed_out
-
         self.disks[disk_name] = \
                 {'disk': None,     # Disk object
                  'numpart': 0,     # Number of allocate partitions
@@ -90,8 +87,6 @@ class Image():
         # Converting kB to sectors for parted
         part.size_sec = part.disk_size * 1024 // self.sector_size
 
-        assert not self._partitions_layed_out
-
         self.partitions.append(part)
         self._add_disk(part.disk)
 
@@ -102,11 +97,6 @@ class Image():
 
         msger.debug("Assigning %s partitions to disks" % ptable_format)
 
-        if self._partitions_layed_out:
-            return
-
-        self._partitions_layed_out = True
-
         # Go through partitions in the order they are added in .ks file
         for num in range(len(self.partitions)):
             part = self.partitions[num]
@@ -219,8 +209,6 @@ class Image():
             disk = self.disks[dev]
             disk['disk'].create()
 
-        self.layout_partitions()
-
         for dev in self.disks:
             disk = self.disks[dev]
             msger.debug("Initializing partition table for %s" % \
-- 
2.1.4

[PATCH 7/9] wic: direct: remove unused plugin attributes

[Ed Bartosh]

Removed unused _disks, _disk_format and _disk_names
attributes from DirectPlugin class.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/plugins/imager/direct.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 663655a..7d6c59a 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -90,9 +90,6 @@ class DirectPlugin(ImagerPlugin):
                                strftime("%Y%m%d%H%M"))
         self.workdir = tempfile.mkdtemp(dir=self.outdir, prefix='tmp.wic.')
         self._image = None
-        self._disks = {}
-        self._disk_format = "direct"
-        self._disk_names = []
         self.ptable_format = self.ks.bootloader.ptable
         self.parts = self.ks.partitions
 
@@ -249,7 +246,6 @@ class DirectPlugin(ImagerPlugin):
             msger.debug("Adding disk %s as %s with size %s bytes" \
                         % (disk_name, full_path, disk['min_size']))
             disk_obj = DiskImage(full_path, disk['min_size'])
-            #self._disks[disk_name] = disk_obj
             self._image.add_disk(disk_name, disk_obj, disk_ids.get(disk_name))
 
         self._image.create()
-- 
2.1.4

[PATCH 8/9] wic: direct: remove unused import

[Ed Bartosh]

Removed unused import of wic.errors module.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/plugins/imager/direct.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 7d6c59a..c399d47 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -34,7 +34,6 @@ from wic import msger
 from wic.ksparser import KickStart, KickStartError
 from wic.plugin import pluginmgr
 from wic.pluginbase import ImagerPlugin
-from wic.utils import errors
 from wic.utils.errors import CreatorError, ImageError
 from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
 from wic.utils.partitionedfs import Image
@@ -102,7 +101,7 @@ class DirectPlugin(ImagerPlugin):
             self.assemble()
             self.finalize()
             self.print_info()
-        except errors.CreatorError:
+        except CreatorError:
             raise
         finally:
             self.cleanup()
-- 
2.1.4

[PATCH 9/9] wic: remove unused argument scripts_path

[Ed Bartosh]

There is no need to pass scripts_path from main wic module
down the stack as it's not used there.

Removed scripts_path argument from DirectPlugin class
and wic_create function.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/engine.py                | 7 +++----
 scripts/lib/wic/plugins/imager/direct.py | 2 +-
 scripts/wic                              | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index e27598d..1aa8f65 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -145,8 +145,8 @@ def list_source_plugins():
         print("  %s" % plugin)
 
 
-def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
-               scripts_path, options):
+def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
+               native_sysroot, options):
     """
     Create image
 
@@ -155,7 +155,6 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
     bootimg_dir - absolute path to the build's boot artifacts directory
     kernel_dir - absolute path to the build's kernel directory
     native_sysroot - absolute path to the build's native sysroots dir
-    scripts_path - absolute path to /scripts dir
     image_output_dir - dirname to create for image
     options - wic command line options (debug, bmap, etc)
 
@@ -195,7 +194,7 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
         msger.error('Unknown plugin: %s' % pname)
 
     plugin = plugin_class(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
-                          native_sysroot, scripts_path, oe_builddir, options)
+                          native_sysroot, oe_builddir, options)
 
     plugin.do_create()
 
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index c399d47..a9144e2 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -68,7 +68,7 @@ class DirectPlugin(ImagerPlugin):
     name = 'direct'
 
     def __init__(self, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
-                 native_sysroot, scripts_path, oe_builddir, options):
+                 native_sysroot, oe_builddir, options):
         try:
             self.ks = KickStart(wks_file)
         except KickStartError as err:
diff --git a/scripts/wic b/scripts/wic
index 8a959a0..1b7d7df 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -250,7 +250,7 @@ def wic_create_subcommand(args, usage_str):
 
     print("Creating image(s)...\n")
     engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
-                      native_sysroot, scripts_path, options)
+                      native_sysroot, options)
 
 
 def wic_list_subcommand(args, usage_str):
-- 
2.1.4