[oe-commits] Ed Bartosh : devtool: build-image: filter out recipes
git at git.openembedded.org
git at git.openembedded.org
Mon Aug 31 10:37:34 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: efe685711ae6f4beec06ba591c74140ce56b96af
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=efe685711ae6f4beec06ba591c74140ce56b96af
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
Date: Sun Aug 30 17:41:29 2015 +0300
devtool: build-image: filter out recipes
Filtered out non-target recipes and recipes with
recipe name != package name in build-image plugin.
Isolated all logic of getting recipes in _get_recipes
function.
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
scripts/lib/devtool/build-image.py | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/scripts/lib/devtool/build-image.py b/scripts/lib/devtool/build-image.py
index 708120a..341ab28 100644
--- a/scripts/lib/devtool/build-image.py
+++ b/scripts/lib/devtool/build-image.py
@@ -21,7 +21,7 @@ import os
import logging
from bb.process import ExecutionError
-from devtool import exec_build_env_command
+from devtool import exec_build_env_command, setup_tinfoil, parse_recipe
logger = logging.getLogger('devtool')
@@ -29,14 +29,31 @@ def plugin_init(pluginlist):
"""Plugin initialization"""
pass
+def _get_recipes(workspace, config):
+ """Get list of target recipes from the workspace."""
+ result = []
+ tinfoil = setup_tinfoil()
+ for recipe in workspace:
+ data = parse_recipe(config, tinfoil, recipe, True)
+ if 'class-target' in data.getVar('OVERRIDES', True).split(':'):
+ if recipe in data.getVar('PACKAGES', True):
+ result.append(recipe)
+ else:
+ logger.warning("Skipping recipe %s as it doesn't produce "
+ "package with the same name", recipe)
+ tinfoil.shutdown()
+ return result
+
def build_image(args, config, basepath, workspace):
"""Entry point for the devtool 'build-image' subcommand."""
image = args.recipe
appendfile = os.path.join(config.workspace_path, 'appends',
'%s.bbappend' % image)
- with open(appendfile, 'w') as afile:
- afile.write('IMAGE_INSTALL_append = " %s"\n' % \
- ' '.join(workspace.keys()))
+
+ recipes = _get_recipes(workspace, config)
+ if recipes:
+ with open(appendfile, 'w') as afile:
+ afile.write('IMAGE_INSTALL_append = " %s"\n' % ' '.join(recipes))
try:
exec_build_env_command(config.init_path, basepath,
More information about the Openembedded-commits
mailing list