sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

wic: code cleanup: wildcard imports 

Here is what PEP8(Style Guide for Python Code) says about this:

Wildcard imports (from <module> import *) should be avoided, as they
make it unclear which names are present in the namespace, confusing
both readers and many automated tools.

(From OE-Core rev: 13416c1941f5dc8abcdb0073f2104a89eae2d6f1)

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 2015-04-15 23:47:10 +03:00 committed by Richard Purdie
parent 1d0c3387e8
commit f2a0a98523
12 changed files with 43 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/lib/image/engine.py
View File

@ -42,7 +42,7 @@ from wic.utils import cmdln, misc, errors
from wic.conf import configmgr
from wic.plugin import pluginmgr
from wic.__version__ import VERSION
from wic.utils.oe.misc import *
from wic.utils.oe import misc
def verify_build_env():
@ -65,19 +65,19 @@ def find_artifacts(image_name):
Gather the build artifacts for the current image (the image_name
e.g. core-image-minimal) for the current MACHINE set in local.conf
"""
bitbake_env_lines = get_bitbake_env_lines()
bitbake_env_lines = misc.get_bitbake_env_lines()
rootfs_dir = kernel_dir = bootimg_dir = native_sysroot = ""
for line in bitbake_env_lines.split('\n'):
if (get_line_val(line, "IMAGE_ROOTFS")):
rootfs_dir = get_line_val(line, "IMAGE_ROOTFS")
if (misc.get_line_val(line, "IMAGE_ROOTFS")):
rootfs_dir = misc.get_line_val(line, "IMAGE_ROOTFS")
continue
if (get_line_val(line, "DEPLOY_DIR_IMAGE")):
kernel_dir = get_line_val(line, "DEPLOY_DIR_IMAGE")
if (misc.get_line_val(line, "DEPLOY_DIR_IMAGE")):
kernel_dir = misc.get_line_val(line, "DEPLOY_DIR_IMAGE")
continue
if (get_line_val(line, "STAGING_DIR_NATIVE")):
native_sysroot = get_line_val(line, "STAGING_DIR_NATIVE")
if (misc.get_line_val(line, "STAGING_DIR_NATIVE")):
native_sysroot = misc.get_line_val(line, "STAGING_DIR_NATIVE")
continue
return (rootfs_dir, kernel_dir, bootimg_dir, native_sysroot)
@ -87,7 +87,7 @@ CANNED_IMAGE_DIR = "lib/image/canned-wks" # relative to scripts
SCRIPTS_CANNED_IMAGE_DIR = "scripts/" + CANNED_IMAGE_DIR
def build_canned_image_list(dl):
layers_path = get_bitbake_var("BBLAYERS")
layers_path = misc.get_bitbake_var("BBLAYERS")
canned_wks_layer_dirs = []
if layers_path is not None:

1
scripts/lib/wic/imager/direct.py
View File

@ -32,7 +32,6 @@ from wic.utils import fs_related, runner, misc
from wic.utils.partitionedfs import Image
from wic.utils.errors import CreatorError, ImageError
from wic.imager.baseimager import BaseImageCreator
from wic.utils.oe.misc import *
from wic.plugin import pluginmgr
disk_methods = {

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

@ -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 *
from wic.utils.oe.misc import get_bitbake_var
__ALL__ = ['PluginMgr', 'pluginmgr']

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

@ -29,13 +29,9 @@ import shutil
from wic.utils.errors import ImageError
from wic import kickstart, msger
from wic.utils import misc, fs_related, errors, runner, cmdln
from wic.conf import configmgr
from wic.plugin import pluginmgr
import wic.imager.direct as direct
from wic.pluginbase import SourcePlugin
from wic.utils.oe.misc import *
from wic.imager.direct import DirectImageCreator
from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
BOOTDD_EXTRA_SPACE
class BootimgEFIPlugin(SourcePlugin):
name = 'bootimg-efi'

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

@ -28,7 +28,7 @@ import re
from wic import msger
from wic.pluginbase import SourcePlugin
from wic.utils.oe.misc import *
from wic.utils.oe.misc import exec_cmd, get_bitbake_var
from glob import glob
class BootimgPartitionPlugin(SourcePlugin):

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

@ -28,13 +28,10 @@ import os
from wic.utils.errors import ImageError
from wic import kickstart, msger
from wic.utils import misc, fs_related, errors, runner, cmdln
from wic.conf import configmgr
from wic.plugin import pluginmgr
import wic.imager.direct as direct
from wic.utils import runner
from wic.pluginbase import SourcePlugin
from wic.utils.oe.misc import *
from wic.imager.direct import DirectImageCreator
from wic.utils.oe.misc import exec_cmd, exec_native_cmd, \
get_bitbake_var, BOOTDD_EXTRA_SPACE
class BootimgPcbiosPlugin(SourcePlugin):
name = 'bootimg-pcbios'

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

@ -19,7 +19,7 @@ import os
from wic import msger
from wic.pluginbase import SourcePlugin
from wic.utils.oe.misc import *
from wic.utils.oe.misc import get_bitbake_var
class FSImagePlugin(SourcePlugin):
name = 'fsimage'

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

@ -19,7 +19,7 @@ import os
from wic import msger
from wic.pluginbase import SourcePlugin
from wic.utils.oe.misc import *
from wic.utils.oe.misc import exec_cmd, get_bitbake_var
class RawCopyPlugin(SourcePlugin):
name = 'rawcopy'

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

@ -27,14 +27,9 @@
import os
from wic import kickstart, msger
from wic.utils import misc, fs_related, errors, runner, cmdln
from wic.conf import configmgr
from wic.plugin import pluginmgr
import wic.imager.direct as direct
from wic import msger
from wic.pluginbase import SourcePlugin
from wic.utils.oe.misc import *
from wic.imager.direct import DirectImageCreator
from wic.utils.oe.misc import find_bitbake_env_lines, find_artifact
class RootfsPlugin(SourcePlugin):
name = 'rootfs'

5
scripts/lib/wic/utils/fs_related.py
View File

@ -20,10 +20,7 @@ from __future__ import with_statement
import os
import errno
from wic import msger
from wic.utils import runner
from wic.utils.errors import *
from wic.utils.oe.misc import *
from wic.utils.oe.misc import exec_cmd
def makedirs(dirname):
"""A version of os.makedirs() that doesn't throw an

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

