diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-16 00:12:25 +0000 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-02-27 05:42:55 -1000 |
commit | 6289654c3067ce0485f3dc84677d4bbeeeb3b01c (patch) | |
tree | eb8d96a7711ff721391abdbca49703b217736ea6 | |
parent | 9ba6ff627834c70a298f1547ba31aae6018fd810 (diff) | |
download | poky-6289654c3067ce0485f3dc84677d4bbeeeb3b01c.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: 90694a6299c94dddab6873191f1e3123c6c4377b)
Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
(cherry picked from commit 9cceeb906527f90d8dd3aad75aa3a8805e2a1df5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-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 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): | |||
480 | if "package_write_" in task or task == "package_qa": | 480 | if "package_write_" in task or task == "package_qa": |
481 | include_owners = False | 481 | include_owners = False |
482 | include_timestamps = False | 482 | include_timestamps = False |
483 | include_root = True | ||
483 | if task == "package": | 484 | if task == "package": |
484 | include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' | 485 | include_timestamps = d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1' |
486 | include_root = False | ||
485 | extra_content = d.getVar('HASHEQUIV_HASH_VERSION') | 487 | extra_content = d.getVar('HASHEQUIV_HASH_VERSION') |
486 | 488 | ||
487 | try: | 489 | try: |
@@ -592,7 +594,8 @@ def OEOuthashBasic(path, sigfile, task, d): | |||
592 | update_hash("\n") | 594 | update_hash("\n") |
593 | 595 | ||
594 | # Process this directory and all its child files | 596 | # Process this directory and all its child files |
595 | process(root) | 597 | if include_root or root != ".": |
598 | process(root) | ||
596 | for f in files: | 599 | for f in files: |
597 | if f == 'fixmepath': | 600 | if f == 'fixmepath': |
598 | continue | 601 | continue |