[OE-core] [CONSOLIDATED PULL 03/62] base.bbclass: remove COMMERCIAL_LICENSE code

Saul Wold sgw at linux.intel.com
Tue Jan 17 08:31:48 UTC 2012


From: Tom Zanussi <tom.zanussi at intel.com>

The COMMERCIAL_LICENSE mechanism has been superseded by LICENSE_FLAGS
so remove the code that implements COMMERCIAL_LICENSE.

Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
 meta/classes/base.bbclass |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 085bb36..8898882 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -356,13 +356,6 @@ python () {
         raise bb.parse.SkipPackage("because it has a restricted license (%s) not"
              " whitelisted in LICENSE_FLAGS_WHITELIST" % unmatched_license_flag)
 
-    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)")
-
     # If we're building a target package we need to use fakeroot (pseudo)
     # in order to capture permissions, owners, groups and special files
     if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d):
-- 
1.7.6.5





More information about the Openembedded-core mailing list