diff options
| author |   Tom Zanussi <tom.zanussi@intel.com> | 2011-12-31 13:46:26 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-24 11:23:54 +0000 |
| commit | 3735716996ec11691054d7f03db873afde89b143 (patch) | |
| tree | 6ae6b8b4be150392ccd054c911a136bb9c73f080 /meta/classes/base.bbclass | |
| parent | 43410523a07d9eb52a7d57ae3dc1cc320cbbc6f9 (diff) | |
| download | openembedded-core-contrib-3735716996ec11691054d7f03db873afde89b143.tar.gz | |
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@intel.com>
Diffstat (limited to 'meta/classes/base.bbclass')
| -rw-r--r-- | 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 bedb73b169..a26ac9485e 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 |