summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2018-11-28 17:16:15 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-03 12:19:42 +0000
commitf077ab3ad67b2f3eb4aa8882fe2e7aef2d09a26c (patch)
treee3708da360c15dfaf3049d637a89f118b789cc5c /meta/lib
parentf798d963db77db66a2a5a4b8d4c157d46ede417f (diff)
downloadopenembedded-core-contrib-f077ab3ad67b2f3eb4aa8882fe2e7aef2d09a26c.tar.gz
openembedded-core-contrib-f077ab3ad67b2f3eb4aa8882fe2e7aef2d09a26c.tar.bz2
openembedded-core-contrib-f077ab3ad67b2f3eb4aa8882fe2e7aef2d09a26c.zip
lib/oe/recipeutils: patch_recipe(): fix replacing varflag values
The code here wasn't correctly getting the variable history for varflags, so for example if you did a devtool upgrade on a recipe where the SRC_URI checksums were in the .inc file (typical for python recipes in order to support both python 2 and 3) then after the upgrade the new values would be set in the recipe and the old values were left in the .inc, which is not right. Teach the code here how to get the history for varflags so it works properly. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/recipeutils.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 9de291f5b5..886ad26f17 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -81,11 +81,19 @@ def get_var_files(fn, varlist, d):
"""
varfiles = {}
for v in varlist:
- history = d.varhistory.variable(v)
files = []
- for event in history:
- if 'file' in event and not 'flag' in event:
- files.append(event['file'])
+ if '[' in v:
+ varsplit = v.split('[')
+ varflag = varsplit[1].split(']')[0]
+ history = d.varhistory.variable(varsplit[0])
+ for event in history:
+ if 'file' in event and event.get('flag', '') == varflag:
+ files.append(event['file'])
+ else:
+ history = d.varhistory.variable(v)
+ for event in history:
+ if 'file' in event and not 'flag' in event:
+ files.append(event['file'])
if files:
actualfile = files[-1]
else: