aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-01-11 13:55:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-17 11:32:21 +0000
commit20d6a4ce4e395251604d92111ce5ecacde5ce172 (patch)
tree9845fe7e034a784a563b3b62d517609c8e8765a8 /meta
parenta524ced19db05e776834cd1f1db03c68a05f9c0b (diff)
downloadopenembedded-core-contrib-20d6a4ce4e395251604d92111ce5ecacde5ce172.tar.gz
openembedded-core-contrib-20d6a4ce4e395251604d92111ce5ecacde5ce172.tar.bz2
openembedded-core-contrib-20d6a4ce4e395251604d92111ce5ecacde5ce172.zip
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 Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/license.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 6651d55c017..8a428746003 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()