diff options
| author | Beth Flanagan <elizabeth.flanagan@intel.com> | 2011-06-15 13:52:23 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-23 23:44:49 +0100 |
| commit | 7cd2ac0e40d854bab9a32512018aff6172500c0e (patch) | |
| tree | 99366a7b07db9f0b53bb9d411f0016f36982616d /meta/files/common-licenses/ISC | |
| parent | 879a7f819b7f38cda82d97489af433310aabfed1 (diff) | |
| download | poky-7cd2ac0e40d854bab9a32512018aff6172500c0e.tar.gz | |
common-licenses: Additions and corrections
I've added more licenses from SPDX and corrected the gcc license
so that it is a. parsable and b. accurate to the SPDX standard.
I've also done some cleanup of license text and gdb's LICENSE
field.
(From OE-Core rev: e47343d12ee571281238bbf5663b074c0e32049f)
Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files/common-licenses/ISC')
| -rw-r--r-- | meta/files/common-licenses/ISC | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/meta/files/common-licenses/ISC b/meta/files/common-licenses/ISC index 21a9c7b6f1..97af105b0a 100644 --- a/meta/files/common-licenses/ISC +++ b/meta/files/common-licenses/ISC | |||
| @@ -1,23 +1,10 @@ | |||
| 1 | 1 | ||
| 2 | ISC License: | 2 | ISC License: |
| 3 | 3 | ||
| 4 | Copyright © 2004-2010 by Internet Systems Consortium, Inc. ("ISC") | 4 | Copyright © 2004-2010 by Internet Systems Consortium, Inc. ("ISC") |
| 5 | Copyright © 1995-2003 by Internet Software Consortium | 5 | Copyright © 1995-2003 by Internet Software Consortium |
| 6 | |||
| 7 | Permission to use, copy, modify, and/or distribute this software for any | ||
| 8 | purpose with or without fee is hereby granted, provided that the above | ||
| 9 | copyright notice and this permission notice appear in all copies. | ||
| 10 | |||
| 11 | THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES | ||
| 12 | WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| 13 | MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, | ||
| 14 | DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING | ||
| 15 | FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE | ||
| 16 | OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR | ||
| 17 | PERFORMANCE OF THIS SOFTWARE. | ||
| 18 | |||
| 19 | |||
| 20 | |||
| 21 | 6 | ||
| 7 | Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. | ||
| 22 | 8 | ||
| 9 | THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
| 23 | 10 | ||