wic: removed unused command line option

Removed -i/--infile wic command line option.
Removed properties_file and properties arguments of
wic_create function.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>

diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index c568d695df09b6948c92262ecd851ff7b9cd53dd..29099ee0e6f622dcb261183d2d8b88e06ecb1b4e 100644 (file)
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -178,9 +178,8 @@ def list_source_plugins():
         print "  %s" % plugin
 
 
-def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
-               native_sysroot, scripts_path, image_output_dir, debug,
-               properties_file, properties=None):
+def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
+               native_sysroot, scripts_path, image_output_dir, debug):
     """Create image
 
     wks_file - user-defined OE kickstart file
@@ -190,8 +189,6 @@ def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
     native_sysroot - absolute path to the build's native sysroots dir
     scripts_path - absolute path to /scripts dir
     image_output_dir - dirname to create for image
-    properties_file - use values from this file if nonempty i.e no prompting
-    properties - use values from this string if nonempty i.e no prompting
 
     Normally, the values for the build artifacts values are determined
     by 'wic -e' from the output of the 'bitbake -e' command given an

diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py
index 886437ba6046d07dcfc7538d4f2c6a64374d046f..fe66548f0fbd9f3abfd4850ab1e4320f0e85638a 100644 (file)
--- a/scripts/lib/image/help.py
+++ b/scripts/lib/image/help.py
@@ -149,7 +149,6 @@ NAME
 
 SYNOPSIS
     wic create <wks file or image name> [-o <DIRNAME> | --outdir <DIRNAME>]
-        [-i <JSON PROPERTY FILE> | --infile <JSON PROPERTY_FILE>]
         [-e | --image-name] [-s, --skip-build-check] [-D, --debug]
         [-r, --rootfs-dir] [-b, --bootimg-dir]
         [-k, --kernel-dir] [-n, --native-sysroot] [-f, --build-rootfs]
@@ -219,12 +218,6 @@ DESCRIPTION
     The -o option can be used to place the image in a directory with a
     different name and location.
 
-    As an alternative to the wks file, the image-specific properties
-    that define the values that will be used to generate a particular
-    image can be specified on the command-line using the -i option and
-    supplying a JSON object consisting of the set of name:value pairs
-    needed by image creation.
-
     The set of properties available for a given image type can be
     listed using the 'wic list' command.
 """

diff --git a/scripts/wic b/scripts/wic
index a38ecc0b8b6ad8eeb104edf873a822e18fe87a79..7b0c3b2aa86136402880fe4113240a6faa404e41 100755 (executable)
--- a/scripts/wic
+++ b/scripts/wic
@@ -91,8 +91,6 @@ def wic_create_subcommand(args, usage_str):
 
     parser.add_option("-o", "--outdir", dest="outdir",
                       action="store", help="name of directory to create image in")
-    parser.add_option("-i", "--infile", dest="properties_file",
-                      action="store", help="name of file containing the values for image properties as a JSON file")
     parser.add_option("-e", "--image-name", dest="image_name",
                       action="store", help="name of the image to use the artifacts from e.g. core-image-sato")
     parser.add_option("-r", "--rootfs-dir", dest="rootfs_dir",
@@ -132,7 +130,7 @@ def wic_create_subcommand(args, usage_str):
     if not options.image_name:
         options.build_check = False
 
-    if options.build_check and not options.properties_file:
+    if options.build_check:
         print "Checking basic build environment..."
         if not engine.verify_build_env():
             print "Couldn't verify build environment, exiting\n"
@@ -225,9 +223,9 @@ def wic_create_subcommand(args, usage_str):
     rootfs_dir = rootfs_dir_to_args(krootfs_dir)
 
     print "Creating image(s)...\n"
-    engine.wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
+    engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
                       native_sysroot, scripts_path, image_output_dir,
-                      options.debug, options.properties_file)
+                      options.debug)
 
 
 def wic_list_subcommand(args, usage_str):