summaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual/ref-variables.xml
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-02-15 10:09:15 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-03 17:40:10 +0000
commit41e9f7cdac0998b4606007210480ec89874e596f (patch)
treeea086e369974e91c2a5517f2d86300b1bb6f1e90 /documentation/ref-manual/ref-variables.xml
parent5066fbcfb4ef146ed800b1ef0dd6eaf938fd0d90 (diff)
downloadpoky-41e9f7cdac0998b4606007210480ec89874e596f.tar.gz
dev-manual, ref-manual: Updated licensing text information.
Fixes [YOCTO #8634] To clear up the behavior the COPY_LIC_DIRS, COPY_LIC_MANIFEST, and LICENSE_CREATE_PACKAGE variable behaviors, I updated the glossary descriptions of the variables. Also, added more info to the "Providing License Text" section in the dev-manual. Tied everything together with good referencing. (From yocto-docs rev: e7b2a1ed29dcd9d572b71f756e7705e6499a05ac) Signed-off-by: Scott Rifenbark <srifenbark@gmail.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.xml40
1 files changed, 38 insertions, 2 deletions
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index f752856b9d..53bc544b5b 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -2348,7 +2348,20 @@
2348 <filename>/usr/share/common-licenses</filename>, 2348 <filename>/usr/share/common-licenses</filename>,
2349 for each package. 2349 for each package.
2350 The license files are placed 2350 The license files are placed
2351 in directories within the image itself. 2351 in directories within the image itself during build time.
2352 <note>
2353 The <filename>COPY_LIC_DIRS</filename> does not
2354 offer a path for adding licenses for newly installed
2355 packages to an image, which might be most suitable
2356 for read-only filesystems that cannot be upgraded.
2357 See the
2358 <link linkend='var-LICENSE_CREATE_PACKAGE'><filename>LICENSE_CREATE_PACKAGE</filename></link>
2359 variable for additional information.
2360 You can also reference the
2361 "<ulink url='&YOCTO_DOCS_DEV_URL;#providing-license-text'>Providing License Text</ulink>"
2362 section in the Yocto Project Development Manual for
2363 information on providing license text.
2364 </note>
2352 </para> 2365 </para>
2353 </glossdef> 2366 </glossdef>
2354 </glossentry> 2367 </glossentry>
@@ -2363,7 +2376,20 @@
2363 If set to "1", the OpenEmbedded build system copies 2376 If set to "1", the OpenEmbedded build system copies
2364 the license manifest for the image to 2377 the license manifest for the image to
2365 <filename>/usr/share/common-licenses/license.manifest</filename> 2378 <filename>/usr/share/common-licenses/license.manifest</filename>
2366 within the image itself. 2379 within the image itself during build time.
2380 <note>
2381 The <filename>COPY_LIC_MANIFEST</filename> does not
2382 offer a path for adding licenses for newly installed
2383 packages to an image, which might be most suitable
2384 for read-only filesystems that cannot be upgraded.
2385 See the
2386 <link linkend='var-LICENSE_CREATE_PACKAGE'><filename>LICENSE_CREATE_PACKAGE</filename></link>
2387 variable for additional information.
2388 You can also reference the
2389 "<ulink url='&YOCTO_DOCS_DEV_URL;#providing-license-text'>Providing License Text</ulink>"
2390 section in the Yocto Project Development Manual for
2391 information on providing license text.
2392 </note>
2367 </para> 2393 </para>
2368 </glossdef> 2394 </glossdef>
2369 </glossentry> 2395 </glossentry>
@@ -7159,6 +7185,16 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
7159 <link linkend='var-LIC_FILES_CHKSUM'><filename>LIC_FILES_CHKSUM</filename></link> 7185 <link linkend='var-LIC_FILES_CHKSUM'><filename>LIC_FILES_CHKSUM</filename></link>
7160 as containing license text). 7186 as containing license text).
7161 </para> 7187 </para>
7188
7189 <para>
7190 For related information on providing license text, see the
7191 <link linkend='var-COPY_LIC_DIRS'><filename>COPY_LIC_DIRS</filename></link>
7192 variable, the
7193 <link linkend='var-COPY_LIC_MANIFEST'><filename>COPY_LIC_MANIFEST</filename></link>
7194 variable, and the
7195 "<ulink url='&YOCTO_DOCS_DEV_URL;#providing-license-text'>Providing License Text</ulink>"
7196 section in the Yocto Project Development Manual.
7197 </para>
7162 </glossdef> 7198 </glossdef>
7163 </glossentry> 7199 </glossentry>
7164 7200