]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
recipetool/create.py: fix LICENSE value ChenQi/recipetool-license
authorChen Qi <Qi.Chen@windriver.com>
Thu, 16 Jun 2016 09:10:04 +0000 (17:10 +0800)
committerChen Qi <Qi.Chen@windriver.com>
Thu, 16 Jun 2016 09:26:08 +0000 (17:26 +0800)
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>
scripts/lib/recipetool/create.py

index 129742807f3dc25a158da2906de186955be68057..b3fd78be7a977be5c764702b672368d7c07c8f19 100644 (file)
@@ -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('')