[oe-commits] Christopher Larson : license.bbclass: check LICENSE_pkg, not LICENSE_pn-pkg

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 6a59b294b99b05e8973b5f2d60678988e90e2de3
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6a59b294b99b05e8973b5f2d60678988e90e2de3

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Tue Jan 15 13:22:46 2013 -0700

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.

Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 68f45f5..c8a8c63 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -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)