From 6289654c3067ce0485f3dc84677d4bbeeeb3b01c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 16 Feb 2024 00:12:25 +0000 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: 90694a6299c94dddab6873191f1e3123c6c4377b) Signed-off-by: Jate Sujjavanich (cherry picked from commit 9cceeb906527f90d8dd3aad75aa3a8805e2a1df5) Signed-off-by: Richard Purdie Signed-off-by: Steve Sakoman --- meta/lib/oe/sstatesig.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index aeceb100d7..65bb4efe25 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -480,8 +480,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: @@ -592,7 +594,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