diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-01-14 14:12:53 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-18 11:47:05 +0000 |
commit | c15ea825e735b14dcf38ddf44a0a4aa7db611144 (patch) | |
tree | 3cebe2d0004d2eff6297c72e67e4260b7a3a578a | |
parent | f572f442146e3a36ac1f6994d561afaebc2d9092 (diff) | |
download | openembedded-core-contrib-c15ea825e735b14dcf38ddf44a0a4aa7db611144.tar.gz |
wic: use new kickstart parser
Used KickStart parser class instead of pykickstart API.
This commit breaks wic as data structures and field names
provided by new API are a bit different from old ones.
This issue will be addressed in the following commits.
(From OE-Core rev: f72439d321220b724bfe2b4a92fed46c2c19fb3f)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/wic/conf.py | 4 | ||||
-rw-r--r-- | scripts/lib/wic/imager/direct.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/conf.py b/scripts/lib/wic/conf.py index 1d4363a526..2e2945130c 100644 --- a/scripts/lib/wic/conf.py +++ b/scripts/lib/wic/conf.py @@ -17,8 +17,8 @@ import os +from wic.kickstart import KickStart from wic import msger -from wic import kickstart from wic.utils import misc @@ -87,7 +87,7 @@ class ConfigMgr(object): if not ksconf: return - ksobj = kickstart.read_kickstart(ksconf) + ksobj = KickStart(ksconf) self.create['ks'] = ksobj self.create['name'] = os.path.splitext(os.path.basename(ksconf))[0] diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index d5603fa915..f89c42cfb7 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -27,7 +27,7 @@ import os import shutil -from wic import kickstart, msger +from wic import msger from wic.utils import fs_related from wic.utils.oe.misc import get_bitbake_var from wic.utils.partitionedfs import Image |