summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-01-14 14:12:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 11:47:05 +0000
commitc15ea825e735b14dcf38ddf44a0a4aa7db611144 (patch)
tree3cebe2d0004d2eff6297c72e67e4260b7a3a578a /scripts/lib
parentf572f442146e3a36ac1f6994d561afaebc2d9092 (diff)
downloadpoky-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>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/conf.py4
-rw-r--r--scripts/lib/wic/imager/direct.py2
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 @@
17 17
18import os 18import os
19 19
20from wic.kickstart import KickStart
20from wic import msger 21from wic import msger
21from wic import kickstart
22from wic.utils import misc 22from wic.utils import misc
23 23
24 24
@@ -87,7 +87,7 @@ class ConfigMgr(object):
87 if not ksconf: 87 if not ksconf:
88 return 88 return
89 89
90 ksobj = kickstart.read_kickstart(ksconf) 90 ksobj = KickStart(ksconf)
91 91
92 self.create['ks'] = ksobj 92 self.create['ks'] = ksobj
93 self.create['name'] = os.path.splitext(os.path.basename(ksconf))[0] 93 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 @@
27import os 27import os
28import shutil 28import shutil
29 29
30from wic import kickstart, msger 30from wic import msger
31from wic.utils import fs_related 31from wic.utils import fs_related
32from wic.utils.oe.misc import get_bitbake_var 32from wic.utils.oe.misc import get_bitbake_var
33from wic.utils.partitionedfs import Image 33from wic.utils.partitionedfs import Image