aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-09 14:12:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 10:08:30 +0100
commitecd1bfed5534f83b775a6c79092c04bd13c3af0a (patch)
tree7deff86d03ba49440c3d59314bd14d73bae86ce8 /meta/classes
parentb08344e28dd33e3af5596007b11185d04fce255e (diff)
downloadopenembedded-core-contrib-ecd1bfed5534f83b775a6c79092c04bd13c3af0a.tar.gz
openembedded-core-contrib-ecd1bfed5534f83b775a6c79092c04bd13c3af0a.tar.bz2
openembedded-core-contrib-ecd1bfed5534f83b775a6c79092c04bd13c3af0a.zip
update-alternatives: Fix determinism issue
getVarFlags returns a dict and there is therefore no sort order. This means the order of the X_VARDEPS_X variables can change and hence the task checksums can change. This can lead to rebuilds of any parts of the system using update-alternatives and their dependees. This is a particular issue under python v3. Add in a sort to make the order of the variables deterministic. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/update-alternatives.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index 70a818572c..1fdd681315 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -71,14 +71,14 @@ def gen_updatealternativesvardeps(d):
# First compute them for non_pkg versions
for v in vars:
- for flag in (d.getVarFlags(v) or {}):
+ for flag in sorted((d.getVarFlags(v) or {}).keys()):
if flag == "doc" or flag == "vardeps" or flag == "vardepsexp":
continue
d.appendVar('%s_VARDEPS' % (v), ' %s:%s' % (flag, d.getVarFlag(v, flag, False)))
for p in pkgs:
for v in vars:
- for flag in (d.getVarFlags("%s_%s" % (v,p)) or {}):
+ for flag in sorted((d.getVarFlags("%s_%s" % (v,p)) or {}).keys()):
if flag == "doc" or flag == "vardeps" or flag == "vardepsexp":
continue
d.appendVar('%s_VARDEPS_%s' % (v,p), ' %s:%s' % (flag, d.getVarFlag('%s_%s' % (v,p), flag, False)))