summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-13 23:58:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-16 09:48:38 +0100
commit9cceeb906527f90d8dd3aad75aa3a8805e2a1df5 (patch)
tree04ad7a0cfb69f6e0d95550cf9e463bff04c25641
parent13a039e03195a47c750d5901e96fe81cf523481f (diff)
downloadopenembedded-core-9cceeb906527f90d8dd3aad75aa3a8805e2a1df5.tar.gz
sstatesig: Allow exclusion of the root directory for do_package
The package task references WORKDIR at it's top level and we can't easily make the timestamp for that determnistic due to writes to files there and in other subdirs. We could try and force it to a specific value but it is easier to just remove it from the package task, we don't need it there or care about it in this case. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/sstatesig.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 78cdf878f1..dd6b9de7bb 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -491,8 +491,10 @@ def OEOuthashBasic(path, sigfile, task, d):
if "package_write_" in task or task == "package_qa":
include_owners = False
include_timestamps = False
+ include_root = True
if task == "package":
include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1'
+ include_root = False
extra_content = d.getVar('HASHEQUIV_HASH_VERSION')
try:
@@ -603,7 +605,8 @@ def OEOuthashBasic(path, sigfile, task, d):
update_hash("\n")
# Process this directory and all its child files
- process(root)
+ if include_root or root != ".":
+ process(root)
for f in files:
if f == 'fixmepath':
continue