wic: code cleanup: undefined variables

Fixed forgoten imports Wic_PartData and ImageError.
Removed unused and undefined variable syslinux_conf.

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/kickstart/custom_commands/__init__.py b/scripts/lib/wic/kickstart/custom_commands/__init__.py
index f84c6d9e00d3b9ce03d820a9810433cd590f1913..b4e613de4c37d9abb776c192b4fec1a67e01dcfd 100644 (file)
--- a/scripts/lib/wic/kickstart/custom_commands/__init__.py
+++ b/scripts/lib/wic/kickstart/custom_commands/__init__.py
@@ -1,6 +1,7 @@
 from micpartition import Mic_Partition
 from micpartition import Mic_PartData
 from partition import Wic_Partition
+from partition import Wic_PartData
 
 __all__ = (
     "Mic_Partition",

diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index d6c11ed428359e44c343b93f89ed040b330f2bf7..883378ee844817b815e3852483c46d3fe2b4c984 100644 (file)
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -27,6 +27,7 @@
 import os
 import shutil
 
+from wic.utils.errors import ImageError
 from wic import kickstart, msger
 from wic.utils import misc, fs_related, errors, runner, cmdln
 from wic.conf import configmgr
@@ -72,8 +73,6 @@ class BootimgEFIPlugin(SourcePlugin):
         grubefi_conf += "linux %s root=%s rootwait %s\n" \
             % (kernel, rootstr, options)
         grubefi_conf += "}\n"
-        if splashline:
-            syslinux_conf += "%s\n" % splashline
 
         msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \
                         % cr_workdir)

diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index abb32ebc109923aafdadb9614f467bc3ee987a7b..2280867308123a4504d5aa9b92b3443366056c95 100644 (file)
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -26,6 +26,7 @@
 
 import os
 
+from wic.utils.errors import ImageError
 from wic import kickstart, msger
 from wic.utils import misc, fs_related, errors, runner, cmdln
 from wic.conf import configmgr