diff options
Diffstat (limited to 'scripts/lib/devtool/build.py')
-rw-r--r-- | scripts/lib/devtool/build.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/scripts/lib/devtool/build.py b/scripts/lib/devtool/build.py index c4c0c9f50f..b10a6a903b 100644 --- a/scripts/lib/devtool/build.py +++ b/scripts/lib/devtool/build.py | |||
@@ -46,21 +46,27 @@ 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): | 49 | def _get_build_tasks(config): |
50 | return config.get('Build', 'build_task', 'populate_sysroot') | 50 | tasks = config.get('Build', 'build_task', 'populate_sysroot,packagedata').split(',') |
51 | return ['do_%s' % task.strip() for task in tasks] | ||
51 | 52 | ||
52 | def build(args, config, basepath, workspace): | 53 | def build(args, config, basepath, workspace): |
53 | """Entry point for the devtool 'build' subcommand""" | 54 | """Entry point for the devtool 'build' subcommand""" |
54 | workspacepn = check_workspace_recipe(workspace, args.recipename, bbclassextend=True) | 55 | workspacepn = check_workspace_recipe(workspace, args.recipename, bbclassextend=True) |
55 | 56 | ||
56 | build_task = _get_build_task(config) | 57 | build_tasks = _get_build_tasks(config) |
57 | 58 | ||
58 | bbappend = workspace[workspacepn]['bbappend'] | 59 | bbappend = workspace[workspacepn]['bbappend'] |
59 | if args.disable_parallel_make: | 60 | if args.disable_parallel_make: |
60 | logger.info("Disabling 'make' parallelism") | 61 | logger.info("Disabling 'make' parallelism") |
61 | _set_file_values(bbappend, {'PARALLEL_MAKE': ''}) | 62 | _set_file_values(bbappend, {'PARALLEL_MAKE': ''}) |
62 | try: | 63 | try: |
63 | exec_build_env_command(config.init_path, basepath, 'bitbake -c %s %s' % (build_task, args.recipename), watch=True) | 64 | bbargs = [] |
65 | for task in build_tasks: | ||
66 | if args.recipename.endswith('-native') and 'package' in task: | ||
67 | continue | ||
68 | bbargs.append('%s:%s' % (args.recipename, task)) | ||
69 | exec_build_env_command(config.init_path, basepath, 'bitbake %s' % ' '.join(bbargs), watch=True) | ||
64 | except bb.process.ExecutionError as e: | 70 | except bb.process.ExecutionError as e: |
65 | # We've already seen the output since watch=True, so just ensure we return something to the user | 71 | # We've already seen the output since watch=True, so just ensure we return something to the user |
66 | return e.exitcode | 72 | return e.exitcode |
@@ -73,7 +79,7 @@ def build(args, config, basepath, workspace): | |||
73 | def register_commands(subparsers, context): | 79 | def register_commands(subparsers, context): |
74 | """Register devtool subcommands from this plugin""" | 80 | """Register devtool subcommands from this plugin""" |
75 | parser_build = subparsers.add_parser('build', help='Build a recipe', | 81 | parser_build = subparsers.add_parser('build', help='Build a recipe', |
76 | description='Builds the specified recipe using bitbake (up to and including do_%s)' % _get_build_task(context.config)) | 82 | description='Builds the specified recipe using bitbake (up to and including %s)' % ', '.join(_get_build_tasks(context.config))) |
77 | parser_build.add_argument('recipename', help='Recipe to build') | 83 | parser_build.add_argument('recipename', help='Recipe to build') |
78 | parser_build.add_argument('-s', '--disable-parallel-make', action="store_true", help='Disable make parallelism') | 84 | parser_build.add_argument('-s', '--disable-parallel-make', action="store_true", help='Disable make parallelism') |
79 | parser_build.set_defaults(func=build) | 85 | parser_build.set_defaults(func=build) |