diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-09-02 13:58:15 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-03 12:43:30 +0100 |
commit | 14b47e22f9b2566320ab6ef103da1501bca129de (patch) | |
tree | 74baa327d00824340b2a16790e248b58129f124f /scripts/lib/wic/engine.py | |
parent | 1561970e88c988cc8e8d6626749777c1bbd8123e (diff) | |
download | poky-14b47e22f9b2566320ab6ef103da1501bca129de.tar.gz |
wic: get rid of listing properties
Functionality of listing and using properties of wic images
does not exist in the wic code. However, there are plenty of
help and usage content about it, which is very confusing.
Removed everything regarding image properties from wic codebase.
(From OE-Core rev: af0a6d547a5a3efefdd4900f7079dfd10b85342d)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/engine.py')
-rw-r--r-- | scripts/lib/wic/engine.py | 55 |
1 files changed, 19 insertions, 36 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index d4a7be6c3a..ce942ea4c4 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py | |||
@@ -194,46 +194,29 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, | |||
194 | print "\nThe image(s) were created using OE kickstart file:\n %s" % wks_file | 194 | print "\nThe image(s) were created using OE kickstart file:\n %s" % wks_file |
195 | 195 | ||
196 | 196 | ||
197 | def wic_list(args, scripts_path, properties_file): | 197 | def wic_list(args, scripts_path): |
198 | """ | 198 | """ |
199 | Print the complete list of properties defined by the image, or the | 199 | Print the list of images or source plugins. |
200 | possible values for a particular image property. | ||
201 | """ | 200 | """ |
202 | if len(args) < 1: | 201 | if len(args) < 1: |
203 | return False | 202 | return False |
204 | 203 | ||
205 | if len(args) == 1: | 204 | if args == ["images"]: |
206 | if args[0] == "images": | 205 | list_canned_images(scripts_path) |
207 | list_canned_images(scripts_path) | 206 | return True |
208 | return True | 207 | elif args == ["source-plugins"]: |
209 | elif args[0] == "source-plugins": | 208 | list_source_plugins() |
210 | list_source_plugins() | 209 | return True |
211 | return True | 210 | elif len(args) == 2 and args[1] == "help": |
212 | elif args[0] == "properties": | 211 | wks_file = args[0] |
213 | return True | 212 | fullpath = find_canned_image(scripts_path, wks_file) |
214 | else: | 213 | if not fullpath: |
215 | return False | 214 | print "No image named %s found, exiting. "\ |
216 | 215 | "(Use 'wic list images' to list available images, or "\ | |
217 | if len(args) == 2: | 216 | "specify a fully-qualified OE kickstart (.wks) "\ |
218 | if args[0] == "properties": | 217 | "filename)\n" % wks_file |
219 | wks_file = args[1] | 218 | sys.exit(1) |
220 | print "print properties contained in wks file: %s" % wks_file | 219 | list_canned_image_help(scripts_path, fullpath) |
221 | return True | 220 | return True |
222 | elif args[0] == "property": | ||
223 | print "print property values for property: %s" % args[1] | ||
224 | return True | ||
225 | elif args[1] == "help": | ||
226 | wks_file = args[0] | ||
227 | fullpath = find_canned_image(scripts_path, wks_file) | ||
228 | if not fullpath: | ||
229 | print "No image named %s found, exiting. "\ | ||
230 | "(Use 'wic list images' to list available images, or "\ | ||
231 | "specify a fully-qualified OE kickstart (.wks) "\ | ||
232 | "filename)\n" % wks_file | ||
233 | sys.exit(1) | ||
234 | list_canned_image_help(scripts_path, fullpath) | ||
235 | return True | ||
236 | else: | ||
237 | return False | ||
238 | 221 | ||
239 | return False | 222 | return False |