sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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]

(From OE-Core rev: 4adbac84046ff744f1452b5ff4d017d17d2d45e2)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh 2017-01-31 12:37:45 +02:00 committed by Richard Purdie
parent d8a89baffb
commit 08217a4c80
2 changed files with 25 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
scripts/lib/wic/partition.py
View File

@ -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

23
scripts/lib/wic/utils/oe/misc.py
View File

@ -222,26 +222,3 @@ def get_bitbake_var(var, image=None, cache=True):
get_var method of BB_VARS singleton.
"""
return BB_VARS.get_var(var, image, cache)
def parse_sourceparams(sourceparams):
"""
Split sourceparams string of the form key1=val1[,key2=val2,...]
into a dict. Also accepts valueless keys i.e. without =.
Returns dict of param key/val pairs (note that val may be None).
"""
params_dict = {}
params = sourceparams.split(',')
if params:
for par in params:
if not par:
continue
if not '=' in par:
key = par
val = None
else:
key, val = par.split('=')
params_dict[key] = val
return params_dict