diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-13 23:58:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-16 09:50:34 +0100 |
commit | 5ed27d8d9ac53e9531c59b893a4512d299996beb (patch) | |
tree | c76a3488d622203b1ff66898fad16858548b4671 /meta | |
parent | 0256b7dac4ee357c4064c728561d0494d8beb93d (diff) | |
download | poky-5ed27d8d9ac53e9531c59b893a4512d299996beb.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.
(From OE-Core rev: 9cceeb906527f90d8dd3aad75aa3a8805e2a1df5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/sstatesig.py | 5 |
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): | |||
491 | if "package_write_" in task or task == "package_qa": | 491 | if "package_write_" in task or task == "package_qa": |
492 | include_owners = False | 492 | include_owners = False |
493 | include_timestamps = False | 493 | include_timestamps = False |
494 | include_root = True | ||
494 | if task == "package": | 495 | if task == "package": |
495 | include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' | 496 | include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' |
497 | include_root = False | ||
496 | extra_content = d.getVar('HASHEQUIV_HASH_VERSION') | 498 | extra_content = d.getVar('HASHEQUIV_HASH_VERSION') |
497 | 499 | ||
498 | try: | 500 | try: |
@@ -603,7 +605,8 @@ def OEOuthashBasic(path, sigfile, task, d): | |||
603 | update_hash("\n") | 605 | update_hash("\n") |
604 | 606 | ||
605 | # Process this directory and all its child files | 607 | # Process this directory and all its child files |
606 | process(root) | 608 | if include_root or root != ".": |
609 | process(root) | ||
607 | for f in files: | 610 | for f in files: |
608 | if f == 'fixmepath': | 611 | if f == 'fixmepath': |
609 | continue | 612 | continue |