summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-31 17:56:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-02 17:37:44 +0000
commit614851f1db51efeffd475152b8fc9a4b1ace9ef5 (patch)
tree4b663e75325260a40d16415d75352eb4625e730a /scripts/lib/wic
parent2d6f96048eb698f741b33c533b8eb15c19cc1f1d (diff)
downloadpoky-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')
-rw-r--r--scripts/lib/wic/engine.py4
-rw-r--r--scripts/lib/wic/partition.py4
-rw-r--r--scripts/lib/wic/plugin.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.py4
-rw-r--r--scripts/lib/wic/plugins/source/fsimage.py2
-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/plugins/source/rootfs_pcbios_ext.py8
-rw-r--r--scripts/lib/wic/utils/misc.py (renamed from scripts/lib/wic/utils/oe/misc.py)0
-rw-r--r--scripts/lib/wic/utils/partitionedfs.py2
14 files changed, 20 insertions, 20 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 4abea87273..685bc8898f 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -33,7 +33,7 @@ import sys
33 33
34from wic import msger, creator 34from wic import msger, creator
35from wic.plugin import pluginmgr 35from wic.plugin import pluginmgr
36from wic.utils.oe import misc 36from wic.utils.misc import get_bitbake_var
37 37
38 38
39def verify_build_env(): 39def verify_build_env():
@@ -54,7 +54,7 @@ SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
54WIC_DIR = "wic" 54WIC_DIR = "wic"
55 55
56def build_canned_image_list(path): 56def build_canned_image_list(path):
57 layers_path = misc.get_bitbake_var("BBLAYERS") 57 layers_path = get_bitbake_var("BBLAYERS")
58 canned_wks_layer_dirs = [] 58 canned_wks_layer_dirs = []
59 59
60 if layers_path is not None: 60 if layers_path is not None:
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 094a8c3bec..31a03506ca 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -27,8 +27,8 @@
27import os 27import os
28import tempfile 28import tempfile
29 29
30from wic.utils.oe.misc import msger 30from wic import msger
31from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var 31from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var
32from wic.plugin import pluginmgr 32from wic.plugin import pluginmgr
33 33
34class Partition(): 34class Partition():
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py
index 306b32437e..6b06ed654d 100644
--- a/scripts/lib/wic/plugin.py
+++ b/scripts/lib/wic/plugin.py
@@ -20,7 +20,7 @@ import os, sys
20from wic import msger 20from wic import msger
21from wic import pluginbase 21from wic import pluginbase
22from wic.utils import errors 22from wic.utils import errors
23from wic.utils.oe.misc import get_bitbake_var 23from wic.utils.misc import get_bitbake_var
24 24
25__ALL__ = ['PluginMgr', 'pluginmgr'] 25__ALL__ = ['PluginMgr', 'pluginmgr']
26 26
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 9cd7068333..592412a634 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -37,7 +37,7 @@ from wic.plugin import pluginmgr
37from wic.pluginbase import ImagerPlugin 37from wic.pluginbase import ImagerPlugin
38from wic.utils import errors 38from wic.utils import errors
39from wic.utils.errors import CreatorError, ImageError 39from wic.utils.errors import CreatorError, ImageError
40from wic.utils.oe.misc import get_bitbake_var, exec_cmd, exec_native_cmd 40from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
41from wic.utils.partitionedfs import Image 41from wic.utils.partitionedfs import Image
42 42
43class DirectPlugin(ImagerPlugin): 43class DirectPlugin(ImagerPlugin):
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
30from wic import msger 30from wic import msger
31from wic.engine import get_custom_config 31from wic.engine import get_custom_config
32from wic.pluginbase import SourcePlugin 32from wic.pluginbase import SourcePlugin
33from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \ 33from wic.utils.misc import (exec_cmd, exec_native_cmd, get_bitbake_var,
34 BOOTDD_EXTRA_SPACE 34 BOOTDD_EXTRA_SPACE)
35 35
36class BootimgEFIPlugin(SourcePlugin): 36class 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
29from wic import msger 29from wic import msger
30from wic.pluginbase import SourcePlugin 30from wic.pluginbase import SourcePlugin
31from wic.utils.oe.misc import exec_cmd, get_bitbake_var 31from wic.utils.misc import exec_cmd, get_bitbake_var
32from glob import glob 32from glob import glob
33 33
34class BootimgPartitionPlugin(SourcePlugin): 34class 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
31from wic.utils import runner 31from wic.utils import runner
32from wic.utils.errors import ImageError 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.misc import (exec_cmd, exec_native_cmd,
35 get_bitbake_var, BOOTDD_EXTRA_SPACE 35 get_bitbake_var, BOOTDD_EXTRA_SPACE)
36 36
37class BootimgPcbiosPlugin(SourcePlugin): 37class 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
20from wic import msger 20from wic import msger
21from wic.pluginbase import SourcePlugin 21from wic.pluginbase import SourcePlugin
22from wic.utils.oe.misc import get_bitbake_var 22from wic.utils.misc import get_bitbake_var
23 23
24class FSImagePlugin(SourcePlugin): 24class 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
28from wic import msger 28from wic import msger
29from wic.engine import get_custom_config 29from wic.engine import get_custom_config
30from wic.pluginbase import SourcePlugin 30from wic.pluginbase import SourcePlugin
31from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var 31from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var
32 32
33class IsoImagePlugin(SourcePlugin): 33class 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
20from wic import msger 20from wic import msger
21from wic.pluginbase import SourcePlugin 21from wic.pluginbase import SourcePlugin
22from wic.utils.oe.misc import exec_cmd, get_bitbake_var 22from wic.utils.misc import exec_cmd, get_bitbake_var
23from wic.filemap import sparse_copy 23from wic.filemap import sparse_copy
24 24
25class RawCopyPlugin(SourcePlugin): 25class 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
30from wic import msger 30from wic import msger
31from wic.pluginbase import SourcePlugin 31from wic.pluginbase import SourcePlugin
32from wic.utils.oe.misc import get_bitbake_var 32from wic.utils.misc import get_bitbake_var
33 33
34class RootfsPlugin(SourcePlugin): 34class 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
22from wic import msger 22from wic import msger
23from wic.utils import syslinux 23from wic.utils import syslinux
24from wic.utils import runner 24from wic.utils import runner
25from wic.utils.oe import misc 25from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
26from wic.utils.errors import ImageError 26from wic.utils.errors import ImageError
27from wic.pluginbase import SourcePlugin 27from 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,
diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/misc.py
index 6781d8381a..6781d8381a 100644
--- a/scripts/lib/wic/utils/oe/misc.py
+++ b/scripts/lib/wic/utils/misc.py
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index ed67b9ace7..eb4d7e6a51 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -21,7 +21,7 @@
21import os 21import os
22from wic import msger 22from wic import msger
23from wic.utils.errors import ImageError 23from wic.utils.errors import ImageError
24from wic.utils.oe.misc import exec_cmd, exec_native_cmd 24from wic.utils.misc import exec_cmd, exec_native_cmd
25from wic.filemap import sparse_copy 25from wic.filemap import sparse_copy
26 26
27# Overhead of the MBR partitioning scheme (just one sector) 27# Overhead of the MBR partitioning scheme (just one sector)