[OE-core] [PATCH 1/6] license.bbclass: check LICENSE_pkg, not LICENSE_pn-pkg

Christopher Larson kergoth at gmail.com
Tue Jan 15 20:22:46 UTC 2013


From: Christopher Larson <chris_larson at mentor.com>

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>
---
 meta/classes/license.bbclass | 3 +--
 1 file changed, 1 insertion(+), 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)
 
-- 
1.8.0.3





More information about the Openembedded-core mailing list