summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/image/engine.py7
-rw-r--r--scripts/lib/image/help.py7
-rwxr-xr-xscripts/wic8
3 files changed, 5 insertions, 17 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index c568d695df..29099ee0e6 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -178,9 +178,8 @@ def list_source_plugins():
178 print " %s" % plugin 178 print " %s" % plugin
179 179
180 180
181def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, 181def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
182 native_sysroot, scripts_path, image_output_dir, debug, 182 native_sysroot, scripts_path, image_output_dir, debug):
183 properties_file, properties=None):
184 """Create image 183 """Create image
185 184
186 wks_file - user-defined OE kickstart file 185 wks_file - user-defined OE kickstart file
@@ -190,8 +189,6 @@ def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
190 native_sysroot - absolute path to the build's native sysroots dir 189 native_sysroot - absolute path to the build's native sysroots dir
191 scripts_path - absolute path to /scripts dir 190 scripts_path - absolute path to /scripts dir
192 image_output_dir - dirname to create for image 191 image_output_dir - dirname to create for image
193 properties_file - use values from this file if nonempty i.e no prompting
194 properties - use values from this string if nonempty i.e no prompting
195 192
196 Normally, the values for the build artifacts values are determined 193 Normally, the values for the build artifacts values are determined
197 by 'wic -e' from the output of the 'bitbake -e' command given an 194 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 886437ba60..fe66548f0f 100644
--- a/scripts/lib/image/help.py
+++ b/scripts/lib/image/help.py
@@ -149,7 +149,6 @@ NAME
149 149
150SYNOPSIS 150SYNOPSIS
151 wic create <wks file or image name> [-o <DIRNAME> | --outdir <DIRNAME>] 151 wic create <wks file or image name> [-o <DIRNAME> | --outdir <DIRNAME>]
152 [-i <JSON PROPERTY FILE> | --infile <JSON PROPERTY_FILE>]
153 [-e | --image-name] [-s, --skip-build-check] [-D, --debug] 152 [-e | --image-name] [-s, --skip-build-check] [-D, --debug]
154 [-r, --rootfs-dir] [-b, --bootimg-dir] 153 [-r, --rootfs-dir] [-b, --bootimg-dir]
155 [-k, --kernel-dir] [-n, --native-sysroot] [-f, --build-rootfs] 154 [-k, --kernel-dir] [-n, --native-sysroot] [-f, --build-rootfs]
@@ -219,12 +218,6 @@ DESCRIPTION
219 The -o option can be used to place the image in a directory with a 218 The -o option can be used to place the image in a directory with a
220 different name and location. 219 different name and location.
221 220
222 As an alternative to the wks file, the image-specific properties
223 that define the values that will be used to generate a particular
224 image can be specified on the command-line using the -i option and
225 supplying a JSON object consisting of the set of name:value pairs
226 needed by image creation.
227
228 The set of properties available for a given image type can be 221 The set of properties available for a given image type can be
229 listed using the 'wic list' command. 222 listed using the 'wic list' command.
230""" 223"""
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
233def wic_list_subcommand(args, usage_str): 231def wic_list_subcommand(args, usage_str):