summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/archiver.bbclass23
1 files changed, 12 insertions, 11 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index ed2dbe4ed8..083bb1dfa5 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -225,17 +225,18 @@ def archive_logs(d,logdir,bbinc=False):
225 225
226def get_licenses(d): 226def get_licenses(d):
227 '''get licenses for running .bb file''' 227 '''get licenses for running .bb file'''
228 licenses = d.getVar('LICENSE', 1).replace('&', '|') 228 import oe.license
229 licenses = licenses.replace('(', '').replace(')', '') 229
230 clean_licenses = "" 230 licenses_type = d.getVar('LICENSE', True) or ""
231 for x in licenses.split(): 231 lics = oe.license.is_included(licenses_type)[1:][0]
232 if x.strip() == '' or x == 'CLOSED': 232 lice = ''
233 continue 233 for lic in lics:
234 if x != "|": 234 licens = d.getVarFlag('SPDXLICENSEMAP', lic)
235 clean_licenses += x 235 if licens != None:
236 if '|' in clean_licenses: 236 lice += licens
237 clean_licenses = clean_licenses.replace('|','') 237 else:
238 return clean_licenses 238 lice += lic
239 return lice
239 240
240 241
241def move_tarball_deploy(d,tarball_list): 242def move_tarball_deploy(d,tarball_list):