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:44 +0000
commit0ff04e1e956d6c2aab6ae5fb7c25b8327e99edc9 (patch)
treeea85ecfb4d52268827bddfa579c741473cca7946 /scripts/lib/wic/imager/direct.py
parent65a99448a4b044ccde005247d54de6172ee25172 (diff)
downloadpoky-0ff04e1e956d6c2aab6ae5fb7c25b8327e99edc9.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] (From OE-Core rev: 79191119de010acb107f9392a991108728858441) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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:
72 media and used on actual hardware. 72 media and used on actual hardware.
73 """ 73 """
74 74
75 def __init__(self, oe_builddir, image_output_dir, rootfs_dir, 75 def __init__(self, image_name, ksobj, oe_builddir, image_output_dir,
76 bootimg_dir, kernel_dir, native_sysroot, compressor, 76 rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
77 creatoropts, bmap=False): 77 compressor, bmap=False):
78 """ 78 """
79 Initialize a DirectImageCreator instance. 79 Initialize a DirectImageCreator instance.
80 80
81 This method takes the same arguments as ImageCreator.__init__() 81 This method takes the same arguments as ImageCreator.__init__()
82 """ 82 """
83 self.name = creatoropts['name'] 83 self.name = image_name
84 self.outdir = image_output_dir 84 self.outdir = image_output_dir
85 self.workdir = tempfile.mktemp(prefix='wic') 85 self.workdir = tempfile.mktemp(prefix='wic')
86 self.ks = creatoropts['ks'] 86 self.ks = ksobj
87 87
88 self.__image = None 88 self.__image = None
89 self.__disks = {} 89 self.__disks = {}