summaryrefslogtreecommitdiffstats
path: root/meta
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:33 +0000
commit28c06a32201351894546b3095f80daa84acf7b39 (patch)
tree6aedcd35340dc52513594631079b21ce46a193c7 /meta
parent44bdd58494aeb7cef14b7931ba6f6628849f2c19 (diff)
downloadopenembedded-core-contrib-28c06a32201351894546b3095f80daa84acf7b39.tar.gz
base.bbclass: Remove implicit dependency on license.bbclass
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 () {
if license == "INVALID":
bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn)
- 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 bb.data.inherits_class('license', d):
+ 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