summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
Diffstat (limited to 'documentation')
-rw-r--r--documentation/migration-guides/migration-3.1.rst2
-rw-r--r--documentation/ref-manual/variables.rst26
2 files changed, 1 insertions, 27 deletions
diff --git a/documentation/migration-guides/migration-3.1.rst b/documentation/migration-guides/migration-3.1.rst
index cb0296717e..e3fdbbe425 100644
--- a/documentation/migration-guides/migration-3.1.rst
+++ b/documentation/migration-guides/migration-3.1.rst
@@ -260,7 +260,7 @@ Miscellaneous changes
260--------------------- 260---------------------
261 261
262- The undocumented ``SRC_DISTRIBUTE_LICENSES`` variable has now been 262- The undocumented ``SRC_DISTRIBUTE_LICENSES`` variable has now been
263 removed in favour of a new :term:`AVAILABLE_LICENSES` variable which is 263 removed in favour of a new ``AVAILABLE_LICENSES`` variable which is
264 dynamically set based upon license files found in 264 dynamically set based upon license files found in
265 ``${COMMON_LICENSE_DIR}`` and ``${LICENSE_PATH}``. 265 ``${COMMON_LICENSE_DIR}`` and ``${LICENSE_PATH}``.
266 266
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
index 781cd19765..f9fd551478 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -231,17 +231,6 @@ system and gives an overview of their function and contents.
231 must set this variable in your recipe. The 231 must set this variable in your recipe. The
232 :ref:`syslinux <ref-classes-syslinux>` class checks this variable. 232 :ref:`syslinux <ref-classes-syslinux>` class checks this variable.
233 233
234 :term:`AVAILABLE_LICENSES`
235 List of licenses found in the directories specified by
236 :term:`COMMON_LICENSE_DIR` and
237 :term:`LICENSE_PATH`.
238
239 .. note::
240
241 It is assumed that all changes to :term:`COMMON_LICENSE_DIR` and
242 :term:`LICENSE_PATH` have been done before :term:`AVAILABLE_LICENSES`
243 is defined (in :ref:`ref-classes-license`).
244
245 :term:`AVAILTUNES` 234 :term:`AVAILTUNES`
246 The list of defined CPU and Application Binary Interface (ABI) 235 The list of defined CPU and Application Binary Interface (ABI)
247 tunings (i.e. "tunes") available for use by the OpenEmbedded build 236 tunings (i.e. "tunes") available for use by the OpenEmbedded build
@@ -3508,21 +3497,6 @@ system and gives an overview of their function and contents.
3508 remove dependencies on or provide alternatives to components that 3497 remove dependencies on or provide alternatives to components that
3509 are required to produce a functional system image. 3498 are required to produce a functional system image.
3510 3499
3511 .. note::
3512
3513 It is possible to define a list of licenses that are allowed to be
3514 used instead of the licenses that are excluded. To do this, define
3515 a variable ``COMPATIBLE_LICENSES`` with the names of the licenses
3516 that are allowed. Then define :term:`INCOMPATIBLE_LICENSE` as::
3517
3518 INCOMPATIBLE_LICENSE = "${@' '.join(sorted(set(d.getVar('AVAILABLE_LICENSES').split()) - set(d.getVar('COMPATIBLE_LICENSES').split())))}"
3519
3520
3521 This will result in :term:`INCOMPATIBLE_LICENSE` containing the names of
3522 all licenses from :term:`AVAILABLE_LICENSES` except the ones specified
3523 in ``COMPATIBLE_LICENSES``, thus only allowing the latter licenses to
3524 be used.
3525
3526 :term:`INHERIT` 3500 :term:`INHERIT`
3527 Causes the named class or classes to be inherited globally. Anonymous 3501 Causes the named class or classes to be inherited globally. Anonymous
3528 functions in the class or classes are not executed for the base 3502 functions in the class or classes are not executed for the base