summaryrefslogtreecommitdiffstats
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:44 -0800
commitfd1f6fb201804ffa593f0e7dceaccb15ad189a1e (patch)
tree760d356df438d25cf31278db415fb8352a264b1c /scripts/lib/wic/plugins
parent4edcd63ba1a5baf24c75c1a236fe25824e75592a (diff)
downloadpoky-fd1f6fb201804ffa593f0e7dceaccb15ad189a1e.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. (From OE-Core rev: 97db24d34847a641868f9ee83aae56f9dd5e0a8a) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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):
237 part.prepare(self, self.workdir, self.oe_builddir, self.rootfs_dir, 237 part.prepare(self, self.workdir, self.oe_builddir, self.rootfs_dir,
238 self.bootimg_dir, self.kernel_dir, self.native_sysroot) 238 self.bootimg_dir, self.kernel_dir, self.native_sysroot)
239 239
240 240 self._image.add_partition(part)
241 self._image.add_partition(part.disk_size, part.disk,
242 part.mountpoint, part.source_file,
243 part.fstype, part.label,
244 fsopts=part.fsopts, boot=part.active,
245 align=part.align, no_table=part.no_table,
246 part_type=part.part_type, uuid=part.uuid,
247 system_id=part.system_id)
248 241
249 if fstab_path: 242 if fstab_path:
250 shutil.move(fstab_path + ".orig", fstab_path) 243 shutil.move(fstab_path + ".orig", fstab_path)