diff options
| author |   Jackie Huang <jackie.huang@windriver.com> | 2016-01-11 13:55:38 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-18 11:47:08 +0000 |
| commit | 320a3192206683ad184d22aa89b9db42bcac2ad2 (patch) | |
| tree | 0524f0614d763f1f0fbd4034d0a881f4e88fbc70 | |
| parent | 4339a822e34e00a49398fd5240bba3ecb530d631 (diff) | |
| download | openembedded-core-contrib-320a3192206683ad184d22aa89b9db42bcac2ad2.tar.gz | |
license.bbclass: fix license manifest
The license manifest is wrong when there is no spaces before and after separates |&()
and we can get warning like:
WARNING: The license listed Artistic-1.0GPLv1+ was not in the licenses collected for recipe
(From OE-Core rev: 20d6a4ce4e395251604d92111ce5ecacde5ce172)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/license.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 6651d55c01..8a42874600 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -70,7 +70,7 @@ def write_license_files(d, license_manifest, pkg_dic): except oe.license.LicenseError as exc: bb.fatal('%s: %s' % (d.getVar('P', True), exc)) else: - pkg_dic[pkg]["LICENSES"] = re.sub('[|&()*]', '', pkg_dic[pkg]["LICENSE"]) + pkg_dic[pkg]["LICENSES"] = re.sub('[|&()*]', ' ', pkg_dic[pkg]["LICENSE"]) pkg_dic[pkg]["LICENSES"] = re.sub(' *', ' ', pkg_dic[pkg]["LICENSES"]) pkg_dic[pkg]["LICENSES"] = pkg_dic[pkg]["LICENSES"].split() |