[oe-commits] Tom Zanussi : base.bbclass: replace COMMERCIAL_LICENSE code with LICENSE_FLAGS code

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 3735716996ec11691054d7f03db873afde89b143
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3735716996ec11691054d7f03db873afde89b143

Author: Tom Zanussi <tom.zanussi at intel.com>
Date:   Sat Dec 31 13:46:26 2011 -0600

base.bbclass: replace COMMERCIAL_LICENSE code with LICENSE_FLAGS code

The COMMERCIAL_LICENSE mechanism has been superseded by LICENSE_FLAGS
so remove the code that implements COMMERCIAL_LICENSE and replace it
with the corresponding LICENSE_FLAGS version.

Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>

---

 meta/classes/base.bbclass |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index bedb73b..a26ac94 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -349,12 +349,12 @@ python () {
     if license == "INVALID":
         bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn)
 
-    commercial_license = " %s " % d.getVar('COMMERCIAL_LICENSE', 1)
-    import re
-    pnr = "[ \t]%s[ \t]" % pn.replace('+', "\+")
-    if commercial_license and re.search(pnr, commercial_license):
-        bb.debug(1, "Skipping %s because it's commercially licensed" % pn)
-        raise bb.parse.SkipPackage("because it may require a commercial license to ship in a product (listed in COMMERCIAL_LICENSE)")
+    unmatched_license_flag = check_license_flags(d)
+    if unmatched_license_flag:
+        bb.debug(1, "Skipping %s because it has a restricted license not"
+             " whitelisted in LICENSE_FLAGS_WHITELIST" % pn)
+        raise bb.parse.SkipPackage("because it has a restricted license not"
+             " whitelisted in LICENSE_FLAGS_WHITELIST")
 
     # If we're building a target package we need to use fakeroot (pseudo)
     # in order to capture permissions, owners, groups and special files