@ -19,10 +19,8 @@
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
from wic import msger
from wic.utils import runner
from wic.utils.errors import ImageError
from wic.utils.fs_related import *
from wic.utils.oe.misc import *
from wic.utils.oe.misc import exec_cmd, exec_native_cmd
# Overhead of the MBR partitioning scheme (just one sector)
MBR_OVERHEAD = 1

41
scripts/wic
View File

@ -52,8 +52,9 @@ if bitbake_exe:
else:
bitbake_main = None
from image.help import *
from image.engine import *
from wic.utils.oe.misc import find_bitbake_env_lines, set_bitbake_env_lines
from image import engine
from image import help as hlp
def rootfs_dir_to_args(krootfs_dir):
"""
@ -132,7 +133,7 @@ def wic_create_subcommand(args, usage_str):
if options.build_check and not options.properties_file:
print "Checking basic build environment..."
if not verify_build_env():
if not engine.verify_build_env():
print "Couldn't verify build environment, exiting\n"
sys.exit(1)
else:
@ -158,7 +159,7 @@ def wic_create_subcommand(args, usage_str):
sys.exit(1)
(rootfs_dir, kernel_dir, bootimg_dir, native_sysroot) \
= find_artifacts(options.image_name)
= engine.find_artifacts(options.image_name)
else:
if options.build_rootfs:
@ -168,7 +169,7 @@ def wic_create_subcommand(args, usage_str):
wks_file = args[0]
if not wks_file.endswith(".wks"):
wks_file = find_canned_image(scripts_path, wks_file)
wks_file = engine.find_canned_image(scripts_path, wks_file)
if not wks_file:
print "No image named %s found, exiting. (Use 'wic list images' to list available images, or specify a fully-qualified OE kickstart (.wks) filename)\n" % wks_file
sys.exit(1)
@ -223,9 +224,9 @@ def wic_create_subcommand(args, usage_str):
rootfs_dir = rootfs_dir_to_args(krootfs_dir)
print "Creating image(s)...\n"
wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
native_sysroot, scripts_path, image_output_dir,
options.debug, options.properties_file)
engine.wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
native_sysroot, scripts_path, image_output_dir,
options.debug, options.properties_file)
def wic_list_subcommand(args, usage_str):
@ -247,7 +248,7 @@ def wic_list_subcommand(args, usage_str):
sys.exit(1)
set_bitbake_env_lines(bitbake_env_lines)
if not wic_list(args, scripts_path, options.properties_file):
if not engine.wic_list(args, scripts_path, options.properties_file):
logging.error("Bad list arguments, exiting\n")
parser.print_help()
sys.exit(1)
@ -268,20 +269,20 @@ wic_help_topic_usage = """
subcommands = {
"create": [wic_create_subcommand,
wic_create_usage,
wic_create_help],
hlp.wic_create_usage,
hlp.wic_create_help],
"list": [wic_list_subcommand,
wic_list_usage,
wic_list_help],
hlp.wic_list_usage,
hlp.wic_list_help],
"plugins": [wic_help_topic_subcommand,
wic_help_topic_usage,
wic_plugins_help],
"overview": [wic_help_topic_subcommand,
hlp.wic_plugins_help],
"overview": [wic_help_topic_subcommand,
wic_help_topic_usage,
wic_overview_help],
"kickstart": [wic_help_topic_subcommand,
hlp.wic_overview_help],
"kickstart": [wic_help_topic_subcommand,
wic_help_topic_usage,
wic_kickstart_help],
hlp.wic_kickstart_help],
}
@ -291,7 +292,7 @@ def start_logging(loglevel):
def main(argv):
parser = optparse.OptionParser(version="wic version %s" % __version__,
usage=wic_usage)
usage=hlp.wic_usage)
parser.disable_interspersed_args()
@ -303,7 +304,7 @@ def main(argv):
parser.print_help()
sys.exit(1)
invoke_subcommand(args, parser, wic_help_usage, subcommands)
hlp.invoke_subcommand(args, parser, hlp.wic_help_usage, subcommands)
if __name__ == "__main__":