diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-31 17:56:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-02 17:37:44 +0000 |
commit | 614851f1db51efeffd475152b8fc9a4b1ace9ef5 (patch) | |
tree | 4b663e75325260a40d16415d75352eb4625e730a /scripts/lib/wic/plugins/source | |
parent | 2d6f96048eb698f741b33c533b8eb15c19cc1f1d (diff) | |
download | poky-614851f1db51efeffd475152b8fc9a4b1ace9ef5.tar.gz |
wic: move oe/misc.py one level up
Flattened directory structure:
moved wic/utils/oe/misc.py -> wic/utils/misc.py
[YOCTO #10619]
(From OE-Core rev: 392532a2748ff2e6412eeb79163662b5168611ce)
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.py | 4 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-partition.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 4 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/fsimage.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/rawcopy.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/rootfs.py | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 8 |
8 files changed, 13 insertions, 13 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 28b941ed41..2b66a58d6e 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py | |||
@@ -30,8 +30,8 @@ import shutil | |||
30 | from wic import msger | 30 | from wic import msger |
31 | from wic.engine import get_custom_config | 31 | from wic.engine import get_custom_config |
32 | from wic.pluginbase import SourcePlugin | 32 | from wic.pluginbase import SourcePlugin |
33 | from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ | 33 | from wic.utils.misc import (exec_cmd, exec_native_cmd, get_bitbake_var, |
34 | BOOTDD_EXTRA_SPACE | 34 | BOOTDD_EXTRA_SPACE) |
35 | 35 | ||
36 | class BootimgEFIPlugin(SourcePlugin): | 36 | class BootimgEFIPlugin(SourcePlugin): |
37 | """ | 37 | """ |
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index b76c1211ae..f94dfabb6a 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 exec_cmd, get_bitbake_var | 31 | from wic.utils.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 283b8340b2..d796433d1d 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -31,8 +31,8 @@ from wic.engine import get_custom_config | |||
31 | from wic.utils import runner | 31 | from wic.utils import runner |
32 | from wic.utils.errors import ImageError | 32 | from wic.utils.errors import ImageError |
33 | from wic.pluginbase import SourcePlugin | 33 | from wic.pluginbase import SourcePlugin |
34 | from wic.utils.oe.misc import exec_cmd, exec_native_cmd, \ | 34 | from wic.utils.misc import (exec_cmd, exec_native_cmd, |
35 | get_bitbake_var, BOOTDD_EXTRA_SPACE | 35 | get_bitbake_var, BOOTDD_EXTRA_SPACE) |
36 | 36 | ||
37 | class BootimgPcbiosPlugin(SourcePlugin): | 37 | class BootimgPcbiosPlugin(SourcePlugin): |
38 | """ | 38 | """ |
diff --git a/scripts/lib/wic/plugins/source/fsimage.py b/scripts/lib/wic/plugins/source/fsimage.py index f894e89367..9193892ae1 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 get_bitbake_var | 22 | from wic.utils.misc import get_bitbake_var |
23 | 23 | ||
24 | class FSImagePlugin(SourcePlugin): | 24 | class FSImagePlugin(SourcePlugin): |
25 | """ | 25 | """ |
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 4979d8e0bf..6df375655c 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |||
@@ -28,7 +28,7 @@ import glob | |||
28 | from wic import msger | 28 | from wic import msger |
29 | from wic.engine import get_custom_config | 29 | from wic.engine import get_custom_config |
30 | from wic.pluginbase import SourcePlugin | 30 | from wic.pluginbase import SourcePlugin |
31 | from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var | 31 | from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var |
32 | 32 | ||
33 | class IsoImagePlugin(SourcePlugin): | 33 | class IsoImagePlugin(SourcePlugin): |
34 | """ | 34 | """ |
diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index 5bd22fdeb5..79e41cad27 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 exec_cmd, get_bitbake_var | 22 | from wic.utils.misc import exec_cmd, get_bitbake_var |
23 | from wic.filemap import sparse_copy | 23 | from wic.filemap import sparse_copy |
24 | 24 | ||
25 | class RawCopyPlugin(SourcePlugin): | 25 | class RawCopyPlugin(SourcePlugin): |
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 425da8b22a..891f095564 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py | |||
@@ -29,7 +29,7 @@ import os | |||
29 | 29 | ||
30 | from wic import msger | 30 | from wic import msger |
31 | from wic.pluginbase import SourcePlugin | 31 | from wic.pluginbase import SourcePlugin |
32 | from wic.utils.oe.misc import get_bitbake_var | 32 | from wic.utils.misc import get_bitbake_var |
33 | 33 | ||
34 | class RootfsPlugin(SourcePlugin): | 34 | class RootfsPlugin(SourcePlugin): |
35 | """ | 35 | """ |
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index 3d60e6f0ff..1032019a5f 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | |||
@@ -22,7 +22,7 @@ import os | |||
22 | from wic import msger | 22 | from wic import msger |
23 | from wic.utils import syslinux | 23 | from wic.utils import syslinux |
24 | from wic.utils import runner | 24 | from wic.utils import runner |
25 | from wic.utils.oe import misc | 25 | from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd |
26 | from wic.utils.errors import ImageError | 26 | from wic.utils.errors import ImageError |
27 | from wic.pluginbase import SourcePlugin | 27 | from wic.pluginbase import SourcePlugin |
28 | 28 | ||
@@ -58,7 +58,7 @@ class RootfsPlugin(SourcePlugin): | |||
58 | if os.path.isdir(rootfs_dir): | 58 | if os.path.isdir(rootfs_dir): |
59 | return rootfs_dir | 59 | return rootfs_dir |
60 | 60 | ||
61 | image_rootfs_dir = misc.get_bitbake_var("IMAGE_ROOTFS", rootfs_dir) | 61 | image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir) |
62 | if not os.path.isdir(image_rootfs_dir): | 62 | if not os.path.isdir(image_rootfs_dir): |
63 | msg = "No valid artifact IMAGE_ROOTFS from image named" | 63 | msg = "No valid artifact IMAGE_ROOTFS from image named" |
64 | msg += " %s has been found at %s, exiting.\n" % \ | 64 | msg += " %s has been found at %s, exiting.\n" % \ |
@@ -119,7 +119,7 @@ class RootfsPlugin(SourcePlugin): | |||
119 | native_syslinux_nomtools = os.path.join(native_sysroot, "usr/bin/syslinux-nomtools") | 119 | native_syslinux_nomtools = os.path.join(native_sysroot, "usr/bin/syslinux-nomtools") |
120 | if not is_exe(native_syslinux_nomtools): | 120 | if not is_exe(native_syslinux_nomtools): |
121 | msger.info("building syslinux-native...") | 121 | msger.info("building syslinux-native...") |
122 | misc.exec_cmd("bitbake syslinux-native") | 122 | exec_cmd("bitbake syslinux-native") |
123 | if not is_exe(native_syslinux_nomtools): | 123 | if not is_exe(native_syslinux_nomtools): |
124 | msger.error("Couldn't find syslinux-nomtools (%s), exiting\n" % | 124 | msger.error("Couldn't find syslinux-nomtools (%s), exiting\n" % |
125 | native_syslinux_nomtools) | 125 | native_syslinux_nomtools) |
@@ -145,7 +145,7 @@ class RootfsPlugin(SourcePlugin): | |||
145 | 145 | ||
146 | # install syslinux into rootfs partition | 146 | # install syslinux into rootfs partition |
147 | syslinux_cmd = "syslinux-nomtools -d /boot -i %s" % part.source_file | 147 | syslinux_cmd = "syslinux-nomtools -d /boot -i %s" % part.source_file |
148 | misc.exec_native_cmd(syslinux_cmd, native_sysroot) | 148 | exec_native_cmd(syslinux_cmd, native_sysroot) |
149 | 149 | ||
150 | @classmethod | 150 | @classmethod |
151 | def do_install_disk(cls, disk, disk_name, image_creator, workdir, oe_builddir, | 151 | def do_install_disk(cls, disk, disk_name, image_creator, workdir, oe_builddir, |