summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/wic/engine.py2
-rw-r--r--scripts/lib/wic/misc.py (renamed from scripts/lib/wic/utils/misc.py)0
-rw-r--r--scripts/lib/wic/partition.py2
-rw-r--r--scripts/lib/wic/pluginbase.py2
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py4
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-partition.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py5
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py2
-rw-r--r--scripts/lib/wic/plugins/source/rawcopy.py2
-rw-r--r--scripts/lib/wic/plugins/source/rootfs.py2
-rw-r--r--scripts/lib/wic/utils/__init__.py0
-rwxr-xr-xscripts/wic2
13 files changed, 13 insertions, 14 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 2c899dd386..2dc2fd5ed4 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -38,7 +38,7 @@ from distutils.spawn import find_executable
38from wic import WicError 38from wic import WicError
39from wic.filemap import sparse_copy 39from wic.filemap import sparse_copy
40from wic.pluginbase import PluginMgr 40from wic.pluginbase import PluginMgr
41from wic.utils.misc import get_bitbake_var, exec_cmd 41from wic.misc import get_bitbake_var, exec_cmd
42 42
43logger = logging.getLogger('wic') 43logger = logging.getLogger('wic')
44 44
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/misc.py
index 46099840ca..46099840ca 100644
--- a/scripts/lib/wic/utils/misc.py
+++ b/scripts/lib/wic/misc.py
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 939e66731b..1851c4a3a5 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -29,7 +29,7 @@ import os
29import tempfile 29import tempfile
30 30
31from wic import WicError 31from wic import WicError
32from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var 32from wic.misc import exec_cmd, exec_native_cmd, get_bitbake_var
33from wic.pluginbase import PluginMgr 33from wic.pluginbase import PluginMgr
34 34
35logger = logging.getLogger('wic') 35logger = logging.getLogger('wic')
diff --git a/scripts/lib/wic/pluginbase.py b/scripts/lib/wic/pluginbase.py
index fb3d179c2d..08f9979f3c 100644
--- a/scripts/lib/wic/pluginbase.py
+++ b/scripts/lib/wic/pluginbase.py
@@ -24,7 +24,7 @@ from collections import defaultdict
24from importlib.machinery import SourceFileLoader 24from importlib.machinery import SourceFileLoader
25 25
26from wic import WicError 26from wic import WicError
27from wic.utils.misc import get_bitbake_var 27from wic.misc import get_bitbake_var
28 28
29PLUGIN_TYPES = ["imager", "source"] 29PLUGIN_TYPES = ["imager", "source"]
30 30
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 3cdedd1579..ad9082b2d3 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -36,7 +36,7 @@ from wic import WicError
36from wic.filemap import sparse_copy 36from wic.filemap import sparse_copy
37from wic.ksparser import KickStart, KickStartError 37from wic.ksparser import KickStart, KickStartError
38from wic.pluginbase import PluginMgr, ImagerPlugin 38from wic.pluginbase import PluginMgr, ImagerPlugin
39from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd 39from wic.misc import get_bitbake_var, exec_cmd, exec_native_cmd
40 40
41logger = logging.getLogger('wic') 41logger = logging.getLogger('wic')
42 42
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 9879cb9fce..4c4f36a32f 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -31,8 +31,8 @@ import shutil
31from wic import WicError 31from wic import WicError
32from wic.engine import get_custom_config 32from wic.engine import get_custom_config
33from wic.pluginbase import SourcePlugin 33from wic.pluginbase import SourcePlugin
34from wic.utils.misc import (exec_cmd, exec_native_cmd, get_bitbake_var, 34from wic.misc import (exec_cmd, exec_native_cmd,
35 BOOTDD_EXTRA_SPACE) 35 get_bitbake_var, BOOTDD_EXTRA_SPACE)
36 36
37logger = logging.getLogger('wic') 37logger = logging.getLogger('wic')
38 38
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index 13fddbd478..ca074a39d8 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -31,7 +31,7 @@ from glob import glob
31 31
32from wic import WicError 32from wic import WicError
33from wic.pluginbase import SourcePlugin 33from wic.pluginbase import SourcePlugin
34from wic.utils.misc import exec_cmd, get_bitbake_var 34from wic.misc import exec_cmd, get_bitbake_var
35 35
36logger = logging.getLogger('wic') 36logger = logging.getLogger('wic')
37 37
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 98ad88b03e..e3518d2f0b 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -29,10 +29,9 @@ import os
29 29
30from wic import WicError 30from wic import WicError
31from wic.engine import get_custom_config 31from wic.engine import get_custom_config
32from wic.utils import runner
33from wic.pluginbase import SourcePlugin 32from wic.pluginbase import SourcePlugin
34from wic.utils.misc import (exec_cmd, exec_native_cmd, 33from wic.misc import (exec_cmd, exec_native_cmd,
35 get_bitbake_var, BOOTDD_EXTRA_SPACE) 34 get_bitbake_var, BOOTDD_EXTRA_SPACE)
36 35
37logger = logging.getLogger('wic') 36logger = logging.getLogger('wic')
38 37
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index b464263c3d..db77113232 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -29,7 +29,7 @@ import shutil
29from wic import WicError 29from wic import WicError
30from wic.engine import get_custom_config 30from wic.engine import get_custom_config
31from wic.pluginbase import SourcePlugin 31from wic.pluginbase import SourcePlugin
32from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var 32from wic.misc import exec_cmd, exec_native_cmd, get_bitbake_var
33 33
34logger = logging.getLogger('wic') 34logger = logging.getLogger('wic')
35 35
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index e1c4f5e7db..424ed26ed6 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -20,7 +20,7 @@ import os
20 20
21from wic import WicError 21from wic import WicError
22from wic.pluginbase import SourcePlugin 22from wic.pluginbase import SourcePlugin
23from wic.utils.misc import exec_cmd, get_bitbake_var 23from wic.misc import exec_cmd, get_bitbake_var
24from wic.filemap import sparse_copy 24from wic.filemap import sparse_copy
25 25
26logger = logging.getLogger('wic') 26logger = logging.getLogger('wic')
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index 944ec5f455..1b9f68b874 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -34,7 +34,7 @@ from oe.path import copyhardlinktree
34 34
35from wic import WicError 35from wic import WicError
36from wic.pluginbase import SourcePlugin 36from wic.pluginbase import SourcePlugin
37from wic.utils.misc import get_bitbake_var, exec_cmd 37from wic.misc import get_bitbake_var, exec_cmd
38 38
39logger = logging.getLogger('wic') 39logger = logging.getLogger('wic')
40 40
diff --git a/scripts/lib/wic/utils/__init__.py b/scripts/lib/wic/utils/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/scripts/lib/wic/utils/__init__.py
+++ /dev/null
diff --git a/scripts/wic b/scripts/wic
index da14f4714a..81fc85d693 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -56,7 +56,7 @@ else:
56 bitbake_main = None 56 bitbake_main = None
57 57
58from wic import WicError 58from wic import WicError
59from wic.utils.misc import get_bitbake_var, BB_VARS 59from wic.misc import get_bitbake_var, BB_VARS
60from wic import engine 60from wic import engine
61from wic import help as hlp 61from wic import help as hlp
62 62