]> code.ossystems Code Review - openembedded-core.git/commitdiff
license.bbclass: check LICENSE_pkg, not LICENSE_pn-pkg
authorChristopher Larson <chris_larson@mentor.com>
Tue, 15 Jan 2013 20:22:46 +0000 (13:22 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 18 Jan 2013 13:03:28 +0000 (13:03 +0000)
Recipes define the latter, as that's what goes into the binary packages, not
the former.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/license.bbclass

index 68f45f52f02d78e9b33e64f6073e69dcd2142e23..c8a8c639fac8edffe51794f7e5b7a27f24cac387 100644 (file)
@@ -215,8 +215,7 @@ def incompatible_license(d, dont_want_licenses, package=None):
     import re
     import oe.license
     from fnmatch import fnmatchcase as fnmatch
-    pn = d.getVar('PN', True)
-    license = d.getVar("LICENSE_%s-%s" % (pn, package), True) if package else None
+    license = d.getVar("LICENSE_%s" % package, True) if package else None
     if not license:
         license = d.getVar('LICENSE', True)