summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/devtool1
-rw-r--r--scripts/lib/devtool/build.py6
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/devtool b/scripts/devtool
index 2a5a3d41c1..1fcb42c134 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -220,6 +220,7 @@ def main():
220 config = ConfigHandler(os.path.join(basepath, 'conf', 'devtool.conf')) 220 config = ConfigHandler(os.path.join(basepath, 'conf', 'devtool.conf'))
221 if not config.read(): 221 if not config.read():
222 return -1 222 return -1
223 context.config = config
223 224
224 bitbake_subdir = config.get('General', 'bitbake_subdir', '') 225 bitbake_subdir = config.get('General', 'bitbake_subdir', '')
225 if bitbake_subdir: 226 if bitbake_subdir:
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
49def _get_build_task(config):
50 return config.get('Build', 'build_task', 'populate_sysroot')
49 51
50def build(args, config, basepath, workspace): 52def 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):
71def register_commands(subparsers, context): 73def 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')