summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/imager/direct.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-30 23:31:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-02 17:37:34 +0000
commit79191119de010acb107f9392a991108728858441 (patch)
tree93a2238bc7e2d14a5aa2b4bf23391ab7cd84a4f7 /scripts/lib/wic/imager/direct.py
parent702ee7a1fe30d87d55ba9528ae89abff4e294fd9 (diff)
downloadopenembedded-core-79191119de010acb107f9392a991108728858441.tar.gz
wic: direct_plugin: stop using config manager
This is a preparation to removing conf.py and config/wic.conf from the codebase. Got rid of using configmgr global object in direct_plugin and direct modules. It was used to implicitly parse kickstart file and set couple of variables. Replaced usage of configmgr by passing parameters directly to the DirectImageCreator. [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts/lib/wic/imager/direct.py')
-rw-r--r--scripts/lib/wic/imager/direct.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 575fd95f11..ff06b504ce 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -72,18 +72,18 @@ class DirectImageCreator:
media and used on actual hardware.
"""
- def __init__(self, oe_builddir, image_output_dir, rootfs_dir,
- bootimg_dir, kernel_dir, native_sysroot, compressor,
- creatoropts, bmap=False):
+ def __init__(self, image_name, ksobj, oe_builddir, image_output_dir,
+ rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
+ compressor, bmap=False):
"""
Initialize a DirectImageCreator instance.
This method takes the same arguments as ImageCreator.__init__()
"""
- self.name = creatoropts['name']
+ self.name = image_name
self.outdir = image_output_dir
self.workdir = tempfile.mktemp(prefix='wic')
- self.ks = creatoropts['ks']
+ self.ks = ksobj
self.__image = None
self.__disks = {}