Message ID | 20220323160911.6259-1-pkj@axis.com |
---|---|
State | New, archived |
Headers | show |
Series | ref-manual: Remove references to AVAILABLE_LICENSES | expand |
Hi Peter, On 3/23/22 17:09, Peter Kjellerstedt wrote: > The AVAILABLE_LICENSES variable has been removed from OE-Core. > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > --- > documentation/ref-manual/variables.rst | 26 -------------------------- > 1 file changed, 26 deletions(-) > > diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst > index 634f19a673..b5cfc335fb 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. > must set this variable in your recipe. The > :ref:`syslinux <ref-classes-syslinux>` class checks this variable. > > - :term:`AVAILABLE_LICENSES` > - List of licenses found in the directories specified by > - :term:`COMMON_LICENSE_DIR` and > - :term:`LICENSE_PATH`. > - > - .. note:: > - > - It is assumed that all changes to :term:`COMMON_LICENSE_DIR` and > - :term:`LICENSE_PATH` have been done before :term:`AVAILABLE_LICENSES` > - is defined (in :ref:`ref-classes-license`). > - > :term:`AVAILTUNES` > The list of defined CPU and Application Binary Interface (ABI) > 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. > remove dependencies on or provide alternatives to components that > are required to produce a functional system image. > > - .. note:: > - > - It is possible to define a list of licenses that are allowed to be > - used instead of the licenses that are excluded. To do this, define > - a variable ``COMPATIBLE_LICENSES`` with the names of the licenses > - that are allowed. Then define :term:`INCOMPATIBLE_LICENSE` as:: > - > - INCOMPATIBLE_LICENSE = "${@' '.join(sorted(set(d.getVar('AVAILABLE_LICENSES').split()) - set(d.getVar('COMPATIBLE_LICENSES').split())))}" > - > - > - This will result in :term:`INCOMPATIBLE_LICENSE` containing the names of > - all licenses from :term:`AVAILABLE_LICENSES` except the ones specified > - in ``COMPATIBLE_LICENSES``, thus only allowing the latter licenses to > - be used. > - > :term:`INHERIT` > Causes the named class or classes to be inherited globally. Anonymous > functions in the class or classes are not executed for the base Thanks for the patch! You just forgot to remote a :term:AVAILABLE_LICENSES instance, but I fixed it. Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com> ... and merged into master-next. Thanks again Michael.
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index 634f19a673..b5cfc335fb 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. must set this variable in your recipe. The :ref:`syslinux <ref-classes-syslinux>` class checks this variable. - :term:`AVAILABLE_LICENSES` - List of licenses found in the directories specified by - :term:`COMMON_LICENSE_DIR` and - :term:`LICENSE_PATH`. - - .. note:: - - It is assumed that all changes to :term:`COMMON_LICENSE_DIR` and - :term:`LICENSE_PATH` have been done before :term:`AVAILABLE_LICENSES` - is defined (in :ref:`ref-classes-license`). - :term:`AVAILTUNES` The list of defined CPU and Application Binary Interface (ABI) 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. remove dependencies on or provide alternatives to components that are required to produce a functional system image. - .. note:: - - It is possible to define a list of licenses that are allowed to be - used instead of the licenses that are excluded. To do this, define - a variable ``COMPATIBLE_LICENSES`` with the names of the licenses - that are allowed. Then define :term:`INCOMPATIBLE_LICENSE` as:: - - INCOMPATIBLE_LICENSE = "${@' '.join(sorted(set(d.getVar('AVAILABLE_LICENSES').split()) - set(d.getVar('COMPATIBLE_LICENSES').split())))}" - - - This will result in :term:`INCOMPATIBLE_LICENSE` containing the names of - all licenses from :term:`AVAILABLE_LICENSES` except the ones specified - in ``COMPATIBLE_LICENSES``, thus only allowing the latter licenses to - be used. - :term:`INHERIT` Causes the named class or classes to be inherited globally. Anonymous functions in the class or classes are not executed for the base
The AVAILABLE_LICENSES variable has been removed from OE-Core. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> --- documentation/ref-manual/variables.rst | 26 -------------------------- 1 file changed, 26 deletions(-)