mirror of
https://git.yoctoproject.org/poky
synced 2026-06-09 15:50:16 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
65a99448a4
commit
0ff04e1e95
@@ -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]
|
||||
|
||||
try:
|
||||
ksobj = KickStart(ksconf)
|
||||
except KickStartError as err:
|
||||
msger.error(str(err))
|
||||
|
||||
image_name = "%s-%s" % (splitext(basename(ksconf))[0],
|
||||
strftime("%Y%m%d%H%M"))
|
||||
krootfs_dir = cls.__rootfs_dir_to_dict(rootfs_dir)
|
||||
|
||||
configmgr._ksconf = ksconf
|
||||
|
||||
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()
|
||||
|
||||
Reference in New Issue
Block a user