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.
Signed-off-by: Peter Kjellerstedt <peter.kjellerst...@axis.com>
---
meta/classes/license_image.bbclass | 5 +++--
meta/lib/oeqa/selftest/cases/incompatible_lic.py | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/classes/license_image.bbclass
b/meta/classes/license_image.bbclass
index b5399b6d96..a8c72da3cb 100644
--- a/meta/classes/license_image.bbclass
+++ b/meta/classes/license_image.bbclass
@@ -51,8 +51,9 @@ def write_license_files(d, license_manifest, pkg_dic,
rootfs=True):
for pkg in sorted(pkg_dic):
if bad_licenses and pkg not in whitelist:
try:
- if 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"]))
+ licenses = incompatible_pkg_license(d, bad_licenses,
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"]) = \
oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"],
bad_licenses, canonical_license, d)
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
index 9d1e801117..458a940618 100644
--- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
+++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
@@ -49,7 +49,7 @@ INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0
LGPL-3.0"
def test_bash_default(self):
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)
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):
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)
if error_msg not in result.output:
--
2.21.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
