spdx: add support for WITH operator

Adds the + operator for use in LICENSE field.
It is replaced by SPDX WITH operator.

Signed-off-by: Denis Osterland-Heim <[email protected]>
Signed-off-by: Mathieu Dubois-Briand <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>

Author: OsterlaD

meta/lib/oe/license.py

@@ -47,9 +47,9 @@ def __init__(self, license):
     def __str__(self):
         return "invalid characters in license '%s'" % self.license
 
-license_operator_chars = '&|() '
+license_operator_chars = '&|()+ '
 license_operator = re.compile(r'([' + license_operator_chars + '])')
-license_pattern = re.compile(r'[a-zA-Z0-9.+_\-]+$')
+license_pattern = re.compile(r'[a-zA-Z0-9._\-]+$')
 
 class LicenseVisitor(ast.NodeVisitor):
     """Get elements based on OpenEmbedded license strings"""

meta/lib/oe/spdx30_tasks.py

@@ -97,6 +97,9 @@ def convert(l):
         if l == "|":
             return "OR"
 
+        if l == "+":
+            return "WITH"
+
         if l == "CLOSED":
             return "NONE"
 
@@ -115,6 +118,7 @@ def convert(l):
         .replace(")", " ) ")
         .replace("|", " | ")
         .replace("&", " & ")
+        .replace("+", " + ")
         .split()
     )
     spdx_license_expression = " ".join(convert(l) for l in lic_split)