aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-04-27 10:53:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-27 15:05:39 +0100
commit8b1794559dd7fd956716179d628e61cffdce1686 (patch)
tree627820373fcf4a837fd32e045aad5e937fe4d6fa
parent5be62624a6537659f9f6229c82762da45909f902 (diff)
downloadopenembedded-core-contrib-8b1794559dd7fd956716179d628e61cffdce1686.tar.gz
openembedded-core-contrib-8b1794559dd7fd956716179d628e61cffdce1686.tar.bz2
openembedded-core-contrib-8b1794559dd7fd956716179d628e61cffdce1686.zip
devtool: include bbappends in recipe parsing
In order to get correct metadata, SRCREV for example. Fixes [YOCTO #7648]. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/recipeutils.py6
-rw-r--r--scripts/lib/devtool/standard.py35
2 files changed, 25 insertions, 16 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 159a1037192..09bd7fdb462 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -44,10 +44,10 @@ def get_unavailable_reasons(cooker, pn):
return taskdata.get_reasons(pn)
-def parse_recipe(fn, d):
+def parse_recipe(fn, appends, d):
"""Parse an individual recipe"""
import bb.cache
- envdata = bb.cache.Cache.loadDataFull(fn, [], d)
+ envdata = bb.cache.Cache.loadDataFull(fn, appends, d)
return envdata
@@ -55,7 +55,7 @@ def get_var_files(fn, varlist, d):
"""Find the file in which each of a list of variables is set.
Note: requires variable history to be enabled when parsing.
"""
- envdata = parse_recipe(fn, d)
+ envdata = parse_recipe(fn, [], d)
varfiles = {}
for v in varlist:
history = envdata.varhistory.variable(v)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index aa30a980905..faf5c92176d 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -130,18 +130,29 @@ def _get_recipe_file(cooker, pn):
logger.error("Unable to find any recipe file matching %s" % pn)
return recipefile
+def _parse_recipe(config, tinfoil, pn, appends):
+ """Parse recipe of a package"""
+ import oe.recipeutils
+ recipefile = _get_recipe_file(tinfoil.cooker, pn)
+ if not recipefile:
+ # Error already logged
+ return None
+ if appends:
+ append_files = tinfoil.cooker.collection.get_file_appends(recipefile)
+ # Filter out appends from the workspace
+ append_files = [path for path in append_files if
+ not path.startswith(config.workspace_path)]
+ return oe.recipeutils.parse_recipe(recipefile, append_files,
+ tinfoil.config_data)
def extract(args, config, basepath, workspace):
import bb
- import oe.recipeutils
tinfoil = setup_tinfoil()
- recipefile = _get_recipe_file(tinfoil.cooker, args.recipename)
- if not recipefile:
- # Error already logged
+ rd = _parse_recipe(config, tinfoil, args.recipename, True)
+ if not rd:
return -1
- rd = oe.recipeutils.parse_recipe(recipefile, tinfoil.config_data)
srctree = os.path.abspath(args.srctree)
initial_rev = _extract_source(srctree, args.keep_temp, args.branch, rd)
@@ -327,11 +338,10 @@ def modify(args, config, basepath, workspace):
tinfoil = setup_tinfoil()
- recipefile = _get_recipe_file(tinfoil.cooker, args.recipename)
- if not recipefile:
- # Error already logged
+ rd = _parse_recipe(config, tinfoil, args.recipename, True)
+ if not rd:
return -1
- rd = oe.recipeutils.parse_recipe(recipefile, tinfoil.config_data)
+ recipefile = rd.getVar('FILE', True)
if not _check_compatible_recipe(args.recipename, rd):
return -1
@@ -428,11 +438,10 @@ def update_recipe(args, config, basepath, workspace):
from oe.patch import GitApplyTree
import oe.recipeutils
- recipefile = _get_recipe_file(tinfoil.cooker, args.recipename)
- if not recipefile:
- # Error already logged
+ rd = _parse_recipe(config, tinfoil, args.recipename, True)
+ if not rd:
return -1
- rd = oe.recipeutils.parse_recipe(recipefile, tinfoil.config_data)
+ recipefile = rd.getVar('FILE', True)
orig_src_uri = rd.getVar('SRC_URI', False) or ''
if args.mode == 'auto':