summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-06-13 14:21:55 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 10:18:29 +0100
commit746351100ef860d3438e93683dc2ed4ba8d213e8 (patch)
tree7e9192b1231a40c56e67bf3a95a2664ec3abe261
parent7213625a7d035b6b1627aa96e94186ee6c2c531f (diff)
downloadpoky-746351100ef860d3438e93683dc2ed4ba8d213e8.tar.gz
wic: add 'wic ls' command
Added empty 'wic ls' command that does nothing. The functionality will be added by the next commits. (From OE-Core rev: ba4613469cc2c3d3433be2e2f520f4fff6b3b333) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/engine.py4
-rwxr-xr-xscripts/wic15
2 files changed, 19 insertions, 0 deletions
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 647358287f..e58beb7dce 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -225,6 +225,10 @@ def wic_list(args, scripts_path):
225 225
226 return False 226 return False
227 227
228def wic_ls(args, native_sysroot):
229 """List contents of partitioned image or vfat partition."""
230 pass
231
228def find_canned(scripts_path, file_name): 232def find_canned(scripts_path, file_name):
229 """ 233 """
230 Find a file either by its path or by name in the canned files dir. 234 Find a file either by its path or by name in the canned files dir.
diff --git a/scripts/wic b/scripts/wic
index 6c9a30da7d..4161f80367 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -234,6 +234,14 @@ def wic_list_subcommand(args, usage_str):
234 raise WicError("Bad list arguments, exiting") 234 raise WicError("Bad list arguments, exiting")
235 235
236 236
237def wic_ls_subcommand(args, usage_str):
238 """
239 Command-line handling for list content of images.
240 The real work is done by engine.wic_ls()
241 """
242 engine.wic_ls(args, args.native_sysroot)
243
244
237def wic_help_subcommand(args, usage_str): 245def wic_help_subcommand(args, usage_str):
238 """ 246 """
239 Command-line handling for help subcommand to keep the current 247 Command-line handling for help subcommand to keep the current
@@ -266,6 +274,9 @@ helptopics = {
266 "create": [wic_help_topic_subcommand, 274 "create": [wic_help_topic_subcommand,
267 wic_help_topic_usage, 275 wic_help_topic_usage,
268 hlp.wic_create_help], 276 hlp.wic_create_help],
277 "ls": [wic_help_topic_subcommand,
278 wic_help_topic_usage,
279 hlp.wic_ls_help],
269 "list": [wic_help_topic_subcommand, 280 "list": [wic_help_topic_subcommand,
270 wic_help_topic_usage, 281 wic_help_topic_usage,
271 hlp.wic_list_help] 282 hlp.wic_list_help]
@@ -359,6 +370,10 @@ subcommands = {
359 hlp.wic_list_usage, 370 hlp.wic_list_usage,
360 hlp.wic_list_help, 371 hlp.wic_list_help,
361 wic_init_parser_list], 372 wic_init_parser_list],
373 "ls": [wic_ls_subcommand,
374 hlp.wic_ls_usage,
375 hlp.wic_ls_help,
376 wic_init_parser_ls],
362 "help": [wic_help_subcommand, 377 "help": [wic_help_subcommand,
363 wic_help_topic_usage, 378 wic_help_topic_usage,
364 hlp.wic_help_help, 379 hlp.wic_help_help,