summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-12-31 13:46:26 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 11:54:15 +0000
commit2896b4a1c401005c2488b5aecdb4abfe25882ec2 (patch)
tree3f33be423e1bfaef267f7b4b3caa7959817e3069 /meta/classes
parent7b81ef8d95d82c55e3650981d3010000cd493832 (diff)
downloadpoky-2896b4a1c401005c2488b5aecdb4abfe25882ec2.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. (From OE-Core rev: 3735716996ec11691054d7f03db873afde89b143) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass12
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 () {
349 if license == "INVALID": 349 if license == "INVALID":
350 bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn) 350 bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn)
351 351
352 commercial_license = " %s " % d.getVar('COMMERCIAL_LICENSE', 1) 352 unmatched_license_flag = check_license_flags(d)
353 import re 353 if unmatched_license_flag:
354 pnr = "[ \t]%s[ \t]" % pn.replace('+', "\+") 354 bb.debug(1, "Skipping %s because it has a restricted license not"
355 if commercial_license and re.search(pnr, commercial_license): 355 " whitelisted in LICENSE_FLAGS_WHITELIST" % pn)
356 bb.debug(1, "Skipping %s because it's commercially licensed" % pn) 356 raise bb.parse.SkipPackage("because it has a restricted license not"
357 raise bb.parse.SkipPackage("because it may require a commercial license to ship in a product (listed in COMMERCIAL_LICENSE)") 357 " whitelisted in LICENSE_FLAGS_WHITELIST")
358 358
359 # If we're building a target package we need to use fakeroot (pseudo) 359 # If we're building a target package we need to use fakeroot (pseudo)
360 # in order to capture permissions, owners, groups and special files 360 # in order to capture permissions, owners, groups and special files