| Message ID | 20260917225615.826318-1-JPEWhacker@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | lib/oe/spdx30_tasks: Fix missing license text | expand |
diff --git a/meta/lib/oe/sbom30.py b/meta/lib/oe/sbom30.py index e02382c3cc..b33860e4aa 100644 --- a/meta/lib/oe/sbom30.py +++ b/meta/lib/oe/sbom30.py @@ -615,7 +615,7 @@ class ObjectSet(oe.spdx30.SHACLObjectSet): for key, value in license_text: lic.simplelicensing_customIdToUri.append( - oe.spdx30.DictionaryEntry(key=key, value=value) + oe.spdx30.DictionaryEntry(key=key, value=value._id) ) return lic diff --git a/meta/lib/oe/spdx30_tasks.py b/meta/lib/oe/spdx30_tasks.py index 9978ae731c..b6456a214a 100644 --- a/meta/lib/oe/spdx30_tasks.py +++ b/meta/lib/oe/spdx30_tasks.py @@ -84,6 +84,8 @@ def add_license_expression( if s is None: return None + walk_license(s) + o = objset.new_license_expression(s.to_string(), license_data, license_text_map) objset.set_element_alias(o) return o
When the license were switched to be SPDX License Expressions parsed into ASTs, the code to add the text for LicenseRefs was re-written. However, the initial call to start walking the tree was accidentally omitted meaning this was never called. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> --- meta/lib/oe/sbom30.py | 2 +- meta/lib/oe/spdx30_tasks.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)