From 18032fc6b17d21b4fcb431114a6000042b38e3d9 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 16 Jun 2016 17:10:04 +0800 Subject: recipetool/create.py: fix LICENSE value 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 --- scripts/lib/recipetool/create.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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('') -- cgit 1.2.3-korg