]> code.ossystems Code Review - openembedded-core.git/commitdiff
base.bbclass: improve wording when skipping recipes with incompatible licenses
authorAndre McCurdy <armccurdy@gmail.com>
Sat, 4 Mar 2017 05:11:12 +0000 (21:11 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 8 Mar 2017 11:13:46 +0000 (11:13 +0000)
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.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/base.bbclass

index edac18b3b7ac2b2e257a6124f1ed31aef00dde33..14293f83c4ff936dc215a6ac2ede590e03614ab5 100644 (file)
@@ -533,7 +533,7 @@ python () {
                         bb.debug(1, "INCLUDING the package " + pkg)
                 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)
+                    raise bb.parse.SkipPackage("it has an incompatible license: %s" % license)
             elif pn in whitelist:
                 if pn in incompatwl:
                     bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted")