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.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/lib/wic/conf.py b/scripts/lib/wic/conf.py
index 1d4363a5266f5770234ed546fe081094a0ea44b6..2e2945130c458c663197d821771b6f9ebe0b3bf0 100644 (file)
--- 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 d5603fa9153589e6c1685ef931805c4583e5ec46..f89c42cfb7d9fc03238af3721679e92fed28c681 100644 (file)
--- 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