mirror of
https://git.yoctoproject.org/poky
synced 2026-06-11 04:19:50 +00:00
devtool: reset: support recipes with BBCLASSEXTEND
If the recipe file itself was created in the workspace, and it uses BBCLASSEXTEND (e.g. through devtool add --also-native), then we need to clean the other variants as well. (From OE-Core rev: e1bf6a30679a83d4dbcf37276204f639541e95f9) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
532f42985f
commit
38ed039753
@@ -28,7 +28,7 @@ import scriptutils
|
||||
import errno
|
||||
import glob
|
||||
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, DevtoolError
|
||||
from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, DevtoolError
|
||||
from devtool import parse_recipe
|
||||
|
||||
logger = logging.getLogger('devtool')
|
||||
@@ -1203,8 +1203,17 @@ def reset(args, config, basepath, workspace):
|
||||
logger.info('Cleaning sysroot for recipe %s...' % recipes[0])
|
||||
else:
|
||||
logger.info('Cleaning sysroot for recipes %s...' % ', '.join(recipes))
|
||||
# If the recipe file itself was created in the workspace, and
|
||||
# it uses BBCLASSEXTEND, then we need to also clean the other
|
||||
# variants
|
||||
targets = []
|
||||
for recipe in recipes:
|
||||
targets.append(recipe)
|
||||
recipefile = workspace[recipe]['recipefile']
|
||||
if recipefile:
|
||||
targets.extend(get_bbclassextend_targets(recipefile, recipe))
|
||||
try:
|
||||
exec_build_env_command(config.init_path, basepath, 'bitbake -c clean %s' % ' '.join(recipes))
|
||||
exec_build_env_command(config.init_path, basepath, 'bitbake -c clean %s' % ' '.join(targets))
|
||||
except bb.process.ExecutionError as e:
|
||||
raise DevtoolError('Command \'%s\' failed, output:\n%s\nIf you '
|
||||
'wish, you may specify -n/--no-clean to '
|
||||
|
||||
Reference in New Issue
Block a user