[oe-commits] [openembedded-core] 01/02: recipetool/create.py: fix LICENSE value

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 884f7ba4707a03776c58171951d93b5f5603bd9b
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Thu Jun 16 17:30:04 2016 +0800

    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 <Qi.Chen at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 1297428..b3fd78b 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('')
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.