From 5d3de28c9db463b5e7950a86c1606b95d69b2dfc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 29 Jan 2020 17:28:46 +0000 Subject: sstatesig: Log timestamps for hashequiv in reprodubile builds for do_package Currently if a task generates the same output with different timestamps, hasequiv won't detect it but reproducibile builds will fail tests due to the different timestamps. Add do_package timestamps to the hash when reproducibile builds are enabled to avoid this. (From OE-Core rev: cda769ed7c120edd7db0ff77e34fa1aa611a3082) Signed-off-by: Richard Purdie (cherry picked from commit 11e8200ccec765ff6a4263e06512e5751eca261a) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/lib') diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d24e3738ae..d5a6200562 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -477,6 +477,9 @@ def OEOuthashBasic(path, sigfile, task, d): h = hashlib.sha256() prev_dir = os.getcwd() include_owners = os.environ.get('PSEUDO_DISABLED') == '0' + include_timestamps = False + if task == "package": + include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' extra_content = d.getVar('HASHEQUIV_HASH_VERSION') try: @@ -551,6 +554,9 @@ def OEOuthashBasic(path, sigfile, task, d): bb.warn("KeyError in %s" % path) raise + if include_timestamps: + update_hash(" %10d" % s.st_mtime) + update_hash(" ") if stat.S_ISBLK(s.st_mode) or stat.S_ISCHR(s.st_mode): update_hash("%9s" % ("%d.%d" % (os.major(s.st_rdev), os.minor(s.st_rdev)))) -- cgit v1.2.3-54-g00ecf