summaryrefslogtreecommitdiffstats
path: root/documentation/dev-manual
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/dev-manual
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/dev-manual')
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml28
1 files changed, 19 insertions, 9 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 0f006c790d..e0db037454 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -9977,6 +9977,25 @@
9977 Adding these statements to the configuration file ensures 9977 Adding these statements to the configuration file ensures
9978 that the licenses collected during package generation 9978 that the licenses collected during package generation
9979 are included on your image. 9979 are included on your image.
9980 <note>
9981 <para>Setting all three variables to "1" results in the
9982 image having two copies of the same license file.
9983 One copy resides in
9984 <filename>/usr/share/common-licenses</filename> and
9985 the other resides in
9986 <filename>/usr/share/license</filename>.</para>
9987
9988 <para>The reason for this behavior is because
9989 <ulink url='&YOCTO_DOCS_REF_URL;#var-COPY_LIC_DIRS'><filename>COPY_LIC_DIRS</filename></ulink>
9990 and
9991 <ulink url='&YOCTO_DOCS_REF_URL;#var-COPY_LIC_MANIFEST'><filename>COPY_LIC_MANIFEST</filename></ulink>
9992 add a copy of the license when the image is built but do not
9993 offer a path for adding licenses for newly installed packages
9994 to an image.
9995 <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE_CREATE_PACKAGE'><filename>LICENSE_CREATE_PACKAGE</filename></ulink>
9996 adds a separate package and an upgrade path for adding
9997 licenses to an image.</para>
9998 </note>
9980 </para> 9999 </para>
9981 10000
9982 <para> 10001 <para>
@@ -9986,15 +10005,6 @@
9986 of the license information with source as defined by the GPL 10005 of the license information with source as defined by the GPL
9987 and other open source licenses. 10006 and other open source licenses.
9988 </para> 10007 </para>
9989
9990 <para>
9991 See the
9992 <ulink url='&YOCTO_DOCS_REF_URL;#var-LICENSE_CREATE_PACKAGE'><filename>LICENSE_CREATE_PACKAGE</filename></ulink>,
9993 <ulink url='&YOCTO_DOCS_REF_URL;#var-COPY_LIC_DIRS'><filename>COPY_LIC_DIRS</filename></ulink>,
9994 and
9995 <ulink url='&YOCTO_DOCS_REF_URL;#var-COPY_LIC_MANIFEST'><filename>COPY_LIC_MANIFEST</filename></ulink>
9996 variable descriptions for more information.
9997 </para>
9998 </section> 10008 </section>
9999 10009
10000 <section id='providing-compilation-scripts-and-source-code-modifications'> 10010 <section id='providing-compilation-scripts-and-source-code-modifications'>