diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2024-08-12 22:15:39 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-08-21 21:51:49 +0100 |
| commit | e1555ba6f26a04b0948075f5f205f751b44db7aa (patch) | |
| tree | ce69dc3c2452ed16517a38204293676ecb39b558 /meta/classes-recipe | |
| parent | 39de8c65492a8b84494abc3f890744f89af70a36 (diff) | |
| download | poky-e1555ba6f26a04b0948075f5f205f751b44db7aa.tar.gz | |
license_image.bbclass: Rename license-incompatible to license-exception
There is currently both an incompatible-license and a
license-incompatible QA message. This is very confusing.
However, license-incompatible is only used to output a message when a
package is included in an image despite it having a license that is
normally incompatible (by using the INCOMPATIBLE_LICENSE_EXCEPTIONS
variable). To better match how it is used and to distinguish it from
incompatible-license, rename it to license-exception.
(From OE-Core rev: d309eed66f5a4a4bce082536e51207fe65725fab)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
| -rw-r--r-- | meta/classes-recipe/license_image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/license_image.bbclass b/meta/classes-recipe/license_image.bbclass index 19b3dc55ba..0e953856a6 100644 --- a/meta/classes-recipe/license_image.bbclass +++ b/meta/classes-recipe/license_image.bbclass | |||
| @@ -72,7 +72,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): | |||
| 72 | else: | 72 | else: |
| 73 | incompatible_licenses = incompatible_pkg_license(d, bad_licenses, pkg_dic[pkg]["LICENSE"]) | 73 | incompatible_licenses = incompatible_pkg_license(d, bad_licenses, pkg_dic[pkg]["LICENSE"]) |
| 74 | if incompatible_licenses: | 74 | if incompatible_licenses: |
| 75 | oe.qa.handle_error('license-incompatible', "Including %s with incompatible license(s) %s into the image, because it has been allowed by exception list." %(pkg, ' '.join(incompatible_licenses)), d) | 75 | oe.qa.handle_error('license-exception', "Including %s with incompatible license(s) %s into the image, because it has been allowed by exception list." %(pkg, ' '.join(incompatible_licenses)), d) |
| 76 | try: | 76 | try: |
| 77 | (pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"]) = \ | 77 | (pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"]) = \ |
| 78 | oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"], | 78 | oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"], |
