diff options
author | Scott Rifenbark <scott.m.rifenbark@intel.com> | 2013-12-20 15:31:42 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-02 13:16:10 +0000 |
commit | 2cd87c868f259ed3b165d41115157ff8e9320c25 (patch) | |
tree | 74af6f7ec89b9b1bc353141e0d74a5f23e9374c9 /documentation | |
parent | d06cd4c82a14601c41cdbf4c4316513883efb6b0 (diff) | |
download | poky-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.xml | 25 |
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" | |||
3588 | </para></listitem> | 3588 | </para></listitem> |
3589 | <listitem><para>You can use spaces between license | 3589 | <listitem><para>You can use spaces between license |
3590 | names.</para></listitem> | 3590 | names.</para></listitem> |
3591 | <listitem><para>For standard licenses, use the names | ||
3592 | of the files in | ||
3593 | <filename>meta/files/common-licenses/</filename> | ||
3594 | or the | ||
3595 | <link linkend='var-SPDXLICENSEMAP'><filename>SPDXLICENSEMAP</filename></link> | ||
3596 | flag names defined in | ||
3597 | <filename>meta/conf/licenses.conf</filename>. | ||
3598 | </para></listitem> | ||
3591 | </itemizedlist> | 3599 | </itemizedlist> |
3592 | </para> | 3600 | </para> |
3593 | 3601 | ||
@@ -5961,6 +5969,23 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3" | |||
5961 | </glossdef> | 5969 | </glossdef> |
5962 | </glossentry> | 5970 | </glossentry> |
5963 | 5971 | ||
5972 | <glossentry id='var-SPDXLICENSEMAP'><glossterm>SPDXLICENSEMAP</glossterm> | ||
5973 | <glossdef> | ||
5974 | <para> | ||
5975 | Maps commonly used license names to their SPDX counterparts | ||
5976 | found in <filename>meta/files/common-licenses/</filename>. | ||
5977 | For <filename>SPDXLICENSEMAP</filename> flag names, see the | ||
5978 | <filename>meta/conf/licenses.conf</filename> file. | ||
5979 | </para> | ||
5980 | |||
5981 | <para> | ||
5982 | For additional information, see the | ||
5983 | <link linkend='var-LICENSE'><filename>LICENSE</filename></link> | ||
5984 | variable. | ||
5985 | </para> | ||
5986 | </glossdef> | ||
5987 | </glossentry> | ||
5988 | |||
5964 | <glossentry id='var-SPECIAL_PKGSUFFIX'><glossterm>SPECIAL_PKGSUFFIX</glossterm> | 5989 | <glossentry id='var-SPECIAL_PKGSUFFIX'><glossterm>SPECIAL_PKGSUFFIX</glossterm> |
5965 | <glossdef> | 5990 | <glossdef> |
5966 | <para> | 5991 | <para> |