diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2022-06-25 18:13:46 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-27 14:55:08 +0100 |
commit | c4f669566ffc27138e2851c2f5b3b2bbeec01f33 (patch) | |
tree | aab3586dc1e411501072e1dfe60078d4b0ed7e54 /documentation | |
parent | 22a70fbc3e37b9139aa4a4eff6254e9a8444390b (diff) | |
download | poky-c4f669566ffc27138e2851c2f5b3b2bbeec01f33.tar.gz |
ref-manual: Add documentation for INCOMPATIBLE_LICENSE_EXCEPTIONS
(From yocto-docs rev: 2a7732bce71b4a493f6bb081b545de6ac586b88a)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
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/migration-guides/migration-4.0.rst | 2 | ||||
-rw-r--r-- | documentation/ref-manual/variables.rst | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/documentation/migration-guides/migration-4.0.rst b/documentation/migration-guides/migration-4.0.rst index a8e6b4c331..79e53f89ac 100644 --- a/documentation/migration-guides/migration-4.0.rst +++ b/documentation/migration-guides/migration-4.0.rst | |||
@@ -45,7 +45,7 @@ The following variables have changed their names: | |||
45 | - ``SSTATE_DUPWHITELIST`` became ``SSTATE_ALLOW_OVERLAP_FILES`` | 45 | - ``SSTATE_DUPWHITELIST`` became ``SSTATE_ALLOW_OVERLAP_FILES`` |
46 | - ``SYSROOT_DIRS_BLACKLIST`` became :term:`SYSROOT_DIRS_IGNORE` | 46 | - ``SYSROOT_DIRS_BLACKLIST`` became :term:`SYSROOT_DIRS_IGNORE` |
47 | - ``UNKNOWN_CONFIGURE_WHITELIST`` became :term:`UNKNOWN_CONFIGURE_OPT_IGNORE` | 47 | - ``UNKNOWN_CONFIGURE_WHITELIST`` became :term:`UNKNOWN_CONFIGURE_OPT_IGNORE` |
48 | - ``WHITELIST_<license>`` became ``INCOMPATIBLE_LICENSE_EXCEPTIONS`` | 48 | - ``WHITELIST_<license>`` became :term:`INCOMPATIBLE_LICENSE_EXCEPTIONS` |
49 | 49 | ||
50 | In addition, ``BB_STAMP_WHITELIST``, ``BB_STAMP_POLICY``, ``INHERIT_BLACKLIST``, | 50 | In addition, ``BB_STAMP_WHITELIST``, ``BB_STAMP_POLICY``, ``INHERIT_BLACKLIST``, |
51 | ``TUNEABI``, ``TUNEABI_WHITELIST``, and ``TUNEABI_OVERRIDE`` have been removed. | 51 | ``TUNEABI``, ``TUNEABI_WHITELIST``, and ``TUNEABI_OVERRIDE`` have been removed. |
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index 603f95d2e4..f723e38d1a 100644 --- a/documentation/ref-manual/variables.rst +++ b/documentation/ref-manual/variables.rst | |||
@@ -3547,6 +3547,14 @@ system and gives an overview of their function and contents. | |||
3547 | remove dependencies on or provide alternatives to components that | 3547 | remove dependencies on or provide alternatives to components that |
3548 | are required to produce a functional system image. | 3548 | are required to produce a functional system image. |
3549 | 3549 | ||
3550 | :term:`INCOMPATIBLE_LICENSE_EXCEPTIONS` | ||
3551 | Specifies a space-separated list of package and license pairs that | ||
3552 | are allowed to be used even if the license is specified in | ||
3553 | :term:`INCOMPATIBLE_LICENSE`. The package and license pairs are | ||
3554 | separated using a colon. Example:: | ||
3555 | |||
3556 | INCOMPATIBLE_LICENSE_EXCEPTIONS = "gdbserver:GPL-3.0-only gdbserver:LGPL-3.0-only" | ||
3557 | |||
3550 | :term:`INHERIT` | 3558 | :term:`INHERIT` |
3551 | Causes the named class or classes to be inherited globally. Anonymous | 3559 | Causes the named class or classes to be inherited globally. Anonymous |
3552 | functions in the class or classes are not executed for the base | 3560 | functions in the class or classes are not executed for the base |