summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-31 13:32:03 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-02 17:37:44 +0000
commit2d6f96048eb698f741b33c533b8eb15c19cc1f1d (patch)
tree8eab74694969f7f17aff4034ec2ca2b01dee1ecd /scripts/lib/wic/plugins/source
parent759c24c404509b9d415d6f05e316553503b376b4 (diff)
downloadpoky-2d6f96048eb698f741b33c533b8eb15c19cc1f1d.tar.gz
wic: move 2 APIs to wic.engine
Moved find_canned and get_custom_config APIs to engine module. Removed empty wic.utils.misc module. [YOCTO #10619] (From OE-Core rev: 10e9afac46575d3f557b7cb505daa31ce9ce85fa) Signed-off-by: Ed Bartosh <ed.bartosh@linux.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.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py4
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 74a1557f91..28b941ed41 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -28,8 +28,8 @@ import os
28import shutil 28import shutil
29 29
30from wic import msger 30from wic import msger
31from wic.engine import get_custom_config
31from wic.pluginbase import SourcePlugin 32from wic.pluginbase import SourcePlugin
32from wic.utils.misc import get_custom_config
33from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ 33from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
34 BOOTDD_EXTRA_SPACE 34 BOOTDD_EXTRA_SPACE
35 35
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index cff8aec059..283b8340b2 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -26,10 +26,10 @@
26 26
27import os 27import os
28 28
29from wic.utils.errors import ImageError
30from wic import msger 29from wic import msger
30from wic.engine import get_custom_config
31from wic.utils import runner 31from wic.utils import runner
32from wic.utils.misc import get_custom_config 32from wic.utils.errors import ImageError
33from wic.pluginbase import SourcePlugin 33from wic.pluginbase import SourcePlugin
34from wic.utils.oe.misc import exec_cmd, exec_native_cmd, \ 34from wic.utils.oe.misc import exec_cmd, exec_native_cmd, \
35 get_bitbake_var, BOOTDD_EXTRA_SPACE 35 get_bitbake_var, BOOTDD_EXTRA_SPACE
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index bceaa84398..4979d8e0bf 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -26,8 +26,8 @@ import shutil
26import glob 26import glob
27 27
28from wic import msger 28from wic import msger
29from wic.engine import get_custom_config
29from wic.pluginbase import SourcePlugin 30from wic.pluginbase import SourcePlugin
30from wic.utils.misc import get_custom_config
31from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var 31from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var
32 32
33class IsoImagePlugin(SourcePlugin): 33class IsoImagePlugin(SourcePlugin):