1 files changed, 12 insertions, 7 deletions
diff --git a/scripts/wic b/scripts/wic
index b75d122482..ac272c62f7 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -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
+    if not options.image_name:
-                                       options.bootimg_dir and
+        missed = []
-                                       options.kernel_dir and
+        for val, opt in [(options.rootfs_dir, 'rootfs-dir'),
-                                       options.native_sysroot):
+                         (options.bootimg_dir, 'bootimg-dir'),
-        print "Build artifacts not completely specified, exiting."
+                         (options.kernel_dir, 'kernel-dir'),
-        print "  (Use 'wic -e' or 'wic -r -b -k -n' to specify artifacts)"
+                         (options.native_sysroot, 'native-sysroot')]:
-        sys.exit(1)
+            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

diff --git a/scripts/wic b/scripts/wic index b75d122482..ac272c62f7 100755 --- a/scripts/wic +++ b/scripts/wic
@@ -122,13 +122,18 @@ def wic_create_subcommand(args, usage_str):
122	logging.error("Can't build roofs as bitbake is not in the $PATH")	122	logging.error("Can't build roofs as bitbake is not in the $PATH")
123	sys.exit(1)	123	sys.exit(1)
124		124
125	if not options.image_name and not (options.rootfs_dir and	125	if not options.image_name:
126	options.bootimg_dir and	126	missed = []
127	options.kernel_dir and	127	for val, opt in [(options.rootfs_dir, 'rootfs-dir'),
128	options.native_sysroot):	128	(options.bootimg_dir, 'bootimg-dir'),
129	print "Build artifacts not completely specified, exiting."	129	(options.kernel_dir, 'kernel-dir'),
130	print " (Use 'wic -e' or 'wic -r -b -k -n' to specify artifacts)"	130	(options.native_sysroot, 'native-sysroot')]:
131	sys.exit(1)	131	if not val:
		132	missed.append(opt)
		133	if missed:
		134	print "The following build artifacts are not specified:"
		135	print " " + ", ".join(missed)
		136	sys.exit(1)
132		137
133	if not options.image_name:	138	if not options.image_name:
134	options.build_check = False	139	options.build_check = False