summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorJacob Kroon <jacob.kroon@gmail.com>2019-01-08 22:13:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-11 10:39:09 (GMT)
commit348f6b0b61c35fdfec23ecfe9b0e87165958b743 (patch)
tree20c90399eb1e4c85aff19c5ea35dd81c1abefdc6 /meta/classes/package.bbclass
parent2707effa424e070da345808876d451e2bbc1a4b6 (diff)
downloadpoky-348f6b0b61c35fdfec23ecfe9b0e87165958b743.tar.gz
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> (From OE-Core rev: b0364be65bf0b3dee44f81379f4062e9f707c128) Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 0fe9576..322c4ec 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1438,7 +1438,7 @@ fi
1438 if fstat.st_ino not in seen: 1438 if fstat.st_ino not in seen:
1439 seen.add(fstat.st_ino) 1439 seen.add(fstat.st_ino)
1440 total_size += fstat.st_size 1440 total_size += fstat.st_size
1441 d.setVar('FILES_INFO', json.dumps(files)) 1441 d.setVar('FILES_INFO', json.dumps(files, sort_keys=True))
1442 1442
1443 subdata_file = pkgdatadir + "/runtime/%s" % pkg 1443 subdata_file = pkgdatadir + "/runtime/%s" % pkg
1444 sf = open(subdata_file, 'w') 1444 sf = open(subdata_file, 'w')