From: Matthieu Crapet Date: Mon, 7 Apr 2014 08:21:22 +0000 (+0200) Subject: documentation.conf (LICENSE): tiny addition X-Git-Tag: 2015-4~3102 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f53b6770554d868d287bed0d15194fdb9ed6a779;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 9d6e78f9e6..7fa3f318b9 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."