diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2014-07-01 09:26:12 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-03 13:57:11 +0100 |
commit | 68bd063fb96f9190885d305d0141c0a66c77662b (patch) | |
tree | 7bf91c983630b683bc89d14776000ef343e6d154 | |
parent | a53950ad2c9f468ef1700d71e26163bd5f204c21 (diff) | |
download | poky-68bd063fb96f9190885d305d0141c0a66c77662b.tar.gz |
ref-manual, bsp-guide: Added several cross-references to LICENSE_FLAGS.
Needed to add several links to the newly described
LICENSE_FLAGS variable in the glossary. Three links added to the
ref-manual and a single link added to the BSP Guide.
(From yocto-docs rev: 2ca6e556c299814d6ef847ed059a4f0a2d48adb3)
Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | documentation/bsp-guide/bsp.xml | 7 | ||||
-rw-r--r-- | documentation/ref-manual/technical-details.xml | 17 |
2 files changed, 14 insertions, 10 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml index 00d94b2009..26434c7c09 100644 --- a/documentation/bsp-guide/bsp.xml +++ b/documentation/bsp-guide/bsp.xml | |||
@@ -1002,9 +1002,10 @@ | |||
1002 | satisfy the licensing requirements for an encumbered BSP. | 1002 | satisfy the licensing requirements for an encumbered BSP. |
1003 | The following list describes them in order of preference: | 1003 | The following list describes them in order of preference: |
1004 | <orderedlist> | 1004 | <orderedlist> |
1005 | <listitem><para><emphasis>Use the <filename>LICENSE_FLAGS</filename> variable | 1005 | <listitem><para><emphasis>Use the |
1006 | to define the recipes that have commercial or other types of | 1006 | <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></ulink> |
1007 | specially-licensed packages:</emphasis> | 1007 | variable to define the recipes that have commercial or other |
1008 | types of specially-licensed packages:</emphasis> | ||
1008 | For each of those recipes, you can | 1009 | For each of those recipes, you can |
1009 | specify a matching license string in a | 1010 | specify a matching license string in a |
1010 | <filename>local.conf</filename> variable named | 1011 | <filename>local.conf</filename> variable named |
diff --git a/documentation/ref-manual/technical-details.xml b/documentation/ref-manual/technical-details.xml index 8bba42bdd4..446e9ed7c3 100644 --- a/documentation/ref-manual/technical-details.xml +++ b/documentation/ref-manual/technical-details.xml | |||
@@ -1207,8 +1207,9 @@ | |||
1207 | components that have commercial or other special licensing | 1207 | components that have commercial or other special licensing |
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 <filename>LICENSE_FLAGS</filename> variable | 1210 | recipe-by-recipe basis through the |
1211 | definition in the affected recipe. | 1211 | <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></ulink> |
1212 | variable definition in the affected recipe. | ||
1212 | For instance, the | 1213 | For instance, the |
1213 | <filename>poky/meta/recipes-multimedia/gstreamer/gst-plugins-ugly</filename> | 1214 | <filename>poky/meta/recipes-multimedia/gstreamer/gst-plugins-ugly</filename> |
1214 | recipe contains the following statement: | 1215 | recipe contains the following statement: |
@@ -1269,9 +1270,10 @@ | |||
1269 | License flag matching allows you to control what recipes the | 1270 | License flag matching allows you to control what recipes the |
1270 | OpenEmbedded build system includes in the build. | 1271 | OpenEmbedded build system includes in the build. |
1271 | Fundamentally, the build system attempts to match | 1272 | Fundamentally, the build system attempts to match |
1272 | <filename>LICENSE_FLAGS</filename> strings found in | 1273 | <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></ulink> |
1273 | recipes against <filename>LICENSE_FLAGS_WHITELIST</filename> | 1274 | strings found in recipes against |
1274 | strings found in the whitelist. | 1275 | <filename>LICENSE_FLAGS_WHITELIST</filename> strings found in |
1276 | the whitelist. | ||
1275 | A match causes the build system to include a recipe in the | 1277 | A match causes the build system to include a recipe in the |
1276 | build, while failure to find a match causes the build system to | 1278 | build, while failure to find a match causes the build system to |
1277 | exclude a recipe. | 1279 | exclude a recipe. |
@@ -1393,8 +1395,9 @@ | |||
1393 | Of course, you could also create a matching whitelist | 1395 | Of course, you could also create a matching whitelist |
1394 | for those components using the more general "commercial" | 1396 | for those components using the more general "commercial" |
1395 | in the whitelist, but that would also enable all the | 1397 | in the whitelist, but that would also enable all the |
1396 | other packages with <filename>LICENSE_FLAGS</filename> containing | 1398 | other packages with |
1397 | "commercial", which you may or may not want: | 1399 | <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE_FLAGS'><filename>LICENSE_FLAGS</filename></ulink> |
1400 | containing "commercial", which you may or may not want: | ||
1398 | <literallayout class='monospaced'> | 1401 | <literallayout class='monospaced'> |
1399 | LICENSE_FLAGS_WHITELIST = "commercial" | 1402 | LICENSE_FLAGS_WHITELIST = "commercial" |
1400 | </literallayout> | 1403 | </literallayout> |