mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
wic: get rid of __rootfs_dir_to_dict method
Replaced class method __rootfs_dir_to_dict with a list comprehension. [YOCTO #10619] (From OE-Core rev: 266fd31410771db4c06539f7368c196a6d03000a) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ee10c2f1bb
commit
2db161f1c0
@@ -53,21 +53,8 @@ class DirectPlugin(ImagerPlugin):
|
|||||||
|
|
||||||
name = 'direct'
|
name = 'direct'
|
||||||
|
|
||||||
@classmethod
|
@staticmethod
|
||||||
def __rootfs_dir_to_dict(cls, rootfs_dirs):
|
def do_create(opts, *args):
|
||||||
"""
|
|
||||||
Gets a string that contain 'connection=dir' splitted by
|
|
||||||
space and return a dict
|
|
||||||
"""
|
|
||||||
krootfs_dir = {}
|
|
||||||
for rootfs_dir in rootfs_dirs.split(' '):
|
|
||||||
key, val = rootfs_dir.split('=')
|
|
||||||
krootfs_dir[key] = val
|
|
||||||
|
|
||||||
return krootfs_dir
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def do_create(cls, opts, *args):
|
|
||||||
"""
|
"""
|
||||||
Create direct image, called from creator as 'direct' cmd
|
Create direct image, called from creator as 'direct' cmd
|
||||||
"""
|
"""
|
||||||
@@ -92,7 +79,9 @@ class DirectPlugin(ImagerPlugin):
|
|||||||
|
|
||||||
image_name = "%s-%s" % (splitext(basename(ksconf))[0],
|
image_name = "%s-%s" % (splitext(basename(ksconf))[0],
|
||||||
strftime("%Y%m%d%H%M"))
|
strftime("%Y%m%d%H%M"))
|
||||||
krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir)
|
|
||||||
|
# parse possible 'rootfs=name' items
|
||||||
|
krootfs_dir = dict(rdir.split('=') for rdir in rootfs_dir.split(' '))
|
||||||
|
|
||||||
creator = DirectImageCreator(image_name, ksobj, oe_builddir,
|
creator = DirectImageCreator(image_name, ksobj, oe_builddir,
|
||||||
image_output_dir, krootfs_dir,
|
image_output_dir, krootfs_dir,
|
||||||
|
|||||||
Reference in New Issue
Block a user