[OE-core] [PATCH 5/5] license.bbclass: Fixing LICENSE modifiers.

Elizabeth Flanagan elizabeth.flanagan at intel.com
Wed May 25 23:30:54 UTC 2011


I support two license type modifiers. + meaning "or greater"
and * meaning "with exceptions" for licenses that don't have
a generic "with exceptions" (as some do).

For now, I'm stripping them out and doing the base generic

Signed-off-by: Beth Flanagan <elizabeth.flanagan at intel.com>
---
  meta/classes/license.bbclass |    8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 6a2998a..c20be98 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -64,7 +64,13 @@ python do_populate_lic() {
              ast.NodeVisitor.generic_visit(self, node)

          def visit_Str(self, node):
-            find_license(node.s)
+            #
+            # Until I figure out what to do with
+            # the two modifiers I support (or greater = +
+            # and "with exceptions" being *
+            # we'll just strip out the modifier and put
+            # the base license.
+            find_license(node.s.replace("+", "").replace("*", ""))
              ast.NodeVisitor.generic_visit(self, node)

          def visit_BinOp(self, node):
-- 
1.7.1




More information about the Openembedded-core mailing list