summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlanagan, Elizabeth <elizabeth.flanagan@intel.com>2012-11-20 13:49:56 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-25 21:36:42 +0000
commit6944a3bd58cc163c64df0d0d681db99d75c88419 (patch)
treed871fd79c30af7e43c6e2560046909522c07760c
parentbc5bf6f0a001d8780957f96f54be661dbad8c751 (diff)
downloadast2050-yocto-poky-6944a3bd58cc163c64df0d0d681db99d75c88419.zip
ast2050-yocto-poky-6944a3bd58cc163c64df0d0d681db99d75c88419.tar.gz
license.bbclass: Collect LICENSE level packages
Some bad logic in license.bbclass misses certain package level LICENSEs. (From OE-Core rev: c5a171d5817233c0371e6f5b19f57f3c4b84f5ac) Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/license.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 7e1c23f..c7ca4a6 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -97,9 +97,9 @@ python do_populate_lic() {
pn = d.getVar('PN', True)
for package in d.getVar('PACKAGES', True):
- if d.getVar('LICENSE_' + pn + '-' + package, True):
+ if d.getVar('LICENSE_' + package, True):
license_types = license_types + ' & ' + \
- d.getVar('LICENSE_' + pn + '-' + package, True)
+ d.getVar('LICENSE_' + package, True)
#If we get here with no license types, then that means we have a recipe
#level license. If so, we grab only those.
OpenPOWER on IntegriCloud