From: Jacob Kroon <jacob.kroon@gmail.com>
Date: Tue, 8 Jan 2019 22:13:01 +0000 (+0100)
Subject: package.bbclass: Sort FILES_INFO by key
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~15693
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0364be65bf0b3dee44f81379f4062e9f707c128;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

package.bbclass: Sort FILES_INFO by key

Observing depsig.do_package for a package inbetween rebuilds indicated
that FILES_INFO was changing content order randomly. Force it to be
deterministic by sorting with respect to the keys when serializing.

Suggested-by: Joshua Watt <jpewhacker@gmail.com>
Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 0fe9576b4db..322c4ec77f3 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1438,7 +1438,7 @@ fi
             if fstat.st_ino not in seen:
                 seen.add(fstat.st_ino)
                 total_size += fstat.st_size
-        d.setVar('FILES_INFO', json.dumps(files))
+        d.setVar('FILES_INFO', json.dumps(files, sort_keys=True))
 
         subdata_file = pkgdatadir + "/runtime/%s" % pkg
         sf = open(subdata_file, 'w')