All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joshua Watt <jpewhacker@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Joshua Watt <JPEWhacker@gmail.com>
Subject: [OE-core][PATCH] lib/oe/spdx30_tasks: Fix missing license text
Date: Thu, 17 Sep 2026 16:56:15 -0600	[thread overview]
Message-ID: <20260917225615.826318-1-JPEWhacker@gmail.com> (raw)

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(-)

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
-- 
2.55.0



                 reply	other threads:[~2026-09-17 22:56 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260917225615.826318-1-JPEWhacker@gmail.com \
    --to=jpewhacker@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.