summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-06-16 16:19:28 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-23 11:44:12 +0100
commitdd7e0ae43d84eefb5cc0155656f5d540e01944fb (patch)
tree440dafdb12e5d72d01d5346b54a2d61766e360cd /scripts/lib/wic/plugins/source
parentf9b476ebcd9034aa1b91db7d38cad833d1e7725e (diff)
downloadpoky-dd7e0ae43d84eefb5cc0155656f5d540e01944fb.tar.gz
wic: flatten directory structure
Moved misc.py from wic/utils/ to wic/ Removed wic/utils directory (From OE-Core rev: df906f3caa0721756f5ed48fa657e62e05ae2aa3) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugins/source')
-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
6 files changed, 8 insertions, 9 deletions
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