diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2019-12-11 17:48:19 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-16 23:25:50 +0000 |
| commit | 29b3cc9655a0530226e0c1ba30ec16ca1750cf03 (patch) | |
| tree | 6487f27339366be1432b16e866b917021e6c2824 /meta/lib/oeqa/selftest | |
| parent | 38bea41f592ebfd269a6860d24270c3dee662cbe (diff) | |
| download | poky-29b3cc9655a0530226e0c1ba30ec16ca1750cf03.tar.gz | |
license_image.bbclass: Report only the licenses that are incompatible
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>
Diffstat (limited to 'meta/lib/oeqa/selftest')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/incompatible_lic.py | 4 |
1 files changed, 2 insertions, 2 deletions
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" | |||
| 49 | 49 | ||
| 50 | def test_bash_default(self): | 50 | def test_bash_default(self): |
| 51 | self.write_config(self.default_config()) | 51 | self.write_config(self.default_config()) |
| 52 | 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." | 52 | 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+" |
| 53 | 53 | ||
| 54 | result = bitbake('core-image-minimal', ignore_status=True) | 54 | result = bitbake('core-image-minimal', ignore_status=True) |
| 55 | if error_msg not in result.output: | 55 | if error_msg not in result.output: |
| @@ -57,7 +57,7 @@ INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0" | |||
| 57 | 57 | ||
| 58 | def test_bash_and_license(self): | 58 | def test_bash_and_license(self): |
| 59 | self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " & SomeLicense"') | 59 | self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " & SomeLicense"') |
| 60 | 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." | 60 | 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+" |
| 61 | 61 | ||
| 62 | result = bitbake('core-image-minimal', ignore_status=True) | 62 | result = bitbake('core-image-minimal', ignore_status=True) |
| 63 | if error_msg not in result.output: | 63 | if error_msg not in result.output: |