From 2b9c40e56bd435ec405e020a815d199bca3f82ab Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Fri, 21 Dec 2018 10:05:00 +0100 Subject: classes/buildhistory: avoid git diff churn by sorting more dictionaries Sort 'srcrevs' and 'tag_srcrevs' before iterating over them in order to avoid unnecessary changes in the build history. (From OE-Core rev: 031d708aedda11d65ba9746af4f01b91264a1f86) Signed-off-by: Jacob Kroon Signed-off-by: Richard Purdie --- meta/classes/buildhistory.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 40b292b139..d1f3e6aa82 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -896,7 +896,7 @@ def write_latest_srcrev(d, pkghistdir): if orig_srcrev != 'INVALID': f.write('# SRCREV = "%s"\n' % orig_srcrev) if len(srcrevs) > 1: - for name, srcrev in srcrevs.items(): + for name, srcrev in sorted(srcrevs.items()): orig_srcrev = d.getVar('SRCREV_%s' % name, False) if orig_srcrev: f.write('# SRCREV_%s = "%s"\n' % (name, orig_srcrev)) @@ -904,7 +904,7 @@ def write_latest_srcrev(d, pkghistdir): else: f.write('SRCREV = "%s"\n' % next(iter(srcrevs.values()))) if len(tag_srcrevs) > 0: - for name, srcrev in tag_srcrevs.items(): + for name, srcrev in sorted(tag_srcrevs.items()): f.write('# tag_%s = "%s"\n' % (name, srcrev)) if name in old_tag_srcrevs and old_tag_srcrevs[name] != srcrev: pkg = d.getVar('PN') -- cgit v1.2.3-54-g00ecf