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/BSD-4-Clause | |
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/BSD-4-Clause')
-rw-r--r-- | meta/files/common-licenses/BSD-4-Clause | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/files/common-licenses/BSD-4-Clause b/meta/files/common-licenses/BSD-4-Clause index c5471a3fcc..7b162dec0b 100644 --- a/meta/files/common-licenses/BSD-4-Clause +++ b/meta/files/common-licenses/BSD-4-Clause | |||
@@ -5,18 +5,18 @@ All rights reserved. | |||
5 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
6 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
7 | 1. Redistributions of source code must retain the above copyright | 7 | 1. Redistributions of source code must retain the above copyright |
8 | notice, this list of conditions and the following disclaimer. | 8 | notice, this list of conditions and the following disclaimer. |
9 | 2. Redistributions in binary form must reproduce the above copyright | 9 | 2. Redistributions in binary form must reproduce the above copyright |
10 | notice, this list of conditions and the following disclaimer in the | 10 | notice, this list of conditions and the following disclaimer in the |
11 | documentation and/or other materials provided with the distribution. | 11 | documentation and/or other materials provided with the distribution. |
12 | 3. All advertising materials mentioning features or use of this software | 12 | 3. All advertising materials mentioning features or use of this software |
13 | must display the following acknowledgement: | 13 | must display the following acknowledgement: |
14 | This product includes software developed by the <organization>. | 14 | This product includes software developed by the <organization>. |
15 | 4. Neither the name of the <organization> nor the | 15 | 4. Neither the name of the <organization> nor the |
16 | names of its contributors may be used to endorse or promote products | 16 | names of its contributors may be used to endorse or promote products |
17 | derived from this software without specific prior written permission. | 17 | derived from this software without specific prior written permission. |
18 | 18 | ||
19 | THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY | 19 | THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS`` AND ANY |
20 | EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 20 | EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
21 | WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 21 | WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
22 | DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY | 22 | DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY |
@@ -26,3 +26,4 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | |||
26 | ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 | ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 27 | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
28 | SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 | SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 | |||