Add license file XFree86-1.0

Submitted by Kang Kai on June 11, 2015, 5:50 a.m. | Patch ID: 95139

Details

Message ID 1434001838-30392-1-git-send-email-kai.kang@windriver.com
State New
Headers show

Commit Message

Kang Kai June 11, 2015, 5:50 a.m.
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.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta/conf/licenses.conf                |  2 +-
 meta/files/common-licenses/XFree86-1.0 | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 meta/files/common-licenses/XFree86-1.0

Patch hide | download patch | download mbox

diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 629916b..9917c40 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"
 SRC_DISTRIBUTE_LICENSES += "Python-2.0 QPL-1.0 RHeCos-1 RHeCos-1.1 RPL-1.5"
 SRC_DISTRIBUTE_LICENSES += "RPSL-1.0 RSCPL Ruby SAX-PD SGI-1 Simple-2.0 Sleepycat"
 SRC_DISTRIBUTE_LICENSES += "SPL-1.0 SugarCRM-1 SugarCRM-1.1.3 UCB VSL-1.0 W3C"
-SRC_DISTRIBUTE_LICENSES += "Watcom-1.0 WXwindows XFree86-1.1 Xnet XSL YPL-1.1"
+SRC_DISTRIBUTE_LICENSES += "Watcom-1.0 WXwindows XFree86-1.0 XFree86-1.1 Xnet XSL YPL-1.1"
 SRC_DISTRIBUTE_LICENSES += "Zimbra-1.3 Zlib ZPL-1.1 ZPL-2.0 ZPL-2.1"
 
 # Standards are great! Everyone has their own. In an effort to standardize licensing
diff --git a/meta/files/common-licenses/XFree86-1.0 b/meta/files/common-licenses/XFree86-1.0
new file mode 100644
index 0000000..b1f3bf4
--- /dev/null
+++ b/meta/files/common-licenses/XFree86-1.0
@@ -0,0 +1,22 @@ 
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the XFree86 Project.