summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-03-03 21:11:12 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-08 11:52:56 +0000
commitb41e1c92099fb29f8db76cf6501e5d02a456630c (patch)
tree5c639c40e1825d1ed2247a791e7a613926bcdd34
parentc675b5dbe5238240b663fba70467175c96f5a6f4 (diff)
downloadpoky-b41e1c92099fb29f8db76cf6501e5d02a456630c.tar.gz
base.bbclass: improve wording when skipping recipes with incompatible licenses
The previous wording, e.g. ERROR: wget was skipped: incompatible with license GPLv3 isn't very clear and could be taken to imply that the recipe is incompatible with its own license. (From OE-Core rev: c2047067daadb40ff3a944f380c10b2a56b8e080) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index edac18b3b7..14293f83c4 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -533,7 +533,7 @@ python () {
533 bb.debug(1, "INCLUDING the package " + pkg) 533 bb.debug(1, "INCLUDING the package " + pkg)
534 elif all_skipped or incompatible_license(d, bad_licenses): 534 elif all_skipped or incompatible_license(d, bad_licenses):
535 bb.debug(1, "SKIPPING recipe %s because it's %s" % (pn, license)) 535 bb.debug(1, "SKIPPING recipe %s because it's %s" % (pn, license))
536 raise bb.parse.SkipPackage("incompatible with license %s" % license) 536 raise bb.parse.SkipPackage("it has an incompatible license: %s" % license)
537 elif pn in whitelist: 537 elif pn in whitelist:
538 if pn in incompatwl: 538 if pn in incompatwl:
539 bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted") 539 bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted")