diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2014-07-01 09:52:29 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-03 13:57:11 +0100 |
commit | 8d0d487a12924017724d7c5a8d423b2b7536975a (patch) | |
tree | de19174d8881d94c2aeb83bf5cb6eb8095823c03 /documentation | |
parent | 980ad4ed0c37c0644bf61fbb67be65edac43c8f5 (diff) | |
download | poky-8d0d487a12924017724d7c5a8d423b2b7536975a.tar.gz |
ref-manual, bsp-guide: Added cross-references for two variables.
Added several cross-link references for the LICENSE_FLAGS and
LICENSE_FLAGS_WHITELIST variables. Note that the cross-references
previously put in for LICENSE_FLAGS were slightly wrong as they
were using the <ulink> tag instead of the <link> tag.
(From yocto-docs rev: dc2769c63d24d3650c993cfd48bcb4540ad36ca2)
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/bsp-guide/bsp.xml | 2 | ||||
-rw-r--r-- | documentation/ref-manual/technical-details.xml | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml index 26434c7c09..fd143ede14 100644 --- a/documentation/bsp-guide/bsp.xml +++ b/documentation/bsp-guide/bsp.xml | |||
@@ -1009,7 +1009,7 @@ | |||
1009 | For each of those recipes, you can | 1009 | For each of those recipes, you can |
1010 | specify a matching license string in a | 1010 | specify a matching license string in a |
1011 | <filename>local.conf</filename> variable named | 1011 | <filename>local.conf</filename> variable named |
1012 | <filename>LICENSE_FLAGS_WHITELIST</filename>. | 1012 | <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE_FLAGS_WHITELIST'><filename>LICENSE_FLAGS_WHITELIST</filename></ulink>. |
1013 | Specifying the matching license string signifies that you agree to the license. | 1013 | Specifying the matching license string signifies that you agree to the license. |
1014 | Thus, the build system can build the corresponding recipe and include | 1014 | Thus, the build system can build the corresponding recipe and include |
1015 | the component in the image. | 1015 | the component in the image. |
diff --git a/documentation/ref-manual/technical-details.xml b/documentation/ref-manual/technical-details.xml index 446e9ed7c3..b0588351d5 100644 --- a/documentation/ref-manual/technical-details.xml +++ b/documentation/ref-manual/technical-details.xml | |||
@@ -1208,7 +1208,7 @@ | |||
1208 | requirements. | 1208 | requirements. |
1209 | Such requirements are defined on a | 1209 | Such requirements are defined on a |
1210 | recipe-by-recipe basis through the | 1210 | recipe-by-recipe basis through the |
1211 | <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></ulink> | 1211 | <link linkend='var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></link> |
1212 | variable definition in the affected recipe. | 1212 | variable definition in the affected recipe. |
1213 | For instance, the | 1213 | For instance, the |
1214 | <filename>poky/meta/recipes-multimedia/gstreamer/gst-plugins-ugly</filename> | 1214 | <filename>poky/meta/recipes-multimedia/gstreamer/gst-plugins-ugly</filename> |
@@ -1224,7 +1224,8 @@ | |||
1224 | In order for a component restricted by a <filename>LICENSE_FLAGS</filename> | 1224 | In order for a component restricted by a <filename>LICENSE_FLAGS</filename> |
1225 | definition to be enabled and included in an image, it | 1225 | definition to be enabled and included in an image, it |
1226 | needs to have a matching entry in the global | 1226 | needs to have a matching entry in the global |
1227 | <filename>LICENSE_FLAGS_WHITELIST</filename> variable, which is a variable | 1227 | <link linkend='var-LICENSE_FLAGS_WHITELIST'><filename>LICENSE_FLAGS_WHITELIST</filename></link> |
1228 | variable, which is a variable | ||
1228 | typically defined in your <filename>local.conf</filename> file. | 1229 | typically defined in your <filename>local.conf</filename> file. |
1229 | For example, to enable | 1230 | For example, to enable |
1230 | the <filename>poky/meta/recipes-multimedia/gstreamer/gst-plugins-ugly</filename> | 1231 | the <filename>poky/meta/recipes-multimedia/gstreamer/gst-plugins-ugly</filename> |
@@ -1270,10 +1271,10 @@ | |||
1270 | License flag matching allows you to control what recipes the | 1271 | License flag matching allows you to control what recipes the |
1271 | OpenEmbedded build system includes in the build. | 1272 | OpenEmbedded build system includes in the build. |
1272 | Fundamentally, the build system attempts to match | 1273 | Fundamentally, the build system attempts to match |
1273 | <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></ulink> | 1274 | <link linkend='var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></link> |
1274 | strings found in recipes against | 1275 | strings found in recipes against |
1275 | <filename>LICENSE_FLAGS_WHITELIST</filename> strings found in | 1276 | <link linkend='var-LICENSE_FLAGS_WHITELIST'><filename>LICENSE_FLAGS_WHITELIST</filename></link> |
1276 | the whitelist. | 1277 | strings found in the whitelist. |
1277 | A match causes the build system to include a recipe in the | 1278 | A match causes the build system to include a recipe in the |
1278 | build, while failure to find a match causes the build system to | 1279 | build, while failure to find a match causes the build system to |
1279 | exclude a recipe. | 1280 | exclude a recipe. |
@@ -1396,7 +1397,7 @@ | |||
1396 | for those components using the more general "commercial" | 1397 | for those components using the more general "commercial" |
1397 | in the whitelist, but that would also enable all the | 1398 | in the whitelist, but that would also enable all the |
1398 | other packages with | 1399 | other packages with |
1399 | <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></ulink> | 1400 | <link linkend='var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></link> |
1400 | containing "commercial", which you may or may not want: | 1401 | containing "commercial", which you may or may not want: |
1401 | <literallayout class='monospaced'> | 1402 | <literallayout class='monospaced'> |
1402 | LICENSE_FLAGS_WHITELIST = "commercial" | 1403 | LICENSE_FLAGS_WHITELIST = "commercial" |