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: Hook up --debug option

Browse Source 
Hook up the existing --debug option to toggle the wic debug loglevel,
which is indispensible when things go wrong, and make it easy to use
from the command-line.

(From OE-Core rev: a5ece6f37656fa56b97fd8faf52917345238d015)

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Zanussi 2014-02-03 19:17:00 -06:00 committed by Richard Purdie
parent 94b805f1b4
commit 82f9c2bcff
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,7 @@ def list_canned_image_help(scripts_path, fullpath):
def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
native_sysroot, hdddir, staging_data_dir, scripts_path, native_sysroot, hdddir, staging_data_dir, scripts_path,
image_output_dir, properties_file, properties=None): image_output_dir, debug, properties_file, properties=None):
""" """
Create image Create image
@ -235,6 +235,9 @@ def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
direct_args.insert(0, staging_data_dir) direct_args.insert(0, staging_data_dir)
direct_args.insert(0, "direct") direct_args.insert(0, "direct")
if debug:
msger.set_loglevel('debug')
cr = creator.Creator() cr = creator.Creator()
cr.main(direct_args) cr.main(direct_args)

11
scripts/wic
View File

@ -69,6 +69,8 @@ def wic_create_subcommand(args, usage_str):
action = "store", help = "path to the native sysroot containing the tools to use to build the image") action = "store", help = "path to the native sysroot containing the tools to use to build the image")
parser.add_option("-p", "--skip-build-check", dest = "build_check", parser.add_option("-p", "--skip-build-check", dest = "build_check",
action = "store_false", default = True, help = "skip the build check") action = "store_false", default = True, help = "skip the build check")
parser.add_option("-D", "--debug", dest = "debug", action = "store_true",
default = False, help = "output debug information")
(options, args) = parser.parse_args(args) (options, args) = parser.parse_args(args)
@ -162,7 +164,7 @@ def wic_create_subcommand(args, usage_str):
wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
native_sysroot, hdddir, staging_data_dir, scripts_path, native_sysroot, hdddir, staging_data_dir, scripts_path,
image_output_dir, options.properties_file) image_output_dir, options.debug, options.properties_file)
def wic_list_subcommand(args, usage_str): def wic_list_subcommand(args, usage_str):
@ -203,16 +205,9 @@ def main():
usage = wic_usage) usage = wic_usage)
parser.disable_interspersed_args() parser.disable_interspersed_args()
parser.add_option("-D", "--debug", dest = "debug", action = "store_true",
default = False, help = "output debug information")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
loglevel = logging.INFO
if options.debug:
loglevel = logging.DEBUG
start_logging(loglevel)
if len(args): if len(args):
if args[0] == "help": if args[0] == "help":
if len(args) == 1: if len(args) == 1: