MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

license_image.bbclass: Report only the licenses that are incompatible

Browse Source 
Instead of reporting ${LICENSE} when a package cannot be installed
into an image because it is using an incompatible license, report the
license(s) that are actually incompatible.

(From OE-Core rev: b1863e570d4b169cd2f0ea7b4fe7c2348943cb2c)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Kjellerstedt 2019-12-11 17:48:19 +01:00 committed by Richard Purdie
parent 38bea41f59
commit 29b3cc9655
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/classes/license_image.bbclass
View File

@ -51,8 +51,9 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True):
for pkg in sorted(pkg_dic): for pkg in sorted(pkg_dic):
if bad_licenses and pkg not in whitelist: if bad_licenses and pkg not in whitelist:
try: try:
if incompatible_pkg_license(d, bad_licenses, pkg_dic[pkg]["LICENSE"]): licenses = incompatible_pkg_license(d, bad_licenses, pkg_dic[pkg]["LICENSE"])
bb.fatal("Package %s has an incompatible license %s and cannot be installed into the image." %(pkg, pkg_dic[pkg]["LICENSE"])) if licenses:
bb.fatal("Package %s cannot be installed into the image because it has incompatible license(s): %s" %(pkg, ' '.join(licenses)))
(pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"]) = \ (pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"]) = \
oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"], oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"],
bad_licenses, canonical_license, d) bad_licenses, canonical_license, d)

4
meta/lib/oeqa/selftest/cases/incompatible_lic.py
View File

@ -49,7 +49,7 @@ INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
def test_bash_default(self): def test_bash_default(self):
self.write_config(self.default_config()) self.write_config(self.default_config())
error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash has an incompatible license GPLv3+ and cannot be installed into the image." error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0+"
result = bitbake('core-image-minimal', ignore_status=True) result = bitbake('core-image-minimal', ignore_status=True)
if error_msg not in result.output: if error_msg not in result.output:
@ -57,7 +57,7 @@ INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
def test_bash_and_license(self): def test_bash_and_license(self):
self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " & SomeLicense"') self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " & SomeLicense"')
error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash has an incompatible license GPLv3+ & SomeLicense and cannot be installed into the image." error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0+"
result = bitbake('core-image-minimal', ignore_status=True) result = bitbake('core-image-minimal', ignore_status=True)
if error_msg not in result.output: if error_msg not in result.output: