diff options
| author |   Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2012-06-07 16:37:07 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-08 11:39:07 +0100 |
| commit | 31bee6e7b0a23efc1555ab739ef10041803d5bb1 (patch) | |
| tree | 0c8dd3ecad4cb3d9af26ff83e93e65a7955b0351 /meta/classes/archiver.bbclass | |
| parent | 497234875b3a93def8ada2cff99d064f3a11d711 (diff) | |
| download | openembedded-core-contrib-31bee6e7b0a23efc1555ab739ef10041803d5bb1.tar.gz | |
archiver.bbclass: Reduce some duplication for function get_licenses
The content to modify this bbclass is as follow:
- Use the existing functions to get license as a directory instead of
rewriting it for avoiding code duplication.
- Use SPDXLICENSEMAP to map licenses
[YOCTO #2473]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/archiver.bbclass')
| -rw-r--r-- | meta/classes/archiver.bbclass | 23 |
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): def get_licenses(d): '''get licenses for running .bb file''' - licenses = d.getVar('LICENSE', 1).replace('&', '|') - licenses = licenses.replace('(', '').replace(')', '') - clean_licenses = "" - for x in licenses.split(): - if x.strip() == '' or x == 'CLOSED': - continue - if x != "|": - clean_licenses += x - if '|' in clean_licenses: - clean_licenses = clean_licenses.replace('|','') - return clean_licenses + import oe.license + + licenses_type = d.getVar('LICENSE', True) or "" + lics = oe.license.is_included(licenses_type)[1:][0] + lice = '' + for lic in lics: + licens = d.getVarFlag('SPDXLICENSEMAP', lic) + if licens != None: + lice += licens + else: + lice += lic + return lice def move_tarball_deploy(d,tarball_list): |