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>
This commit is contained in:
parent
2d6f96048e
commit
614851f1db
|
@ -33,7 +33,7 @@ import sys
|
|||
|
||||
from wic import msger, creator
|
||||
from wic.plugin import pluginmgr
|
||||
from wic.utils.oe import misc
|
||||
from wic.utils.misc import get_bitbake_var
|
||||
|
||||
|
||||
def verify_build_env():
|
||||
|
@ -54,7 +54,7 @@ SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
|
|||
WIC_DIR = "wic"
|
||||
|
||||
def build_canned_image_list(path):
|
||||
layers_path = misc.get_bitbake_var("BBLAYERS")
|
||||
layers_path = get_bitbake_var("BBLAYERS")
|
||||
canned_wks_layer_dirs = []
|
||||
|
||||
if layers_path is not None:
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
import os
|
||||
import tempfile
|
||||
|
||||
from wic.utils.oe.misc import msger
|
||||
from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var
|
||||
from wic import msger
|
||||
from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var
|
||||
from wic.plugin import pluginmgr
|
||||
|
||||
class Partition():
|
||||
|
|
|
@ -20,7 +20,7 @@ import os, sys
|
|||
from wic import msger
|
||||
from wic import pluginbase
|
||||
from wic.utils import errors
|
||||
from wic.utils.oe.misc import get_bitbake_var
|
||||
from wic.utils.misc import get_bitbake_var
|
||||
|
||||
__ALL__ = ['PluginMgr', 'pluginmgr']
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ from wic.plugin import pluginmgr
|
|||
from wic.pluginbase import ImagerPlugin
|
||||
from wic.utils import errors
|
||||
from wic.utils.errors import CreatorError, ImageError
|
||||
from wic.utils.oe.misc import get_bitbake_var, exec_cmd, exec_native_cmd
|
||||
from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
|
||||
from wic.utils.partitionedfs import Image
|
||||
|
||||
class DirectPlugin(ImagerPlugin):
|
||||
|
|
|
@ -30,8 +30,8 @@ import shutil
|
|||
from wic import msger
|
||||
from wic.engine import get_custom_config
|
||||
from wic.pluginbase import SourcePlugin
|
||||
from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
|
||||
BOOTDD_EXTRA_SPACE
|
||||
from wic.utils.misc import (exec_cmd, exec_native_cmd, get_bitbake_var,
|
||||
BOOTDD_EXTRA_SPACE)
|
||||
|
||||
class BootimgEFIPlugin(SourcePlugin):
|
||||
"""
|
||||
|
|
|
@ -28,7 +28,7 @@ import re
|
|||
|
||||
from wic import msger
|
||||
from wic.pluginbase import SourcePlugin
|
||||
from wic.utils.oe.misc import exec_cmd, get_bitbake_var
|
||||
from wic.utils.misc import exec_cmd, get_bitbake_var
|
||||
from glob import glob
|
||||
|
||||
class BootimgPartitionPlugin(SourcePlugin):
|
||||
|
|
|
@ -31,8 +31,8 @@ from wic.engine import get_custom_config
|
|||
from wic.utils import runner
|
||||
from wic.utils.errors import ImageError
|
||||
from wic.pluginbase import SourcePlugin
|
||||
from wic.utils.oe.misc import exec_cmd, exec_native_cmd, \
|
||||
get_bitbake_var, BOOTDD_EXTRA_SPACE
|
||||
from wic.utils.misc import (exec_cmd, exec_native_cmd,
|
||||
get_bitbake_var, BOOTDD_EXTRA_SPACE)
|
||||
|
||||
class BootimgPcbiosPlugin(SourcePlugin):
|
||||
"""
|
||||
|
|
|
@ -19,7 +19,7 @@ import os
|
|||
|
||||
from wic import msger
|
||||
from wic.pluginbase import SourcePlugin
|
||||
from wic.utils.oe.misc import get_bitbake_var
|
||||
from wic.utils.misc import get_bitbake_var
|
||||
|
||||
class FSImagePlugin(SourcePlugin):
|
||||
"""
|
||||
|
|
|
@ -28,7 +28,7 @@ import glob
|
|||
from wic import msger
|
||||
from wic.engine import get_custom_config
|
||||
from wic.pluginbase import SourcePlugin
|
||||
from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var
|
||||
from wic.utils.misc import exec_cmd, exec_native_cmd, get_bitbake_var
|
||||
|
||||
class IsoImagePlugin(SourcePlugin):
|
||||
"""
|
||||
|
|
|
@ -19,7 +19,7 @@ import os
|
|||
|
||||
from wic import msger
|
||||
from wic.pluginbase import SourcePlugin
|
||||
from wic.utils.oe.misc import exec_cmd, get_bitbake_var
|
||||
from wic.utils.misc import exec_cmd, get_bitbake_var
|
||||
from wic.filemap import sparse_copy
|
||||
|
||||
class RawCopyPlugin(SourcePlugin):
|
||||
|
|
|
@ -29,7 +29,7 @@ import os
|
|||
|
||||
from wic import msger
|
||||
from wic.pluginbase import SourcePlugin
|
||||
from wic.utils.oe.misc import get_bitbake_var
|
||||
from wic.utils.misc import get_bitbake_var
|
||||
|
||||
class RootfsPlugin(SourcePlugin):
|
||||
"""
|
||||
|
|
|
@ -22,7 +22,7 @@ import os
|
|||
from wic import msger
|
||||
from wic.utils import syslinux
|
||||
from wic.utils import runner
|
||||
from wic.utils.oe import misc
|
||||
from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
|
||||
from wic.utils.errors import ImageError
|
||||
from wic.pluginbase import SourcePlugin
|
||||
|
||||
|
@ -58,7 +58,7 @@ class RootfsPlugin(SourcePlugin):
|
|||
if os.path.isdir(rootfs_dir):
|
||||
return rootfs_dir
|
||||
|
||||
image_rootfs_dir = misc.get_bitbake_var("IMAGE_ROOTFS", rootfs_dir)
|
||||
image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir)
|
||||
if not os.path.isdir(image_rootfs_dir):
|
||||
msg = "No valid artifact IMAGE_ROOTFS from image named"
|
||||
msg += " %s has been found at %s, exiting.\n" % \
|
||||
|
@ -119,7 +119,7 @@ class RootfsPlugin(SourcePlugin):
|
|||
native_syslinux_nomtools = os.path.join(native_sysroot, "usr/bin/syslinux-nomtools")
|
||||
if not is_exe(native_syslinux_nomtools):
|
||||
msger.info("building syslinux-native...")
|
||||
misc.exec_cmd("bitbake syslinux-native")
|
||||
exec_cmd("bitbake syslinux-native")
|
||||
if not is_exe(native_syslinux_nomtools):
|
||||
msger.error("Couldn't find syslinux-nomtools (%s), exiting\n" %
|
||||
native_syslinux_nomtools)
|
||||
|
@ -145,7 +145,7 @@ class RootfsPlugin(SourcePlugin):
|
|||
|
||||
# install syslinux into rootfs partition
|
||||
syslinux_cmd = "syslinux-nomtools -d /boot -i %s" % part.source_file
|
||||
misc.exec_native_cmd(syslinux_cmd, native_sysroot)
|
||||
exec_native_cmd(syslinux_cmd, native_sysroot)
|
||||
|
||||
@classmethod
|
||||
def do_install_disk(cls, disk, disk_name, image_creator, workdir, oe_builddir,
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
import os
|
||||
from wic import msger
|
||||
from wic.utils.errors import ImageError
|
||||
from wic.utils.oe.misc import exec_cmd, exec_native_cmd
|
||||
from wic.utils.misc import exec_cmd, exec_native_cmd
|
||||
from wic.filemap import sparse_copy
|
||||
|
||||
# Overhead of the MBR partitioning scheme (just one sector)
|
||||
|
|
|
@ -51,7 +51,7 @@ if bitbake_exe:
|
|||
else:
|
||||
bitbake_main = None
|
||||
|
||||
from wic.utils.oe.misc import get_bitbake_var, BB_VARS
|
||||
from wic.utils.misc import get_bitbake_var, BB_VARS
|
||||
from wic.utils.errors import WicError
|
||||
from wic import engine
|
||||
from wic import help as hlp
|
||||
|
|
Loading…
Reference in New Issue