summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2025-03-11 08:03:02 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-11 21:29:50 +0000
commit143103a1c457ebfd4fe088cc5d8233b934d3e2a9 (patch)
treeed2bb69df243eef6db9c563d3b41a90d3bb03d82 /meta/classes
parent0606ae583e157160692bc80edf03b582a06ef30d (diff)
downloadpoky-143103a1c457ebfd4fe088cc5d8233b934d3e2a9.tar.gz
lib: Fix dependencies on SPDX code
The SPDX library code was being ignored from taskhash calculations due to accidentally being omitted from BBIMPORTS. This meant that changes in the code or dependent variables would not cause the task to rebuild correctly. In order to add spdx_common, convert the `Dep` object from a named tuple to a frozen dataclass. These function more or less equivalently, but the bitbake code parser cannot handle named tuples. Finally, the vardepsexclude that used to be present on the recipe tasks needs to be moved to the python code in order for the variables to be correctly ignored. Several unused exclusions were removed (From OE-Core rev: eb597bf61cbcb0a4d43149404c93eec0894fb4c7) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/create-spdx-3.0.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/create-spdx-3.0.bbclass b/meta/classes/create-spdx-3.0.bbclass
index 25f3aa5f43..b4a5156e70 100644
--- a/meta/classes/create-spdx-3.0.bbclass
+++ b/meta/classes/create-spdx-3.0.bbclass
@@ -134,7 +134,6 @@ python do_create_spdx() {
134 import oe.spdx30_tasks 134 import oe.spdx30_tasks
135 oe.spdx30_tasks.create_spdx(d) 135 oe.spdx30_tasks.create_spdx(d)
136} 136}
137do_create_spdx[vardepsexclude] += "BB_NUMBER_THREADS SPDX_BUILD_HOST"
138do_create_spdx[vardeps] += "\ 137do_create_spdx[vardeps] += "\
139 SPDX_INCLUDE_BITBAKE_PARENT_BUILD \ 138 SPDX_INCLUDE_BITBAKE_PARENT_BUILD \
140 SPDX_PACKAGE_ADDITIONAL_PURPOSE \ 139 SPDX_PACKAGE_ADDITIONAL_PURPOSE \
@@ -170,7 +169,7 @@ python do_create_package_spdx() {
170 import oe.spdx30_tasks 169 import oe.spdx30_tasks
171 oe.spdx30_tasks.create_package_spdx(d) 170 oe.spdx30_tasks.create_package_spdx(d)
172} 171}
173do_create_package_spdx[vardepsexclude] += "OVERRIDES SPDX_MULTILIB_SSTATE_ARCHS" 172oe.spdx30_tasks.create_package_spdx[vardepsexclude] = "OVERRIDES"
174 173
175addtask do_create_package_spdx after do_create_spdx before do_build do_rm_work 174addtask do_create_package_spdx after do_create_spdx before do_build do_rm_work
176SSTATETASKS += "do_create_package_spdx" 175SSTATETASKS += "do_create_package_spdx"