diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2013-11-22 09:24:22 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-03 12:54:08 +0000 |
commit | 1df11a5af09faa684dc44318fe14675d3b2161d8 (patch) | |
tree | 35b6342e9604a3e90767d8f05f7d488a547d7c9a /documentation | |
parent | 1598a54c697ac76042fc060bcaf92b417241602c (diff) | |
download | poky-1df11a5af09faa684dc44318fe14675d3b2161d8.tar.gz |
ref-manual: Added new CONFLICT_DISTRO_FEATURES variable description.
Reported-by: Robert P. J. Day <rpjday@crashcourse.ca>
(From yocto-docs rev: 490a57b5c8c8230d47be53bf3092060c3fb97f19)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r-- | documentation/ref-manual/ref-variables.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml index 87a97c8186..34ca4094f5 100644 --- a/documentation/ref-manual/ref-variables.xml +++ b/documentation/ref-manual/ref-variables.xml | |||
@@ -1072,6 +1072,24 @@ | |||
1072 | </glossdef> | 1072 | </glossdef> |
1073 | </glossentry> | 1073 | </glossentry> |
1074 | 1074 | ||
1075 | <glossentry id='var-CONFLICT_DISTRO_FEATURES'><glossterm>CONFLICT_DISTRO_FEATURES</glossterm> | ||
1076 | <glossdef> | ||
1077 | <para> | ||
1078 | When a recipe inherits the | ||
1079 | <filename>distro_features_check</filename> class, this | ||
1080 | variable identifies distribution features that would | ||
1081 | be in conflict should the recipe | ||
1082 | be built. | ||
1083 | In other words, if the | ||
1084 | <filename>CONFLICT_DISTRO_FEATURES</filename> variable | ||
1085 | lists a feature that also appears in | ||
1086 | <filename>DISTRO_FEATURES</filename> within the | ||
1087 | current configuration, an error occurs and the | ||
1088 | build stops. | ||
1089 | </para> | ||
1090 | </glossdef> | ||
1091 | </glossentry> | ||
1092 | |||
1075 | <glossentry id='var-CORE_IMAGE_EXTRA_INSTALL'><glossterm>CORE_IMAGE_EXTRA_INSTALL</glossterm> | 1093 | <glossentry id='var-CORE_IMAGE_EXTRA_INSTALL'><glossterm>CORE_IMAGE_EXTRA_INSTALL</glossterm> |
1076 | <glossdef> | 1094 | <glossdef> |
1077 | <para> | 1095 | <para> |