summaryrefslogtreecommitdiff
path: root/scripts/lib
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
parent702ee7a1fe30d87d55ba9528ae89abff4e294fd9 (diff)
downloadopenembedded-core-79191119de010acb107f9392a991108728858441.tar.gz
openembedded-core-79191119de010acb107f9392a991108728858441.tar.bz2
openembedded-core-79191119de010acb107f9392a991108728858441.zip
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')
-rw-r--r--scripts/lib/wic/imager/direct.py10
-rw-r--r--scripts/lib/wic/plugins/imager/direct_plugin.py22
2 files changed, 20 insertions, 12 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 = {}
diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py b/scripts/lib/wic/plugins/imager/direct_plugin.py
index 8fe3930804..e839d2feae 100644
--- a/scripts/lib/wic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/wic/plugins/imager/direct_plugin.py
@@ -24,8 +24,12 @@
# Tom Zanussi <tom.zanussi (at] linux.intel.com>
#
+from time import strftime
+
+from os.path import basename, splitext
from wic.utils import errors
-from wic.conf import configmgr
+from wic.ksparser import KickStart, KickStartError
+from wic import msger
import wic.imager.direct as direct
from wic.pluginbase import ImagerPlugin
@@ -68,27 +72,31 @@ class DirectPlugin(ImagerPlugin):
bootimg_dir = args[2]
rootfs_dir = args[3]
- creatoropts = configmgr.create
ksconf = args[4]
image_output_dir = args[5]
oe_builddir = args[6]
compressor = args[7]
- krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir)
+ try:
+ ksobj = KickStart(ksconf)
+ except KickStartError as err:
+ msger.error(str(err))
- configmgr._ksconf = ksconf
+ image_name = "%s-%s" % (splitext(basename(ksconf))[0],
+ strftime("%Y%m%d%H%M"))
+ krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir)
- creator = direct.DirectImageCreator(oe_builddir,
+ creator = direct.DirectImageCreator(image_name,
+ ksobj,
+ oe_builddir,
image_output_dir,
krootfs_dir,
bootimg_dir,
kernel_dir,
native_sysroot,
compressor,
- creatoropts,
opts.bmap)
-
try:
creator.create()
creator.assemble()