diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-01 22:43:51 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-06 23:41:13 +0100 |
| commit | 72902feb0ef87fcf175f009d3cdf26d0850683f3 (patch) | |
| tree | 59b7cdc175c823f15f7be8b137d3a035d678318e | |
| parent | e16d16ffa6e39f53aea73187a4b96320e4420d22 (diff) | |
| download | poky-72902feb0ef87fcf175f009d3cdf26d0850683f3.tar.gz | |
sstatesig: Drop SPDX special casing
Other changes in create-spdx code mean we shouldn't need to do this now. We
need the various exclusions to allow the task hashes to behave correctly
for the SPDX tasks too.
(From OE-Core rev: 5e645ff3d02decba4ed7d082a0e41a2655862039)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/sstatesig.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index ae7ef14453..f943df181e 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
| @@ -26,8 +26,6 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCaches): | |||
| 26 | return "/allarch.bbclass" in inherits | 26 | return "/allarch.bbclass" in inherits |
| 27 | def isImage(mc, fn): | 27 | def isImage(mc, fn): |
| 28 | return "/image.bbclass" in " ".join(dataCaches[mc].inherits[fn]) | 28 | return "/image.bbclass" in " ".join(dataCaches[mc].inherits[fn]) |
| 29 | def isSPDXTask(task): | ||
| 30 | return task in ("do_create_spdx", "do_create_runtime_spdx") | ||
| 31 | 29 | ||
| 32 | depmc, _, deptaskname, depmcfn = bb.runqueue.split_tid_mcfn(dep) | 30 | depmc, _, deptaskname, depmcfn = bb.runqueue.split_tid_mcfn(dep) |
| 33 | mc, _ = bb.runqueue.split_mc(fn) | 31 | mc, _ = bb.runqueue.split_mc(fn) |
| @@ -38,13 +36,6 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCaches): | |||
| 38 | if task == "do_rm_work": | 36 | if task == "do_rm_work": |
| 39 | return False | 37 | return False |
| 40 | 38 | ||
| 41 | # Keep all dependencies between SPDX tasks in the signature. SPDX documents | ||
| 42 | # are linked together by hashes, which means if a dependent document changes, | ||
| 43 | # all downstream documents must be re-written (even if they are "safe" | ||
| 44 | # dependencies). | ||
| 45 | if isSPDXTask(task) and isSPDXTask(deptaskname): | ||
| 46 | return True | ||
| 47 | |||
| 48 | # (Almost) always include our own inter-task dependencies (unless it comes | 39 | # (Almost) always include our own inter-task dependencies (unless it comes |
| 49 | # from a mcdepends). The exception is the special | 40 | # from a mcdepends). The exception is the special |
| 50 | # do_kernel_configme->do_unpack_and_patch dependency from archiver.bbclass. | 41 | # do_kernel_configme->do_unpack_and_patch dependency from archiver.bbclass. |
