diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 8 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-partition.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 9 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/fsimage.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/rawcopy.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/rootfs.py | 9 |
6 files changed, 10 insertions, 22 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 883378ee84..2fc0357a5c 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
@@ -29,13 +29,9 @@ import shutil | |||
29 | 29 | ||
30 | from wic.utils.errors import ImageError | 30 | from wic.utils.errors import ImageError |
31 | from wic import kickstart, msger | 31 | from wic import kickstart, msger |
32 | from wic.utils import misc, fs_related, errors, runner, cmdln | ||
33 | from wic.conf import configmgr | ||
34 | from wic.plugin import pluginmgr | ||
35 | import wic.imager.direct as direct | ||
36 | from wic.pluginbase import SourcePlugin | 32 | from wic.pluginbase import SourcePlugin |
37 | from wic.utils.oe.misc import * | 33 | from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ |
38 | from wic.imager.direct import DirectImageCreator | 34 | BOOTDD_EXTRA_SPACE |
39 | 35 | ||
40 | class BootimgEFIPlugin(SourcePlugin): | 36 | class BootimgEFIPlugin(SourcePlugin): |
41 | name = 'bootimg-efi' | 37 | name = 'bootimg-efi' |
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index c5eb7b8b80..909e59b6e2 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py | |||
@@ -28,7 +28,7 @@ import re | |||
28 | 28 | ||
29 | from wic import msger | 29 | from wic import msger |
30 | from wic.pluginbase import SourcePlugin | 30 | from wic.pluginbase import SourcePlugin |
31 | from wic.utils.oe.misc import * | 31 | from wic.utils.oe.misc import exec_cmd, get_bitbake_var |
32 | from glob import glob | 32 | from glob import glob |
33 | 33 | ||
34 | class BootimgPartitionPlugin(SourcePlugin): | 34 | class BootimgPartitionPlugin(SourcePlugin): |
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 2280867308..9c638554c0 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -28,13 +28,10 @@ import os | |||
28 | 28 | ||
29 | from wic.utils.errors import ImageError | 29 | from wic.utils.errors import ImageError |
30 | from wic import kickstart, msger | 30 | from wic import kickstart, msger |
31 | from wic.utils import misc, fs_related, errors, runner, cmdln | 31 | from wic.utils import runner |
32 | from wic.conf import configmgr | ||
33 | from wic.plugin import pluginmgr | ||
34 | import wic.imager.direct as direct | ||
35 | from wic.pluginbase import SourcePlugin | 32 | from wic.pluginbase import SourcePlugin |
36 | from wic.utils.oe.misc import * | 33 | from wic.utils.oe.misc import exec_cmd, exec_native_cmd, \ |
37 | from wic.imager.direct import DirectImageCreator | 34 | get_bitbake_var, BOOTDD_EXTRA_SPACE |
38 | 35 | ||
39 | class BootimgPcbiosPlugin(SourcePlugin): | 36 | class BootimgPcbiosPlugin(SourcePlugin): |
40 | name = 'bootimg-pcbios' | 37 | name = 'bootimg-pcbios' |
diff --git a/scripts/lib/wic/plugins/source/fsimage.py b/scripts/lib/wic/plugins/source/fsimage.py index 4a090bac42..ef56cf278b 100644 --- a/scripts/lib/wic/plugins/source/fsimage.py +++ b/scripts/lib/wic/plugins/source/fsimage.py | |||
@@ -19,7 +19,7 @@ import os | |||
19 | 19 | ||
20 | from wic import msger | 20 | from wic import msger |
21 | from wic.pluginbase import SourcePlugin | 21 | from wic.pluginbase import SourcePlugin |
22 | from wic.utils.oe.misc import * | 22 | from wic.utils.oe.misc import get_bitbake_var |
23 | 23 | ||
24 | class FSImagePlugin(SourcePlugin): | 24 | class FSImagePlugin(SourcePlugin): |
25 | name = 'fsimage' | 25 | name = 'fsimage' |
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index ca6b721b67..444c0268fb 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py | |||
@@ -19,7 +19,7 @@ import os | |||
19 | 19 | ||
20 | from wic import msger | 20 | from wic import msger |
21 | from wic.pluginbase import SourcePlugin | 21 | from wic.pluginbase import SourcePlugin |
22 | from wic.utils.oe.misc import * | 22 | from wic.utils.oe.misc import exec_cmd, get_bitbake_var |
23 | 23 | ||
24 | class RawCopyPlugin(SourcePlugin): | 24 | class RawCopyPlugin(SourcePlugin): |
25 | name = 'rawcopy' | 25 | name = 'rawcopy' |
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 6f5d9bb19f..7d444301fb 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py | |||
@@ -27,14 +27,9 @@ | |||
27 | 27 | ||
28 | import os | 28 | import os |
29 | 29 | ||
30 | from wic import kickstart, msger | 30 | from wic import msger |
31 | from wic.utils import misc, fs_related, errors, runner, cmdln | ||
32 | from wic.conf import configmgr | ||
33 | from wic.plugin import pluginmgr | ||
34 | import wic.imager.direct as direct | ||
35 | from wic.pluginbase import SourcePlugin | 31 | from wic.pluginbase import SourcePlugin |
36 | from wic.utils.oe.misc import * | 32 | from wic.utils.oe.misc import find_bitbake_env_lines, find_artifact |
37 | from wic.imager.direct import DirectImageCreator | ||
38 | 33 | ||
39 | class RootfsPlugin(SourcePlugin): | 34 | class RootfsPlugin(SourcePlugin): |
40 | name = 'rootfs' | 35 | name = 'rootfs' |