[oe-commits] Matthieu Crapet : documentation.conf (LICENSE): tiny addition

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: aa2d50a4cdc6870836014666fbe6115cb408ea31
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=aa2d50a4cdc6870836014666fbe6115cb408ea31

Author: Matthieu Crapet <Matthieu.Crapet at ingenico.com>
Date:   Mon Apr  7 10:21:22 2014 +0200

documentation.conf (LICENSE): tiny addition

Examples:

LICENSE = "MIT"
LICENSE = "GPLv2 & LGPLv2.1"
LICENSE = "AFL-2 | GPLv2+"
LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD"
LICENSE = "GPLv2 & (LGPLv2.1 | MPL-1.1 | BSD)"
LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )"

Signed-off-by: Matthieu Crapet <Matthieu.Crapet at ingenico.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/conf/documentation.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 9d6e78f..7fa3f31 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -253,7 +253,7 @@ LAYERDIR[doc] = "When used inside the layer.conf configuration file, this variab
 LAYERVERSION[doc] = "Optionally specifies the version of a layer as a single number. This variable is used in the conf/layer.conf file and must be suffixed with the name of the specific layer."
 LEAD_SONAME[doc] = "Specifies the lead (or primary) compiled library file (.so) that the debian class applies its naming policy to given a recipe that packages multiple libraries."
 LIC_FILES_CHKSUM[doc] = "Checksums of the license text in the recipe source code."
-LICENSE[doc] = "The list of source licenses for the recipe."
+LICENSE[doc] = "The list of source licenses for the recipe. Logical operators '&' or '|' and parentheses can be used."
 LICENSE_PATH[doc] = "Path to additional licenses used during the build."
 LINUX_KERNEL_TYPE[doc] = "Defines the kernel type to be used in assembling the configuration."
 LINUX_VERSION[doc] = "The Linux version from kernel.org on which the Linux kernel image being built using the OpenEmbedded build system is based. You define this variable in the kernel recipe."