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>
This commit is contained in:
Paul Eggleton 2015-11-23 08:50:29 +13:00 committed by Richard Purdie
parent f79022dfff
commit 5001f23ecc
2 changed files with 5 additions and 2 deletions

View File

@ -220,6 +220,7 @@ def main():
config = ConfigHandler(os.path.join(basepath, 'conf', 'devtool.conf'))
if not config.read():
return -1
context.config = config
bitbake_subdir = config.get('General', 'bitbake_subdir', '')
if bitbake_subdir:

View File

@ -46,12 +46,14 @@ def _set_file_values(fn, values):
f.writelines(newlines)
return updated
def _get_build_task(config):
return config.get('Build', 'build_task', 'populate_sysroot')
def build(args, config, basepath, workspace):
"""Entry point for the devtool 'build' subcommand"""
check_workspace_recipe(workspace, args.recipename)
build_task = config.get('Build', 'build_task', 'populate_sysroot')
build_task = _get_build_task(config)
bbappend = workspace[args.recipename]['bbappend']
if args.disable_parallel_make:
@ -71,7 +73,7 @@ def build(args, config, basepath, workspace):
def register_commands(subparsers, context):
"""Register devtool subcommands from this plugin"""
parser_build = subparsers.add_parser('build', help='Build a recipe',
description='Builds the specified recipe using bitbake',
description='Builds the specified recipe using bitbake (up to and including do_%s)' % _get_build_task(context.config),
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
parser_build.add_argument('recipename', help='Recipe to build')
parser_build.add_argument('-s', '--disable-parallel-make', action="store_true", help='Disable make parallelism')