summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-06-11 13:50:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:18 +0100
commit1d350d448f1f67200dd00ece7f5ff928ce50c853 (patch)
tree338029f5a1596a6f83a354c323234dcfe2e7cade /meta/conf
parente53c8719ba971280985dff382dd33fc6af7a9b0c (diff)
downloadpoky-1d350d448f1f67200dd00ece7f5ff928ce50c853.tar.gz
Add license file XFree86-1.0
Add license file XFree86-1.0 which is needed by packages such as hwdata. It is from: http://www.x.org/archive/X11R7.5/doc/LICENSE.html#AEN28 And add 'XFree86-1.0' to SRC_DISTRIBUTE_LICENSES. (From OE-Core rev: be91551041c623e7e9b34780cc6322f898f8cf7f) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/licenses.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 629916b6a5..9917c40e19 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -36,7 +36,7 @@ SRC_DISTRIBUTE_LICENSES += "OSL-3.0 PD PHP-3.0 PostgreSQL Proprietary"
36SRC_DISTRIBUTE_LICENSES += "Python-2.0 QPL-1.0 RHeCos-1 RHeCos-1.1 RPL-1.5" 36SRC_DISTRIBUTE_LICENSES += "Python-2.0 QPL-1.0 RHeCos-1 RHeCos-1.1 RPL-1.5"
37SRC_DISTRIBUTE_LICENSES += "RPSL-1.0 RSCPL Ruby SAX-PD SGI-1 Simple-2.0 Sleepycat" 37SRC_DISTRIBUTE_LICENSES += "RPSL-1.0 RSCPL Ruby SAX-PD SGI-1 Simple-2.0 Sleepycat"
38SRC_DISTRIBUTE_LICENSES += "SPL-1.0 SugarCRM-1 SugarCRM-1.1.3 UCB VSL-1.0 W3C" 38SRC_DISTRIBUTE_LICENSES += "SPL-1.0 SugarCRM-1 SugarCRM-1.1.3 UCB VSL-1.0 W3C"
39SRC_DISTRIBUTE_LICENSES += "Watcom-1.0 WXwindows XFree86-1.1 Xnet XSL YPL-1.1" 39SRC_DISTRIBUTE_LICENSES += "Watcom-1.0 WXwindows XFree86-1.0 XFree86-1.1 Xnet XSL YPL-1.1"
40SRC_DISTRIBUTE_LICENSES += "Zimbra-1.3 Zlib ZPL-1.1 ZPL-2.0 ZPL-2.1" 40SRC_DISTRIBUTE_LICENSES += "Zimbra-1.3 Zlib ZPL-1.1 ZPL-2.0 ZPL-2.1"
41 41
42# Standards are great! Everyone has their own. In an effort to standardize licensing 42# Standards are great! Everyone has their own. In an effort to standardize licensing