summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-06-16 17:10:04 +0800
committerChen Qi <Qi.Chen@windriver.com>2016-06-16 17:26:08 +0800
commit18032fc6b17d21b4fcb431114a6000042b38e3d9 (patch)
treee0a26c129f0030dff97f9d5ffb99e47e59732346
parent7b4b67da33beff736dc0286ea24e3860480f9650 (diff)
downloadopenembedded-core-contrib-ChenQi/recipetool-license.tar.gz
openembedded-core-contrib-ChenQi/recipetool-license.tar.bz2
openembedded-core-contrib-ChenQi/recipetool-license.zip
recipetool/create.py: fix LICENSE valueChenQi/recipetool-license
When there multiple license in a repo, the LICENSE value be created as something like "LGPLv2.1 GPLv2", which causes the following warning. LICENSE value "LGPLv2.1 GPLv2" has an invalid format - license names must be separated by the following characters to indicate the license selection: &|() Fix it by using '&' to join multiple licenses. Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-rw-r--r--scripts/lib/recipetool/create.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 129742807f..b3fd78be7a 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -504,7 +504,7 @@ def create_recipe(args):
licenses = [pkg_license]
else:
lines_before.append('# NOTE: Original package metadata indicates license is: %s' % pkg_license)
- lines_before.append('LICENSE = "%s"' % ' '.join(licenses))
+ lines_before.append('LICENSE = "%s"' % ' & '.join(licenses))
lines_before.append('LIC_FILES_CHKSUM = "%s"' % ' \\\n '.join(lic_files_chksum))
lines_before.append('')