diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 0d933e68b1..84fa19c7aa 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -23,6 +23,7 @@ from collections import OrderedDict from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, update_unlockedsigs, check_prerelease_version, check_git_repo_dirty, check_git_repo_op, DevtoolError from devtool import parse_recipe +import bb.runqueue import bb.utils logger = logging.getLogger('devtool') @@ -30,6 +31,21 @@ logger = logging.getLogger('devtool') override_branch_prefix = 'devtool-override-' +def _prefix_multiconfig_targets(mc, targets): + """Add a multiconfig prefix to build targets.""" + if not mc: + return targets + + return ' '.join(target if target.startswith('mc:') else + 'mc:%s:%s' % (mc, target) + for target in targets.split()) + + +def _get_multiconfig_targets(d, targets): + """Add the recipe datastore's multiconfig prefix to build targets.""" + return _prefix_multiconfig_targets(d.getVar('BB_CURRENT_MC'), targets) + + def add(args, config, basepath, workspace): """Entry point for the devtool 'add' subcommand""" import bb.data @@ -596,7 +612,7 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works task = None # Run the fetch + unpack tasks - res = tinfoil.build_targets(pn, + res = tinfoil.build_targets(_get_multiconfig_targets(d, pn), task, handle_events=True) finally: @@ -829,7 +845,8 @@ def modify(args, config, basepath, workspace): f.write('%s\n' % fname) task = 'do_configure' - res = tinfoil.build_targets(pn, task, handle_events=True) + target = _get_multiconfig_targets(rd, pn) + res = tinfoil.build_targets(target, task, handle_events=True) # Copy .config to workspace kconfpath = rd.getVar('B') @@ -1919,7 +1936,7 @@ def _update_recipe(recipename, workspace, rd, mode, appendlayerdir, wildcard_ver def update_recipe(args, config, basepath, workspace): """Entry point for the devtool 'update-recipe' subcommand""" - check_workspace_recipe(workspace, args.recipename) + workspacepn = check_workspace_recipe(workspace, args.recipename) if args.append: if not os.path.exists(args.append): @@ -1941,7 +1958,11 @@ def update_recipe(args, config, basepath, workspace): if args.dry_run: dry_run_output = tempfile.TemporaryDirectory(prefix='devtool') dry_run_outdir = dry_run_output.name - updated, _, _ = _update_recipe(args.recipename, workspace, rd, args.mode, args.append, args.wildcard_version, args.no_remove, args.initial_rev, dry_run_outdir=dry_run_outdir, no_overrides=args.no_overrides, force_patch_refresh=args.force_patch_refresh) + updated, _, _ = _update_recipe( + workspacepn, workspace, rd, args.mode, args.append, + args.wildcard_version, args.no_remove, args.initial_rev, + dry_run_outdir=dry_run_outdir, no_overrides=args.no_overrides, + force_patch_refresh=args.force_patch_refresh) if updated: rf = rd.getVar('FILE') @@ -1968,11 +1989,17 @@ def status(args, config, basepath, workspace): return 0 -def _reset(recipes, no_clean, remove_work, config, basepath, workspace): +def _reset(recipes, no_clean, remove_work, config, basepath, workspace, + bitbake_targets=None): """Reset one or more recipes""" import bb.process import oe.path + if bitbake_targets is None: + bitbake_targets = recipes + if len(bitbake_targets) != len(recipes): + raise DevtoolError('Reset recipes and BitBake targets do not match') + def clean_preferred_provider(pn, layerconf_path): """Remove PREFERRED_PROVIDER from layer.conf'""" import re @@ -2002,11 +2029,15 @@ def _reset(recipes, no_clean, remove_work, config, basepath, workspace): # it uses BBCLASSEXTEND, then we need to also clean the other # variants targets = [] - for recipe in recipes: - targets.append(recipe) + for recipe, bitbake_target in zip(recipes, bitbake_targets): + targets.append(bitbake_target) recipefile = workspace[recipe]['recipefile'] if recipefile and os.path.exists(recipefile): - targets.extend(get_bbclassextend_targets(recipefile, recipe)) + variants = get_bbclassextend_targets(recipefile, recipe) + mc, _ = bb.runqueue.split_mc(bitbake_target) + variants = _prefix_multiconfig_targets(mc, + ' '.join(variants)) + targets.extend(variants.split()) try: exec_build_env_command(config.init_path, basepath, 'bitbake -c clean %s' % ' '.join(targets)) except bb.process.ExecutionError as e: @@ -2086,23 +2117,27 @@ def _reset(recipes, no_clean, remove_work, config, basepath, workspace): def reset(args, config, basepath, workspace): """Entry point for the devtool 'reset' subcommand""" - recipes = "" + recipes = [] + bitbake_targets = [] if args.recipename: if args.all: raise DevtoolError("Recipe cannot be specified if -a/--all is used") else: for recipe in args.recipename: - check_workspace_recipe(workspace, recipe, checksrc=False) + workspacepn = check_workspace_recipe(workspace, recipe, + checksrc=False) + recipes.append(workspacepn) + bitbake_targets.append(recipe) elif not args.all: raise DevtoolError("Recipe must be specified, or specify -a/--all to " "reset all recipes") if args.all: recipes = list(workspace.keys()) - else: - recipes = args.recipename + bitbake_targets = recipes - _reset(recipes, args.no_clean, args.remove_work, config, basepath, workspace) + _reset(recipes, args.no_clean, args.remove_work, config, basepath, workspace, + bitbake_targets=bitbake_targets) return 0 @@ -2137,14 +2172,14 @@ def finish(args, config, basepath, workspace): import bb import oe.recipeutils - check_workspace_recipe(workspace, args.recipename) + workspacepn = check_workspace_recipe(workspace, args.recipename) dry_run_suffix = ' (dry-run)' if args.dry_run else '' # Grab the equivalent of COREBASE without having to initialise tinfoil corebasedir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..')) - srctree = workspace[args.recipename]['srctree'] + srctree = workspace[workspacepn]['srctree'] check_git_repo_op(srctree, [corebasedir]) dirty = check_git_repo_dirty(srctree) if dirty: @@ -2175,7 +2210,7 @@ def finish(args, config, basepath, workspace): # If it's an upgrade, grab the original path origpath = None origfilelist = None - append = workspace[args.recipename]['bbappend'] + append = workspace[workspacepn]['bbappend'] with open(append, 'r') as f: for line in f: if line.startswith('# original_path:'): @@ -2217,7 +2252,12 @@ def finish(args, config, basepath, workspace): if args.dry_run: dry_run_output = tempfile.TemporaryDirectory(prefix='devtool') dry_run_outdir = dry_run_output.name - updated, appendfile, removed = _update_recipe(args.recipename, workspace, rd, args.mode, appendlayerdir, wildcard_version=True, no_remove=False, no_report_remove=removing_original, initial_rev=args.initial_rev, dry_run_outdir=dry_run_outdir, no_overrides=args.no_overrides, force_patch_refresh=args.force_patch_refresh) + updated, appendfile, removed = _update_recipe( + workspacepn, workspace, rd, args.mode, appendlayerdir, + wildcard_version=True, no_remove=False, + no_report_remove=removing_original, initial_rev=args.initial_rev, + dry_run_outdir=dry_run_outdir, no_overrides=args.no_overrides, + force_patch_refresh=args.force_patch_refresh) removed = [os.path.relpath(pth, recipedir) for pth in removed] # Remove any old files in the case of an upgrade @@ -2306,7 +2346,9 @@ def finish(args, config, basepath, workspace): if args.dry_run: logger.info('Resetting recipe (dry-run)') else: - _reset([args.recipename], no_clean=no_clean, remove_work=remove_work, config=config, basepath=basepath, workspace=workspace) + _reset([workspacepn], no_clean=no_clean, remove_work=remove_work, + config=config, basepath=basepath, workspace=workspace, + bitbake_targets=[args.recipename]) return 0