From: "Robert P. J. Day" <[email protected]>

Add to documentation.conf all the new variables supported by
features_check.bbclass.

Signed-off-by: Robert P. J. Day <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>
Signed-off-by: Steve Sakoman <[email protected]>
---
 meta/conf/documentation.conf | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 44d69197bf..b48cbd4ac0 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -64,6 +64,9 @@ ALTERNATIVE[doc] = "Lists commands in a package that need an 
alternative binary
 ALTERNATIVE_LINK_NAME[doc] = "Used by the alternatives system to map 
duplicated commands to actual locations."
 ALTERNATIVE_PRIORITY[doc] = "Used by the alternatives system to create default 
priorities for duplicated commands."
 ALTERNATIVE_TARGET[doc] = "Used by the alternatives system to create default 
link locations for duplicated commands."
+ANY_OF_COMBINED_FEATURES[doc] = "When a recipe inherits the features_check 
class, at least one item in this variable must be included in 
COMBINED_FEATURES."
+ANY_OF_DISTRO_FEATURES[doc] = "When a recipe inherits the features_check 
class, at least one item in this variable must be included in DISTRO_FEATURES."
+ANY_OF_MACHINE_FEATURES[doc] = "When a recipe inherits the features_check 
class, at least one item in this variable must be included in MACHINE_FEATURES."
 ASSUME_PROVIDED[doc] = "List of packages (recipes actually) that are assumed 
to be implicitly available. BitBake does not build these packages."
 ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib 
packages in ASSUME_PROVIDED, for which automatic shlib dependency tracking does 
not work."
 AUTHOR[doc] = "Email address used to contact the original author(s) in order 
to send patches and forward bugs."
@@ -114,7 +117,9 @@ COMPATIBLE_MACHINE[doc] = "A regular expression that 
resolves to one or more tar
 COMPLEMENTARY_GLOB[doc] = "Defines wildcards to match when installing a list 
of complementary packages for all the packages installed in an image."
 CONFFILES[doc] = "Identifies editable or configurable files that are part of a 
package."
 CONFIG_SITE[doc] = "A list of files that contains autoconf test results 
relevant to the current build. This variable is used by the Autotools utilities 
when running configure."
-CONFLICT_DISTRO_FEATURES[doc] = "When a recipe inherits the features_check 
class, this variable identifies distribution features that would be in conflict 
should the recipe be built."
+CONFLICT_COMBINED_FEATURES[doc] = "When a recipe inherits the features_check 
class, no item in this variable can be included in COMBINED_FEATURES."
+CONFLICT_DISTRO_FEATURES[doc] = "When a recipe inherits the features_check 
class, no item in this variable can be included in DISTRO_FEATURES."
+CONFLICT_MACHINE_FEATURES[doc] = "When a recipe inherits the features_check 
class, no item in this variable can be included in MACHINE_FEATURES."
 CORE_IMAGE_EXTRA_INSTALL[doc] = "Specifies the list of packages to be added to 
the image. You should only set this variable in the conf/local.conf file in the 
Build Directory."
 COREBASE[doc] = "Specifies the parent directory of the OpenEmbedded Core 
Metadata layer (i.e. meta)."
 CONF_VERSION[doc] = "Tracks the version of local.conf.  Increased each time 
build/conf/ changes incompatibly."
@@ -345,7 +350,9 @@ QMAKE_PROFILES[doc] = "Specifies your own subset of .pro 
files to be built for u
 
 RCONFLICTS[doc] = "The list of packages that conflict with another package. 
Note that the package will not be installed if the conflicting packages are not 
first removed."
 RDEPENDS[doc] = "Lists a package's runtime dependencies (i.e. other packages) 
that must be installed for the package to be built. They must be the names of 
other packages as listed in the PACKAGES variable, not recipe names (PN)."
-REQUIRED_DISTRO_FEATURES[doc] = "When a recipe inherits the features_check 
class, this variable identifies distribution features that must exist in the 
current configuration in order for the OpenEmbedded build system to build the 
recipe."
+REQUIRED_COMBINED_FEATURES[doc] = "When a recipe inherits the features_check 
class, all items in this variable must be included in COMBINED_FEATURES."
+REQUIRED_DISTRO_FEATURES[doc] = "When a recipe inherits the features_check 
class, all items in this variable must be included in DISTRO_FEATURES."
+REQUIRED_MACHINE_FEATURES[doc] = "When a recipe inherits the features_check 
class, all items in this variable must be included in MACHINE_FEATURES."
 RM_WORK_EXCLUDE[doc] = "With rm_work enabled, this variable specifies a list 
of packages whose work directories should not be removed."
 ROOTFS[doc] = "Indicates a filesystem image to include as the root filesystem."
 ROOTFS_POSTPROCESS_COMMAND[doc] = "Added by classes to run post processing 
commands once the OpenEmbedded build system has created the root filesystem."
-- 
2.17.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138418): 
https://lists.openembedded.org/g/openembedded-core/message/138418
Mute This Topic: https://lists.openembedded.org/mt/74295759/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to