From fd1f6fb201804ffa593f0e7dceaccb15ad189a1e Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 8 Feb 2017 20:51:29 +0200 Subject: 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. (From OE-Core rev: 97db24d34847a641868f9ee83aae56f9dd5e0a8a) Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/lib/wic/plugins/imager/direct.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'scripts/lib/wic/plugins/imager/direct.py') 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) -- cgit v1.2.3-54-g00ecf