summaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual/ref-variables.xml
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-11-22 09:24:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-03 12:53:18 +0000
commitacf9a04a3876f22a7efa9b7a1ec0c70f1774b06f (patch)
treec84894ad717731f248ebe40453cf6f932e6c5e36 /documentation/ref-manual/ref-variables.xml
parent031f1880a4c0036da7946b5d54a3f65132787ec7 (diff)
downloadpoky-acf9a04a3876f22a7efa9b7a1ec0c70f1774b06f.tar.gz
ref-manual: Added new CONFLICT_DISTRO_FEATURES variable description.
Reported-by: Robert P. J. Day <rpjday@crashcourse.ca> (From yocto-docs rev: 6ace08dcbaa08fd13d4d8f49d34dd90240e65761) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual/ref-variables.xml')
-rw-r--r--documentation/ref-manual/ref-variables.xml18
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>