diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-23 08:50:29 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:04 +0000 |
| commit | 5001f23ecc5f380938cee8d7fcce053ea482d928 (patch) | |
| tree | d1cabd8f38c55ad69c64b383cc53a7cc054da3fc /scripts/lib/devtool/build.py | |
| parent | f79022dfff7374634cc8153aea61e6bf9c72b377 (diff) | |
| download | poky-5001f23ecc5f380938cee8d7fcce053ea482d928.tar.gz | |
devtool: build: enable showing default task in help
Enable access to the configuration object in register_commands() so that
we can read configuration values there; this allows us to show the
task that will be run in the command line help for the build subcommand.
(From OE-Core rev: 142d006de3235a034839ef7bbe147c56fc7af04a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/build.py')
| -rw-r--r-- | scripts/lib/devtool/build.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/lib/devtool/build.py b/scripts/lib/devtool/build.py index 14f55e0f84..0b8e88b817 100644 --- a/scripts/lib/devtool/build.py +++ b/scripts/lib/devtool/build.py | |||
| @@ -46,12 +46,14 @@ def _set_file_values(fn, values): | |||
| 46 | f.writelines(newlines) | 46 | f.writelines(newlines) |
| 47 | return updated | 47 | return updated |
| 48 | 48 | ||
| 49 | def _get_build_task(config): | ||
| 50 | return config.get('Build', 'build_task', 'populate_sysroot') | ||
| 49 | 51 | ||
| 50 | def build(args, config, basepath, workspace): | 52 | def build(args, config, basepath, workspace): |
| 51 | """Entry point for the devtool 'build' subcommand""" | 53 | """Entry point for the devtool 'build' subcommand""" |
| 52 | check_workspace_recipe(workspace, args.recipename) | 54 | check_workspace_recipe(workspace, args.recipename) |
| 53 | 55 | ||
| 54 | build_task = config.get('Build', 'build_task', 'populate_sysroot') | 56 | build_task = _get_build_task(config) |
| 55 | 57 | ||
| 56 | bbappend = workspace[args.recipename]['bbappend'] | 58 | bbappend = workspace[args.recipename]['bbappend'] |
| 57 | if args.disable_parallel_make: | 59 | if args.disable_parallel_make: |
| @@ -71,7 +73,7 @@ def build(args, config, basepath, workspace): | |||
| 71 | def register_commands(subparsers, context): | 73 | def register_commands(subparsers, context): |
| 72 | """Register devtool subcommands from this plugin""" | 74 | """Register devtool subcommands from this plugin""" |
| 73 | parser_build = subparsers.add_parser('build', help='Build a recipe', | 75 | parser_build = subparsers.add_parser('build', help='Build a recipe', |
| 74 | description='Builds the specified recipe using bitbake', | 76 | description='Builds the specified recipe using bitbake (up to and including do_%s)' % _get_build_task(context.config), |
| 75 | formatter_class=argparse.ArgumentDefaultsHelpFormatter) | 77 | formatter_class=argparse.ArgumentDefaultsHelpFormatter) |
| 76 | parser_build.add_argument('recipename', help='Recipe to build') | 78 | parser_build.add_argument('recipename', help='Recipe to build') |
| 77 | parser_build.add_argument('-s', '--disable-parallel-make', action="store_true", help='Disable make parallelism') | 79 | parser_build.add_argument('-s', '--disable-parallel-make', action="store_true", help='Disable make parallelism') |
