MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

wic: move oe/misc.py one level up

Browse Source 
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:
Ed Bartosh 2017-01-31 17:56:56 +02:00 committed by Richard Purdie
parent 2d6f96048e
commit 614851f1db
15 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/lib/wic/engine.py
View File

@ -33,7 +33,7 @@ import sys
from wic import msger, creator from wic import msger, creator
from wic.plugin import pluginmgr from wic.plugin import pluginmgr
from wic.utils.oe import misc from wic.utils.misc import get_bitbake_var
def verify_build_env(): def verify_build_env():
@ -54,7 +54,7 @@ SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
WIC_DIR = "wic" WIC_DIR = "wic"
def build_canned_image_list(path): def build_canned_image_list(path):
layers_path = misc.get_bitbake_var("BBLAYERS") layers_path = get_bitbake_var("BBLAYERS")
canned_wks_layer_dirs = [] canned_wks_layer_dirs = []
if layers_path is not None: if layers_path is not None:

4
scripts/lib/wic/partition.py
View File

@ -27,8 +27,8 @@
import os import os
import tempfile import tempfile
from wic.utils.oe.misc import msger from wic import msger
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
from wic.plugin import pluginmgr from wic.plugin import pluginmgr
class Partition(): class Partition():

2
scripts/lib/wic/plugin.py
View File

@ -20,7 +20,7 @@ import os, sys
from wic import msger from wic import msger
from wic import pluginbase from wic import pluginbase
from wic.utils import errors 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'] __ALL__ = ['PluginMgr', 'pluginmgr']

2
scripts/lib/wic/plugins/imager/direct.py
View File

@ -37,7 +37,7 @@ from wic.plugin import pluginmgr
from wic.pluginbase import ImagerPlugin from wic.pluginbase import ImagerPlugin
from wic.utils import errors from wic.utils import errors
from wic.utils.errors import CreatorError, ImageError 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 from wic.utils.partitionedfs import Image
class DirectPlugin(ImagerPlugin): class DirectPlugin(ImagerPlugin):

4
scripts/lib/wic/plugins/source/bootimg-efi.py
View File

@ -30,8 +30,8 @@ import shutil
from wic import msger from wic import msger
from wic.engine import get_custom_config from wic.engine import get_custom_config
from wic.pluginbase import SourcePlugin 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,
BOOTDD_EXTRA_SPACE BOOTDD_EXTRA_SPACE)
class BootimgEFIPlugin(SourcePlugin): class BootimgEFIPlugin(SourcePlugin):
""" """

2
scripts/lib/wic/plugins/source/bootimg-partition.py
View File

@ -28,7 +28,7 @@ import re
from wic import msger from wic import msger
from wic.pluginbase import SourcePlugin 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 from glob import glob
class BootimgPartitionPlugin(SourcePlugin): class BootimgPartitionPlugin(SourcePlugin):

4
scripts/lib/wic/plugins/source/bootimg-pcbios.py
View File

@ -31,8 +31,8 @@ from wic.engine import get_custom_config
from wic.utils import runner from wic.utils import runner
from wic.utils.errors import ImageError from wic.utils.errors import ImageError
from wic.pluginbase import SourcePlugin from wic.pluginbase import SourcePlugin
from wic.utils.oe.misc import exec_cmd, exec_native_cmd, \ from wic.utils.misc import (exec_cmd, exec_native_cmd,
get_bitbake_var, BOOTDD_EXTRA_SPACE get_bitbake_var, BOOTDD_EXTRA_SPACE)
class BootimgPcbiosPlugin(SourcePlugin): class BootimgPcbiosPlugin(SourcePlugin):
""" """

2
scripts/lib/wic/plugins/source/fsimage.py
View File

@ -19,7 +19,7 @@ import os
from wic import msger from wic import msger
from wic.pluginbase import SourcePlugin 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): class FSImagePlugin(SourcePlugin):
""" """

2
scripts/lib/wic/plugins/source/isoimage-isohybrid.py
View File

@ -28,7 +28,7 @@ import glob
from wic import msger from wic import msger
from wic.engine import get_custom_config from wic.engine import get_custom_config
from wic.pluginbase import SourcePlugin 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): class IsoImagePlugin(SourcePlugin):
""" """

2
scripts/lib/wic/plugins/source/rawcopy.py
View File

@ -19,7 +19,7 @@ import os
from wic import msger from wic import msger
from wic.pluginbase import SourcePlugin 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 from wic.filemap import sparse_copy
class RawCopyPlugin(SourcePlugin): class RawCopyPlugin(SourcePlugin):

2
scripts/lib/wic/plugins/source/rootfs.py
View File

@ -29,7 +29,7 @@ import os
from wic import msger from wic import msger
from wic.pluginbase import SourcePlugin 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): class RootfsPlugin(SourcePlugin):
""" """

8
scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
View File

@ -22,7 +22,7 @@ import os
from wic import msger from wic import msger
from wic.utils import syslinux from wic.utils import syslinux
from wic.utils import runner 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.utils.errors import ImageError
from wic.pluginbase import SourcePlugin from wic.pluginbase import SourcePlugin
@ -58,7 +58,7 @@ class RootfsPlugin(SourcePlugin):
if os.path.isdir(rootfs_dir): if os.path.isdir(rootfs_dir):
return 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): if not os.path.isdir(image_rootfs_dir):
msg = "No valid artifact IMAGE_ROOTFS from image named" msg = "No valid artifact IMAGE_ROOTFS from image named"
msg += " %s has been found at %s, exiting.\n" % \ 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") native_syslinux_nomtools = os.path.join(native_sysroot, "usr/bin/syslinux-nomtools")
if not is_exe(native_syslinux_nomtools): if not is_exe(native_syslinux_nomtools):
msger.info("building syslinux-native...") msger.info("building syslinux-native...")
misc.exec_cmd("bitbake syslinux-native") exec_cmd("bitbake syslinux-native")
if not is_exe(native_syslinux_nomtools): if not is_exe(native_syslinux_nomtools):
msger.error("Couldn't find syslinux-nomtools (%s), exiting\n" % msger.error("Couldn't find syslinux-nomtools (%s), exiting\n" %
native_syslinux_nomtools) native_syslinux_nomtools)
@ -145,7 +145,7 @@ class RootfsPlugin(SourcePlugin):
# install syslinux into rootfs partition # install syslinux into rootfs partition
syslinux_cmd = "syslinux-nomtools -d /boot -i %s" % part.source_file 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 @classmethod
def do_install_disk(cls, disk, disk_name, image_creator, workdir, oe_builddir, def do_install_disk(cls, disk, disk_name, image_creator, workdir, oe_builddir,

0
scripts/lib/wic/utils/oe/misc.py → scripts/lib/wic/utils/misc.py
View File

2
scripts/lib/wic/utils/partitionedfs.py
View File

@ -21,7 +21,7 @@
import os import os
from wic import msger from wic import msger
from wic.utils.errors import ImageError 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 from wic.filemap import sparse_copy
# Overhead of the MBR partitioning scheme (just one sector) # Overhead of the MBR partitioning scheme (just one sector)

2
scripts/wic
View File

@ -51,7 +51,7 @@ if bitbake_exe:
else: else:
bitbake_main = None 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.utils.errors import WicError
from wic import engine from wic import engine
from wic import help as hlp from wic import help as hlp