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/Zlib | |
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/Zlib')
-rw-r--r-- | meta/files/common-licenses/Zlib | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/meta/files/common-licenses/Zlib b/meta/files/common-licenses/Zlib index 5da23064e6..f8b3884943 100644 --- a/meta/files/common-licenses/Zlib +++ b/meta/files/common-licenses/Zlib | |||
@@ -2,24 +2,20 @@ | |||
2 | zlib License | 2 | zlib License |
3 | 3 | ||
4 | 4 | ||
5 | This software is provided 'as-is', without any express or implied | 5 | This software is provided `as-is`, without any express or implied |
6 | warranty. In no event will the authors be held liable for any damages | 6 | warranty. In no event will the authors be held liable for any damages |
7 | arising from the use of this software. | 7 | arising from the use of this software. |
8 | 8 | ||
9 | Permission is granted to anyone to use this software for any purpose, | 9 | Permission is granted to anyone to use this software for any purpose, |
10 | including commercial applications, and to alter it and redistribute it | 10 | including commercial applications, and to alter it and redistribute it |
11 | freely, subject to the following restrictions: | 11 | freely, subject to the following restrictions: |
12 | 12 | ||
13 | 1. The origin of this software must not be misrepresented; you must not | 13 | 1. The origin of this software must not be misrepresented; you must not |
14 | claim that you wrote the original software. If you use this software | 14 | claim that you wrote the original software. If you use this software |
15 | in a product, an acknowledgment in the product documentation would be | 15 | in a product, an acknowledgment in the product documentation would be |
16 | appreciated but is not required. | 16 | appreciated but is not required. |
17 | 2. Altered source versions must be plainly marked as such, and must not be | 17 | 2. Altered source versions must be plainly marked as such, and must not be |
18 | misrepresented as being the original software. | 18 | misrepresented as being the original software. |
19 | 3. This notice may not be removed or altered from any source distribution. | 19 | 3. This notice may not be removed or altered from any source distribution. |
20 | |||
21 | |||
22 | |||
23 | |||
24 | 20 | ||
25 | 21 | ||