mirror of
https://git.yoctoproject.org/poky
synced 2026-09-17 03:49:32 +02:00
recipetool: Separate licenses with & operator
Separate licenses with & operator since it should be satisfied most use
cases and it is a reasonable assumption that all the licenses apply.
Furthermore flat, split and sort the licenses to minimize license string
changes.
Separate package licenses with & operator:
-LICENSE:${PN} = "MIT ISC"
+LICENSE:${PN} = "ISC & MIT"
Respect | and brackets in LICENSE:
-LICENSE = "BSD-3-Clause & (ISC & | & MIT)"
+LICENSE = "BSD-3-Clause & (ISC | MIT)"
Sort licenses:
-LICENSE = "MIT & BSD-3-Clause & ISC"
+LICENSE = "BSD-3-Clause & ISC & MIT"
Remove duplicates:
-LICENSE = "MIT & ISC & MIT"
+LICENSE = "ISC & MIT"
(From OE-Core rev: 60a84ecc53d20118c5e7f86dd3e3cafbfed1cf0a)
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
2be34ea6ed
commit
32f56de278
@@ -426,7 +426,7 @@ class RecipetoolCreateTests(RecipetoolBase):
|
||||
checkvars = {}
|
||||
checkvars['SUMMARY'] = 'Node Server Example'
|
||||
checkvars['HOMEPAGE'] = 'https://github.com/savoirfairelinux/node-server-example#readme'
|
||||
checkvars['LICENSE'] = set(['MIT', 'ISC', 'Unknown'])
|
||||
checkvars['LICENSE'] = 'BSD-3-Clause & ISC & MIT & Unknown'
|
||||
urls = []
|
||||
urls.append('npm://registry.npmjs.org/;package=@savoirfairelinux/node-server-example;version=${PV}')
|
||||
urls.append('npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json')
|
||||
@@ -483,7 +483,7 @@ class RecipetoolCreateTests(RecipetoolBase):
|
||||
result = runCmd('recipetool create -o %s %s' % (temprecipe, srcuri))
|
||||
self.assertTrue(os.path.isfile(recipefile))
|
||||
checkvars = {}
|
||||
checkvars['LICENSE'] = set(['PSF', '&', 'BSD-3-Clause', 'GPL'])
|
||||
checkvars['LICENSE'] = 'BSD-3-Clause & GPL & PSF'
|
||||
checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING.txt;md5=35a23d42b615470583563132872c97d6'
|
||||
checkvars['SRC_URI'] = 'https://files.pythonhosted.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c/docutils-${PV}.tar.gz'
|
||||
checkvars['SRC_URI[md5sum]'] = 'c53768d63db3873b7d452833553469de'
|
||||
|
||||
Reference in New Issue
Block a user