diff options
| -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 () { | |||
| 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 |