diff options
author | Christian Eggers <ceggers@arri.de> | 2022-03-11 09:40:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-16 14:25:01 +0000 |
commit | 16831cd62b393fde5b52f52371c46af38c0e6520 (patch) | |
tree | 0d8f89d280154e7ef266f6a98b1ff088bef88982 /documentation | |
parent | d59439a3fbd49022f763f215b3883b707f1475b7 (diff) | |
download | poky-16831cd62b393fde5b52f52371c46af38c0e6520.tar.gz |
ref-manual: INCOMPATIBLE_LICENSE: use new license wildcards
This has recently been changed in expand_wildcard_licenses().
(file: OECORE/meta/classes/license.bbclass).
(From yocto-docs rev: 5121da30350a4edeef07f6722222c9e364617f0e)
Signed-off-by: Christian Eggers <ceggers@arri.de>
Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/ref-manual/images.rst | 2 | ||||
-rw-r--r-- | documentation/ref-manual/variables.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/documentation/ref-manual/images.rst b/documentation/ref-manual/images.rst index 0e3351bb7b..31fb567687 100644 --- a/documentation/ref-manual/images.rst +++ b/documentation/ref-manual/images.rst | |||
@@ -21,7 +21,7 @@ image you want. | |||
21 | image:: | 21 | image:: |
22 | 22 | ||
23 | 1. Comment out the EXTRA_IMAGE_FEATURES line | 23 | 1. Comment out the EXTRA_IMAGE_FEATURES line |
24 | 2. Set INCOMPATIBLE_LICENSE = "GPL-3.0 LGPL-3.0 AGPL-3.0" | 24 | 2. Set INCOMPATIBLE_LICENSE = "GPL-3.0* LGPL-3.0* AGPL-3.0*" |
25 | 25 | ||
26 | 26 | ||
27 | From within the ``poky`` Git repository, you can use the following | 27 | From within the ``poky`` Git repository, you can use the following |
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index c8b4a157d8..cd9eae7af2 100644 --- a/documentation/ref-manual/variables.rst +++ b/documentation/ref-manual/variables.rst | |||
@@ -3438,7 +3438,7 @@ system and gives an overview of their function and contents. | |||
3438 | This functionality is only regularly tested using the following | 3438 | This functionality is only regularly tested using the following |
3439 | setting:: | 3439 | setting:: |
3440 | 3440 | ||
3441 | INCOMPATIBLE_LICENSE = "GPL-3.0 LGPL-3.0 AGPL-3.0" | 3441 | INCOMPATIBLE_LICENSE = "GPL-3.0* LGPL-3.0* AGPL-3.0*" |
3442 | 3442 | ||
3443 | 3443 | ||
3444 | Although you can use other settings, you might be required to | 3444 | Although you can use other settings, you might be required to |