diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-31 12:37:45 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-02 17:37:35 +0000 |
| commit | 4adbac84046ff744f1452b5ff4d017d17d2d45e2 (patch) | |
| tree | 419435c0c5a7f8ea1503d9c101c36f8285ab34a5 /scripts/lib/wic/partition.py | |
| parent | e3c43ce3261663225aeba50b8c6229577574f9b7 (diff) | |
| download | openembedded-core-4adbac84046ff744f1452b5ff4d017d17d2d45e2.tar.gz | |
wic: partition: simlify calling plugin methods
Replaced parse_sourceparams function with list comprehension.
Used local variables instead of attributes.
Moved global variable to the local scope.
[YOCTO #10619]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts/lib/wic/partition.py')
| -rw-r--r-- | scripts/lib/wic/partition.py | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 49d13277c3..094a8c3bec 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -27,16 +27,10 @@ import os import tempfile -from wic.utils.oe.misc import msger, parse_sourceparams +from wic.utils.oe.misc import msger from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var from wic.plugin import pluginmgr -partition_methods = { - "do_stage_partition":None, - "do_prepare_partition":None, - "do_configure_partition":None, -} - class Partition(): def __init__(self, args, lineno): @@ -129,9 +123,6 @@ class Partition(): Prepare content for individual partitions, depending on partition command parameters. """ - if self.sourceparams: - self.sourceparams_dict = parse_sourceparams(self.sourceparams) - if not self.source: if not self.size and not self.fixed_size: msger.error("The %s partition has a size of zero. Please " @@ -164,24 +155,30 @@ class Partition(): "details on adding a new source plugin." % \ (self.source, self.mountpoint)) - self._source_methods = pluginmgr.get_source_plugin_methods(\ - self.source, partition_methods) - self._source_methods["do_configure_partition"](self, self.sourceparams_dict, - creator, cr_workdir, - oe_builddir, - bootimg_dir, - kernel_dir, - native_sysroot) - self._source_methods["do_stage_partition"](self, self.sourceparams_dict, - creator, cr_workdir, - oe_builddir, - bootimg_dir, kernel_dir, - native_sysroot) - self._source_methods["do_prepare_partition"](self, self.sourceparams_dict, - creator, cr_workdir, - oe_builddir, - bootimg_dir, kernel_dir, rootfs_dir, - native_sysroot) + srcparams_dict = {} + if self.sourceparams: + # Split sourceparams string of the form key1=val1[,key2=val2,...] + # into a dict. Also accepts valueless keys i.e. without = + splitted = self.sourceparams.split(',') + srcparams_dict = dict(par.split('=') for par in splitted if par) + + partition_methods = { + "do_stage_partition": None, + "do_prepare_partition": None, + "do_configure_partition": None + } + + methods = pluginmgr.get_source_plugin_methods(self.source, + partition_methods) + methods["do_configure_partition"](self, srcparams_dict, creator, + cr_workdir, oe_builddir, bootimg_dir, + kernel_dir, native_sysroot) + methods["do_stage_partition"](self, srcparams_dict, creator, + cr_workdir, oe_builddir, bootimg_dir, + kernel_dir, native_sysroot) + methods["do_prepare_partition"](self, srcparams_dict, creator, + cr_workdir, oe_builddir, bootimg_dir, + kernel_dir, rootfs_dir, native_sysroot) # further processing required Partition.size to be an integer, make # sure that it is one |