mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 03:49:07 +02:00
d193531d5e
When you run devtool build, you need to have the pkgdata written out at the end, so that if what you're adding is a library and the next thing you add is something that depends on that library, the necessary information to map the dependency back to the recipe is present. In practical terms all this means is we need do_packagedata to run in addition to do_populate_sysroot. This does mean that do_package needs to run which wasn't running before, and that means that the few package QA tests that run within do_package such as installed-vs-shipped will now be run. This may be a bit bothersome, and prompted a fix for one of our oe-selftest tests as a result, but I don't see an easy way around it. Ultimately if you care about using the recipe in an image you'll need to fix any such errors anyway. Fixes [YOCTO #8887]. (From OE-Core rev: 6579c7120ee5a541427ff5b6b07f838d52f9fe7c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
86 lines
3.2 KiB
Python
86 lines
3.2 KiB
Python
# Development tool - build command plugin
|
|
#
|
|
# Copyright (C) 2014-2015 Intel Corporation
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License version 2 as
|
|
# published by the Free Software Foundation.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along
|
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
"""Devtool build plugin"""
|
|
|
|
import os
|
|
import bb
|
|
import logging
|
|
import argparse
|
|
import tempfile
|
|
from devtool import exec_build_env_command, check_workspace_recipe, DevtoolError
|
|
|
|
logger = logging.getLogger('devtool')
|
|
|
|
|
|
def _set_file_values(fn, values):
|
|
remaining = values.keys()
|
|
|
|
def varfunc(varname, origvalue, op, newlines):
|
|
newvalue = values.get(varname, origvalue)
|
|
remaining.remove(varname)
|
|
return (newvalue, '=', 0, True)
|
|
|
|
with open(fn, 'r') as f:
|
|
(updated, newlines) = bb.utils.edit_metadata(f, values, varfunc)
|
|
|
|
for item in remaining:
|
|
updated = True
|
|
newlines.append('%s = "%s"' % (item, values[item]))
|
|
|
|
if updated:
|
|
with open(fn, 'w') as f:
|
|
f.writelines(newlines)
|
|
return updated
|
|
|
|
def _get_build_tasks(config):
|
|
tasks = config.get('Build', 'build_task', 'populate_sysroot,packagedata').split(',')
|
|
return ['do_%s' % task.strip() for task in tasks]
|
|
|
|
def build(args, config, basepath, workspace):
|
|
"""Entry point for the devtool 'build' subcommand"""
|
|
workspacepn = check_workspace_recipe(workspace, args.recipename, bbclassextend=True)
|
|
|
|
build_tasks = _get_build_tasks(config)
|
|
|
|
bbappend = workspace[workspacepn]['bbappend']
|
|
if args.disable_parallel_make:
|
|
logger.info("Disabling 'make' parallelism")
|
|
_set_file_values(bbappend, {'PARALLEL_MAKE': ''})
|
|
try:
|
|
bbargs = []
|
|
for task in build_tasks:
|
|
if args.recipename.endswith('-native') and 'package' in task:
|
|
continue
|
|
bbargs.append('%s:%s' % (args.recipename, task))
|
|
exec_build_env_command(config.init_path, basepath, 'bitbake %s' % ' '.join(bbargs), watch=True)
|
|
except bb.process.ExecutionError as e:
|
|
# We've already seen the output since watch=True, so just ensure we return something to the user
|
|
return e.exitcode
|
|
finally:
|
|
if args.disable_parallel_make:
|
|
_set_file_values(bbappend, {'PARALLEL_MAKE': None})
|
|
|
|
return 0
|
|
|
|
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 (up to and including %s)' % ', '.join(_get_build_tasks(context.config)))
|
|
parser_build.add_argument('recipename', help='Recipe to build')
|
|
parser_build.add_argument('-s', '--disable-parallel-make', action="store_true", help='Disable make parallelism')
|
|
parser_build.set_defaults(func=build)
|