summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 11:55:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-07 17:35:40 +0000
commite3532498df982f69981bef8627f68f71b393a9f9 (patch)
treea09092fa5e807021cc8a7373585bd9771d3fbb3c
parentd175cf096b78a11e7c436e476bf795704ef838a5 (diff)
downloadpoky-e3532498df982f69981bef8627f68f71b393a9f9.tar.gz
base.bbclass: Remove implicit dependency on license.bbclass
(From OE-Core rev: 28c06a32201351894546b3095f80daa84acf7b39) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0ee9d2e710..ac97a35c4c 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -486,12 +486,13 @@ python () {
486 if license == "INVALID": 486 if license == "INVALID":
487 bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn) 487 bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn)
488 488
489 unmatched_license_flag = check_license_flags(d) 489 if bb.data.inherits_class('license', d):
490 if unmatched_license_flag: 490 unmatched_license_flag = check_license_flags(d)
491 bb.debug(1, "Skipping %s because it has a restricted license not" 491 if unmatched_license_flag:
492 " whitelisted in LICENSE_FLAGS_WHITELIST" % pn) 492 bb.debug(1, "Skipping %s because it has a restricted license not"
493 raise bb.parse.SkipPackage("because it has a restricted license not" 493 " whitelisted in LICENSE_FLAGS_WHITELIST" % pn)
494 " whitelisted in LICENSE_FLAGS_WHITELIST") 494 raise bb.parse.SkipPackage("because it has a restricted license not"
495 " whitelisted in LICENSE_FLAGS_WHITELIST")
495 496
496 # If we're building a target package we need to use fakeroot (pseudo) 497 # If we're building a target package we need to use fakeroot (pseudo)
497 # in order to capture permissions, owners, groups and special files 498 # in order to capture permissions, owners, groups and special files