aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-02-08 20:51:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 20:06:33 -0800
commit97db24d34847a641868f9ee83aae56f9dd5e0a8a (patch)
treeaebc9d2ec390bd944894d13e5f0e9fe756ec4c9f /scripts/lib/wic/plugins
parent7ece57a80f4002d0d83dc322092e9178380ab509 (diff)
downloadopenembedded-core-contrib-97db24d34847a641868f9ee83aae56f9dd5e0a8a.tar.gz
wic: use the same partition object in direct and partitionedfs
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> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/lib/wic/plugins')
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 71ffc3680c..663655a03c 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)