From 5ed27d8d9ac53e9531c59b893a4512d299996beb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 13 Sep 2021 23:58:23 +0100 Subject: 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. (From OE-Core rev: 9cceeb906527f90d8dd3aad75aa3a8805e2a1df5) Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta') 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 -- cgit v1.2.3-54-g00ecf