1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-07 16:59:22 +00:00

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.

(From OE-Core rev: f077ab3ad67b2f3eb4aa8882fe2e7aef2d09a26c)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2018-11-28 17:16:15 +13:00
committed by Richard Purdie
parent 15fb7acb77
commit f1ca6f73eb
+12 -4
View File
@@ -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: