summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/image/engine.py10
-rw-r--r--scripts/lib/wic/conf.py2
-rw-r--r--scripts/lib/wic/imager/baseimager.py3
-rw-r--r--scripts/lib/wic/imager/direct.py2
-rw-r--r--scripts/lib/wic/pluginbase.py1
-rw-r--r--scripts/lib/wic/plugins/imager/direct_plugin.py4
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py1
-rw-r--r--scripts/lib/wic/utils/cmdln.py1
8 files changed, 5 insertions, 19 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 0dc7920967..73e8f8b599 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -30,18 +30,10 @@
30 30
31import os 31import os
32import sys 32import sys
33from abc import ABCMeta, abstractmethod
34import shlex
35import json
36import subprocess
37import shutil
38 33
39import os, sys, errno
40from wic import msger, creator 34from wic import msger, creator
41from wic.utils import cmdln, misc, errors 35from wic.utils import misc
42from wic.conf import configmgr
43from wic.plugin import pluginmgr 36from wic.plugin import pluginmgr
44from wic.__version__ import VERSION
45from wic.utils.oe import misc 37from wic.utils.oe import misc
46 38
47 39
diff --git a/scripts/lib/wic/conf.py b/scripts/lib/wic/conf.py
index cecf396819..402ed62032 100644
--- a/scripts/lib/wic/conf.py
+++ b/scripts/lib/wic/conf.py
@@ -19,7 +19,7 @@ import os
19 19
20from wic import msger 20from wic import msger
21from wic import kickstart 21from wic import kickstart
22from wic.utils import misc, runner, errors 22from wic.utils import misc
23 23
24 24
25def get_siteconf(): 25def get_siteconf():
diff --git a/scripts/lib/wic/imager/baseimager.py b/scripts/lib/wic/imager/baseimager.py
index 0afbc2cf0c..67a2d0116b 100644
--- a/scripts/lib/wic/imager/baseimager.py
+++ b/scripts/lib/wic/imager/baseimager.py
@@ -21,10 +21,9 @@ import os
21import tempfile 21import tempfile
22import shutil 22import shutil
23 23
24from wic import kickstart
25from wic import msger 24from wic import msger
26from wic.utils.errors import CreatorError 25from wic.utils.errors import CreatorError
27from wic.utils import misc, runner, fs_related as fs 26from wic.utils import runner
28 27
29class BaseImageCreator(object): 28class BaseImageCreator(object):
30 """Base class for image creation. 29 """Base class for image creation.
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index e2f805832b..57b1335a17 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -28,7 +28,7 @@ import os
28import shutil 28import shutil
29 29
30from wic import kickstart, msger 30from wic import kickstart, msger
31from wic.utils import fs_related, runner, misc 31from wic.utils import fs_related
32from wic.utils.partitionedfs import Image 32from wic.utils.partitionedfs import Image
33from wic.utils.errors import CreatorError, ImageError 33from wic.utils.errors import CreatorError, ImageError
34from wic.imager.baseimager import BaseImageCreator 34from wic.imager.baseimager import BaseImageCreator
diff --git a/scripts/lib/wic/pluginbase.py b/scripts/lib/wic/pluginbase.py
index 50e442d61c..6d96de2be5 100644
--- a/scripts/lib/wic/pluginbase.py
+++ b/scripts/lib/wic/pluginbase.py
@@ -16,7 +16,6 @@
16# Temple Place - Suite 330, Boston, MA 02111-1307, USA. 16# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17 17
18from wic import msger 18from wic import msger
19from wic.utils import errors
20 19
21class _Plugin(object): 20class _Plugin(object):
22 class __metaclass__(type): 21 class __metaclass__(type):
diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py b/scripts/lib/wic/plugins/imager/direct_plugin.py
index db01c411ba..eb17e8d7b7 100644
--- a/scripts/lib/wic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/wic/plugins/imager/direct_plugin.py
@@ -24,10 +24,8 @@
24# Tom Zanussi <tom.zanussi (at] linux.intel.com> 24# Tom Zanussi <tom.zanussi (at] linux.intel.com>
25# 25#
26 26
27from wic import msger 27from wic.utils import errors
28from wic.utils import misc, fs_related, errors, runner, cmdln
29from wic.conf import configmgr 28from wic.conf import configmgr
30from wic.plugin import pluginmgr
31 29
32import wic.imager.direct as direct 30import wic.imager.direct as direct
33from wic.pluginbase import ImagerPlugin 31from wic.pluginbase import ImagerPlugin
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 903b478fe8..49d5c8ae82 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -27,7 +27,6 @@
27import os 27import os
28import shutil 28import shutil
29 29
30from wic.utils.errors import ImageError
31from wic import kickstart, msger 30from wic import kickstart, msger
32from wic.pluginbase import SourcePlugin 31from wic.pluginbase import SourcePlugin
33from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ 32from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
diff --git a/scripts/lib/wic/utils/cmdln.py b/scripts/lib/wic/utils/cmdln.py
index b099473ee4..d8f1c051ab 100644
--- a/scripts/lib/wic/utils/cmdln.py
+++ b/scripts/lib/wic/utils/cmdln.py
@@ -43,7 +43,6 @@ import sys
43import re 43import re
44import cmd 44import cmd
45import optparse 45import optparse
46from pprint import pprint
47import sys 46import sys
48 47
49 48