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

wic: Fix confusing error message 

Wic throws this message when any of the build artifacts are
not provided:
  Build artifacts not completely specified, exiting.
    (Use 'wic -e' or 'wic -r -b -k -n' to specify artifacts)
It was not clear which artifact was not specified.

Reworked the code to specify list of missed artifacts.
Now the message looks like this:
  The following build artifacts are not specified:
    bootimg-dir, kernel-dir, native-sysroot

[YOCTO #7912]

(From OE-Core rev: 98912687f15f6d7537746fb38499f739e1a47be9)

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-06-29 13:30:36 +03:00 committed by Richard Purdie
parent d88af4f518
commit 335aa0fee8
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/wic
View File

@ -122,13 +122,18 @@ def wic_create_subcommand(args, usage_str):
logging.error("Can't build roofs as bitbake is not in the $PATH")
sys.exit(1)
if not options.image_name and not (options.rootfs_dir and
options.bootimg_dir and
options.kernel_dir and
options.native_sysroot):
print "Build artifacts not completely specified, exiting."
print " (Use 'wic -e' or 'wic -r -b -k -n' to specify artifacts)"
sys.exit(1)
if not options.image_name:
missed = []
for val, opt in [(options.rootfs_dir, 'rootfs-dir'),
(options.bootimg_dir, 'bootimg-dir'),
(options.kernel_dir, 'kernel-dir'),
(options.native_sysroot, 'native-sysroot')]:
if not val:
missed.append(opt)
if missed:
print "The following build artifacts are not specified:"
print " " + ", ".join(missed)
sys.exit(1)
if not options.image_name:
options.build_check = False