aboutsummaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-12-20 15:31:42 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-02 13:16:10 +0000
commit2cd87c868f259ed3b165d41115157ff8e9320c25 (patch)
tree74af6f7ec89b9b1bc353141e0d74a5f23e9374c9 /documentation
parentd06cd4c82a14601c41cdbf4c4316513883efb6b0 (diff)
downloadopenembedded-core-contrib-2cd87c868f259ed3b165d41115157ff8e9320c25.tar.gz
ref-manual: Edits to LICENSE variable. Added SPDXLICENSEMAP variable.
(From yocto-docs rev: 3aab65aad94bfcbf024c26a7da3c11a550f7f9b1) 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/ref-manual/ref-variables.xml25
1 files changed, 25 insertions, 0 deletions
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 5d037960c7..b5c95481a7 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -3588,6 +3588,14 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
</para></listitem>
<listitem><para>You can use spaces between license
names.</para></listitem>
+ <listitem><para>For standard licenses, use the names
+ of the files in
+ <filename>meta/files/common-licenses/</filename>
+ or the
+ <link linkend='var-SPDXLICENSEMAP'><filename>SPDXLICENSEMAP</filename></link>
+ flag names defined in
+ <filename>meta/conf/licenses.conf</filename>.
+ </para></listitem>
</itemizedlist>
</para>
@@ -5961,6 +5969,23 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
</glossdef>
</glossentry>
+ <glossentry id='var-SPDXLICENSEMAP'><glossterm>SPDXLICENSEMAP</glossterm>
+ <glossdef>
+ <para>
+ Maps commonly used license names to their SPDX counterparts
+ found in <filename>meta/files/common-licenses/</filename>.
+ For <filename>SPDXLICENSEMAP</filename> flag names, see the
+ <filename>meta/conf/licenses.conf</filename> file.
+ </para>
+
+ <para>
+ For additional information, see the
+ <link linkend='var-LICENSE'><filename>LICENSE</filename></link>
+ variable.
+ </para>
+ </glossdef>
+ </glossentry>
+
<glossentry id='var-SPECIAL_PKGSUFFIX'><glossterm>SPECIAL_PKGSUFFIX</glossterm>
<glossdef>
<para>