From: Jackie Huang Date: Mon, 11 Jan 2016 05:55:38 +0000 (+0800) Subject: license.bbclass: fix license manifest X-Git-Tag: 2016-4~1541 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=20d6a4ce4e395251604d92111ce5ecacde5ce172;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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()