diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/image/engine.py | 10 | ||||
-rw-r--r-- | scripts/lib/wic/conf.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/imager/baseimager.py | 3 | ||||
-rw-r--r-- | scripts/lib/wic/imager/direct.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/pluginbase.py | 1 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/imager/direct_plugin.py | 4 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 1 | ||||
-rw-r--r-- | scripts/lib/wic/utils/cmdln.py | 1 |
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 | ||
31 | import os | 31 | import os |
32 | import sys | 32 | import sys |
33 | from abc import ABCMeta, abstractmethod | ||
34 | import shlex | ||
35 | import json | ||
36 | import subprocess | ||
37 | import shutil | ||
38 | 33 | ||
39 | import os, sys, errno | ||
40 | from wic import msger, creator | 34 | from wic import msger, creator |
41 | from wic.utils import cmdln, misc, errors | 35 | from wic.utils import misc |
42 | from wic.conf import configmgr | ||
43 | from wic.plugin import pluginmgr | 36 | from wic.plugin import pluginmgr |
44 | from wic.__version__ import VERSION | ||
45 | from wic.utils.oe import misc | 37 | from 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 | ||
20 | from wic import msger | 20 | from wic import msger |
21 | from wic import kickstart | 21 | from wic import kickstart |
22 | from wic.utils import misc, runner, errors | 22 | from wic.utils import misc |
23 | 23 | ||
24 | 24 | ||
25 | def get_siteconf(): | 25 | def 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 | |||
21 | import tempfile | 21 | import tempfile |
22 | import shutil | 22 | import shutil |
23 | 23 | ||
24 | from wic import kickstart | ||
25 | from wic import msger | 24 | from wic import msger |
26 | from wic.utils.errors import CreatorError | 25 | from wic.utils.errors import CreatorError |
27 | from wic.utils import misc, runner, fs_related as fs | 26 | from wic.utils import runner |
28 | 27 | ||
29 | class BaseImageCreator(object): | 28 | class 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 | |||
28 | import shutil | 28 | import shutil |
29 | 29 | ||
30 | from wic import kickstart, msger | 30 | from wic import kickstart, msger |
31 | from wic.utils import fs_related, runner, misc | 31 | from wic.utils import fs_related |
32 | from wic.utils.partitionedfs import Image | 32 | from wic.utils.partitionedfs import Image |
33 | from wic.utils.errors import CreatorError, ImageError | 33 | from wic.utils.errors import CreatorError, ImageError |
34 | from wic.imager.baseimager import BaseImageCreator | 34 | from 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 | ||
18 | from wic import msger | 18 | from wic import msger |
19 | from wic.utils import errors | ||
20 | 19 | ||
21 | class _Plugin(object): | 20 | class _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 | ||
27 | from wic import msger | 27 | from wic.utils import errors |
28 | from wic.utils import misc, fs_related, errors, runner, cmdln | ||
29 | from wic.conf import configmgr | 28 | from wic.conf import configmgr |
30 | from wic.plugin import pluginmgr | ||
31 | 29 | ||
32 | import wic.imager.direct as direct | 30 | import wic.imager.direct as direct |
33 | from wic.pluginbase import ImagerPlugin | 31 | from 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 @@ | |||
27 | import os | 27 | import os |
28 | import shutil | 28 | import shutil |
29 | 29 | ||
30 | from wic.utils.errors import ImageError | ||
31 | from wic import kickstart, msger | 30 | from wic import kickstart, msger |
32 | from wic.pluginbase import SourcePlugin | 31 | from wic.pluginbase import SourcePlugin |
33 | from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ | 32 | from 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 | |||
43 | import re | 43 | import re |
44 | import cmd | 44 | import cmd |
45 | import optparse | 45 | import optparse |
46 | from pprint import pprint | ||
47 | import sys | 46 | import sys |
48 | 47 | ||
49 | 48 | ||