diff options
author | Christopher Larson <chris_larson@mentor.com> | 2013-01-15 13:22:46 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-18 13:28:05 +0000 |
commit | feca9f7849422c9b0f529018a48148178e2673c9 (patch) | |
tree | 2df04ee5719450dd9ad7fc10bf4f1102fa163e73 /meta | |
parent | 411413aa281e2a95a7a641a91ec3c0b1c07471c8 (diff) | |
download | poky-feca9f7849422c9b0f529018a48148178e2673c9.tar.gz |
license.bbclass: check LICENSE_pkg, not LICENSE_pn-pkg
Recipes define the latter, as that's what goes into the binary packages, not
the former.
(From OE-Core rev: 6a59b294b99b05e8973b5f2d60678988e90e2de3)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/license.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 68f45f52f0..c8a8c639fa 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -215,8 +215,7 @@ def incompatible_license(d, dont_want_licenses, package=None): | |||
215 | import re | 215 | import re |
216 | import oe.license | 216 | import oe.license |
217 | from fnmatch import fnmatchcase as fnmatch | 217 | from fnmatch import fnmatchcase as fnmatch |
218 | pn = d.getVar('PN', True) | 218 | license = d.getVar("LICENSE_%s" % package, True) if package else None |
219 | license = d.getVar("LICENSE_%s-%s" % (pn, package), True) if package else None | ||
220 | if not license: | 219 | if not license: |
221 | license = d.getVar('LICENSE', True) | 220 | license = d.getVar('LICENSE', True) |
222 | 221 | ||