diff options
Diffstat (limited to 'scripts/wic')
-rwxr-xr-x | scripts/wic | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/wic b/scripts/wic index a38ecc0b8b..7b0c3b2aa8 100755 --- a/scripts/wic +++ b/scripts/wic | |||
@@ -91,8 +91,6 @@ def wic_create_subcommand(args, usage_str): | |||
91 | 91 | ||
92 | parser.add_option("-o", "--outdir", dest="outdir", | 92 | parser.add_option("-o", "--outdir", dest="outdir", |
93 | action="store", help="name of directory to create image in") | 93 | action="store", help="name of directory to create image in") |
94 | parser.add_option("-i", "--infile", dest="properties_file", | ||
95 | action="store", help="name of file containing the values for image properties as a JSON file") | ||
96 | parser.add_option("-e", "--image-name", dest="image_name", | 94 | parser.add_option("-e", "--image-name", dest="image_name", |
97 | action="store", help="name of the image to use the artifacts from e.g. core-image-sato") | 95 | action="store", help="name of the image to use the artifacts from e.g. core-image-sato") |
98 | parser.add_option("-r", "--rootfs-dir", dest="rootfs_dir", | 96 | parser.add_option("-r", "--rootfs-dir", dest="rootfs_dir", |
@@ -132,7 +130,7 @@ def wic_create_subcommand(args, usage_str): | |||
132 | if not options.image_name: | 130 | if not options.image_name: |
133 | options.build_check = False | 131 | options.build_check = False |
134 | 132 | ||
135 | if options.build_check and not options.properties_file: | 133 | if options.build_check: |
136 | print "Checking basic build environment..." | 134 | print "Checking basic build environment..." |
137 | if not engine.verify_build_env(): | 135 | if not engine.verify_build_env(): |
138 | print "Couldn't verify build environment, exiting\n" | 136 | print "Couldn't verify build environment, exiting\n" |
@@ -225,9 +223,9 @@ def wic_create_subcommand(args, usage_str): | |||
225 | rootfs_dir = rootfs_dir_to_args(krootfs_dir) | 223 | rootfs_dir = rootfs_dir_to_args(krootfs_dir) |
226 | 224 | ||
227 | print "Creating image(s)...\n" | 225 | print "Creating image(s)...\n" |
228 | engine.wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, | 226 | engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, |
229 | native_sysroot, scripts_path, image_output_dir, | 227 | native_sysroot, scripts_path, image_output_dir, |
230 | options.debug, options.properties_file) | 228 | options.debug) |
231 | 229 | ||
232 | 230 | ||
233 | def wic_list_subcommand(args, usage_str): | 231 | def wic_list_subcommand(args, usage_str): |