[OE-core] [PATCH 4/4] base.bbclass: minor logic simplification
Andre McCurdy
armccurdy at gmail.com
Thu Mar 31 18:13:09 UTC 2016
Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
---
meta/classes/base.bbclass | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index d91e059..a1e1044 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -515,7 +515,11 @@ python () {
if spdx_license:
incompatwl.extend((d.getVar(w + spdx_license, True) or "").split())
- if not pn in whitelist:
+ if pn in whitelist:
+ if pn in incompatwl:
+ p = d.getVar('P', True)
+ bb.note("INCLUDING " + p + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted")
+ else:
pkgs = d.getVar('PACKAGES', True).split()
skipped_pkgs = []
unskipped_pkgs = []
@@ -535,10 +539,6 @@ python () {
elif all_skipped or incompatible_license(d, bad_licenses):
bb.debug(1, "SKIPPING recipe %s because it's %s" % (pn, license))
raise bb.parse.SkipPackage("incompatible with license %s" % license)
- elif pn in whitelist:
- if pn in incompatwl:
- p = d.getVar('P', True)
- bb.note("INCLUDING " + p + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted")
needsrcrev = False
srcuri = d.getVar('SRC_URI', True)
--
1.9.1
More information about the Openembedded-core
mailing list