[oe-commits] [openembedded-core] branch master-next updated: package.bbclass: Sort FILES_INFO by key
git at git.openembedded.org
git at git.openembedded.org
Tue Jan 8 22:48:28 UTC 2019
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
The following commit(s) were added to refs/heads/master-next by this push:
new 93b5b3a package.bbclass: Sort FILES_INFO by key
93b5b3a is described below
commit 93b5b3a0b40402df80d9c4d6035492201ae73989
Author: Jacob Kroon <jacob.kroon at gmail.com>
AuthorDate: Tue Jan 8 23:13:01 2019 +0100
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 at gmail.com>
Signed-off-by: Jacob Kroon <jacob.kroon at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/package.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
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')
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list