mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-28 15:32:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

scripts/lib/create_npm: handle AND and OR in licenses

Browse Source 
Handle npm packages with multiple licenses (AND and OR).
Prior to this, AND and OR were treated as licensed in their
own.

(From OE-Core rev: c0cfd9b1d54b05ad048f444d6fe248aa0500159e)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Anders Darander
2017-03-01 18:20:00 +01:00
committed by Richard Purdie
parent 837d89b47b
commit 1da740ef32
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/lib/recipetool/create_npm.py
View File

@@ -46,6 +46,19 @@ class NpmRecipeHandler(RecipeHandler):
if isinstance(license, dict):
license = license.get('type', None)
if license:
if 'OR' in license:
license = license.replace('OR', '|')
license = license.replace('AND', '&')
license = license.replace(' ', '_')
if not license[0] == '(':
license = '(' + license + ')'
print('LICENSE: {}'.format(license))
else:
license = license.replace('AND', '&')
if license[0] == '(':
license = license[1:]
if license[-1] == ')':
license = license[:-1]
license = license.replace('MIT/X11', 'MIT')
license = license.replace('SEE LICENSE IN EULA',
'SEE-LICENSE-IN-EULA')
@@ -220,7 +233,8 @@ class NpmRecipeHandler(RecipeHandler):
packages = OrderedDict((x,y[0]) for x,y in npmpackages.items())
packages['${PN}'] = ''
pkglicenses = split_pkg_licenses(licvalues, packages, lines_after, licenses)
all_licenses = list(set([item for pkglicense in pkglicenses.values() for item in pkglicense]))
all_licenses = list(set([item.replace('_', ' ') for pkglicense in pkglicenses.values() for item in pkglicense]))
all_licenses.remove('&')
# Go back and update the LICENSE value since we have a bit more
# information than when that was written out (and we know all apply
# vs. there being a choice, so we can join them with &)