summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/license.bbclass16
1 files changed, 14 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 10a937b10c..11908d90da 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -140,8 +140,20 @@ python do_populate_lic() {
140 import shutil 140 import shutil
141 import oe.license 141 import oe.license
142 142
143 # All the license types for the package 143 pn = d.getVar('PN', True)
144 license_types = d.getVar('LICENSE', True) 144 for package in d.getVar('PACKAGES', True):
145 if d.getVar('LICENSE_' + pn + '-' + package, True):
146 license_types = license_types + ' & ' + \
147 d.getVar('LICENSE_' + pn + '-' + package, True)
148
149 #If we get here with no license types, then that means we have a recipe
150 #level license. If so, we grab only those.
151 try:
152 license_types
153 except NameError:
154 # All the license types at the recipe level
155 license_types = d.getVar('LICENSE', True)
156
145 # All the license files for the package 157 # All the license files for the package
146 lic_files = d.getVar('LIC_FILES_CHKSUM', True) 158 lic_files = d.getVar('LIC_FILES_CHKSUM', True)
147 pn = d.getVar('PN', True) 159 pn = d.getVar('PN', True)