[PATCH 1/2] create-spdx: Use function rather than AVAILABLE_LICENSES

* [PATCH 1/2] create-spdx: Use function rather than AVAILABLE_LICENSES
@ 2022-03-15 17:33 Richard Purdie
  2022-03-15 17:33 ` [PATCH 2/2] sstate: Allow optimisation of do_create_spdx task dependencies Richard Purdie
  2022-03-15 17:48 ` [OE-core] [PATCH 1/2] create-spdx: Use function rather than AVAILABLE_LICENSES Peter Kjellerstedt
  0 siblings, 2 replies; 4+ messages in thread
From: Richard Purdie @ 2022-03-15 17:33 UTC (permalink / raw)
  To: openembedded-core

We can directly call the function rather than using the variable indirection.
As this is the last user of the variable, it then allows removal of it in a
followup patch.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/create-spdx.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass
index daf99ca676c..1a4804a7c50 100644
--- a/meta/classes/create-spdx.bbclass
+++ b/meta/classes/create-spdx.bbclass
@@ -94,7 +94,7 @@ def convert_license_to_spdx(lic, document, d, existing={}):
     from pathlib import Path
     import oe.spdx
 
-    available_licenses = d.getVar("AVAILABLE_LICENSES").split()
+    avail_licenses = available_licenses(d)
     license_data = d.getVar("SPDX_LICENSE_DATA")
     extracted = {}
 
@@ -112,7 +112,7 @@ def convert_license_to_spdx(lic, document, d, existing={}):
         if name == "PD":
             # Special-case this.
             extracted_info.extractedText = "Software released to the public domain"
-        elif name in available_licenses:
+        elif name in avail_licenses:
             # This license can be found in COMMON_LICENSE_DIR or LICENSE_PATH
             for directory in [d.getVar('COMMON_LICENSE_DIR')] + (d.getVar('LICENSE_PATH') or '').split():
                 try:
@@ -122,11 +122,11 @@ def convert_license_to_spdx(lic, document, d, existing={}):
                 except FileNotFoundError:
                     pass
             if extracted_info.extractedText is None:
-                # Error out, as the license was in available_licenses so should
+                # Error out, as the license was in avail_licenses so should
                 # be on disk somewhere.
                 bb.error("Cannot find text for license %s" % name)
         else:
-            # If it's not SPDX, or PD, or in available licenses, then NO_GENERIC_LICENSE must be set
+            # If it's not SPDX, or PD, or in avail_licenses, then NO_GENERIC_LICENSE must be set
             filename = d.getVarFlag('NO_GENERIC_LICENSE', name)
             if filename:
                 filename = d.expand("${S}/" + filename)
-- 
2.32.0



^ permalink raw reply related	[flat|nested] 4+ messages in thread