aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-02-03 19:17:00 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-04 12:56:55 +0000
commita5ece6f37656fa56b97fd8faf52917345238d015 (patch)
tree8545e9955b8cd376f7bcc51b82975bc00e819c93 /scripts
parent43558610a5793888ff2b18bd3a27c7ab558e5ad0 (diff)
downloadopenembedded-core-contrib-a5ece6f37656fa56b97fd8faf52917345238d015.tar.gz
wic: Hook up --debug option
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. Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/image/engine.py5
-rwxr-xr-xscripts/wic11
2 files changed, 7 insertions, 9 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index 2dd98b968c..6cf6169482 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -175,7 +175,7 @@ def list_canned_image_help(scripts_path, fullpath):
def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
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
@@ -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, "direct")
+ if debug:
+ msger.set_loglevel('debug')
+
cr = creator.Creator()
cr.main(direct_args)
diff --git a/scripts/wic b/scripts/wic
index 4ea5569576..824acaebd3 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -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")
parser.add_option("-p", "--skip-build-check", dest = "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)
@@ -162,7 +164,7 @@ def wic_create_subcommand(args, usage_str):
wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
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):
@@ -203,16 +205,9 @@ def main():
usage = wic_usage)
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()
- loglevel = logging.INFO
- if options.debug:
- loglevel = logging.DEBUG
- start_logging(loglevel)
-
if len(args):
if args[0] == "help":
if len(args) == 1: