From 4d3cdfe6ce2a24eb9bdfb164d8a58810e19472d2 Mon Sep 17 00:00:00 2001 From: Antonin Godard Date: Tue, 30 Jun 2026 10:13:12 +0200 Subject: [PATCH] ref-manual/variables.rst: document missing CONFLICT_*_FEATURES variables Those are part of the features_check class. (From yocto-docs rev: 297003a537798e6a4beafdd4ad520ed1c47c355a) Signed-off-by: Antonin Godard (cherry picked from commit fb38ef19e67b31f855bddb61ad990020d5cef234) Signed-off-by: Antonin Godard Signed-off-by: Paul Barker --- documentation/ref-manual/variables.rst | 39 +++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst index 26ce53c12d..7f0efb8286 100644 --- a/documentation/ref-manual/variables.rst +++ b/documentation/ref-manual/variables.rst @@ -1732,15 +1732,52 @@ system and gives an overview of their function and contents. Where :term:`AUTOTOOLS_SCRIPT_PATH` is the location of the of the Autotools build system scripts, which defaults to :term:`S`. + :term:`CONFLICT_COMBINED_FEATURES` + When inheriting the :ref:`ref-classes-features_check` + class, this variable identifies combined features (see + :term:`COMBINED_FEATURES` for what this means) that would be in conflict + should the recipe be built. In other words, if the + :term:`CONFLICT_COMBINED_FEATURES` variable lists a feature that also + appears in :term:`COMBINED_FEATURES` within the current configuration, + then the recipe will be skipped, and if the build system attempts to build + the recipe then an error will be triggered. + :term:`CONFLICT_DISTRO_FEATURES` When inheriting the :ref:`ref-classes-features_check` - class, this variable identifies distribution features that would be + class, this variable identifies distro features that would be in conflict should the recipe be built. In other words, if the :term:`CONFLICT_DISTRO_FEATURES` variable lists a feature that also appears in :term:`DISTRO_FEATURES` within the current configuration, then the recipe will be skipped, and if the build system attempts to build the recipe then an error will be triggered. + :term:`CONFLICT_IMAGE_FEATURES` + When inheriting the :ref:`ref-classes-features_check` + class, this variable identifies image features that would be + in conflict should the recipe be built. In other words, if the + :term:`CONFLICT_IMAGE_FEATURES` variable lists a feature that also + appears in :term:`IMAGE_FEATURES` within the current configuration, then + the recipe will be skipped, and if the build system attempts to build + the recipe then an error will be triggered. + + :term:`CONFLICT_MACHINE_FEATURES` + When inheriting the :ref:`ref-classes-features_check` + class, this variable identifies machine features that would be + in conflict should the recipe be built. In other words, if the + :term:`CONFLICT_MACHINE_FEATURES` variable lists a feature that also + appears in :term:`MACHINE_FEATURES` within the current configuration, then + the recipe will be skipped, and if the build system attempts to build + the recipe then an error will be triggered. + + :term:`CONFLICT_TUNE_FEATURES` + When inheriting the :ref:`ref-classes-features_check` + class, this variable identifies tune features that would be + in conflict should the recipe be built. In other words, if the + :term:`CONFLICT_TUNE_FEATURES` variable lists a feature that also + appears in :term:`TUNE_FEATURES` within the current configuration, then + the recipe will be skipped, and if the build system attempts to build + the recipe then an error will be triggered. + :term:`CONVERSION_CMD` This variable is used for storing image conversion commands. Image conversion can convert an image into different objects like: