summaryrefslogtreecommitdiff
path: root/meta/files/common-licenses/BSD-4-Clause
diff options
context:
space:
mode:
authorBeth Flanagan <elizabeth.flanagan@intel.com>2011-06-15 13:52:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 23:44:29 +0100
commite47343d12ee571281238bbf5663b074c0e32049f (patch)
treeaa434dae7245a5748f2158c212f654b90cb22e01 /meta/files/common-licenses/BSD-4-Clause
parent319610d5bf61108f2ecc538c7a5de5b7c85a6684 (diff)
downloadopenembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.tar.gz
openembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.tar.bz2
openembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.tar.xz
openembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.zip
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. Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Diffstat (limited to 'meta/files/common-licenses/BSD-4-Clause')
-rw-r--r--meta/files/common-licenses/BSD-4-Clause17
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 c5471a3fc..7b162dec0 100644
--- a/meta/files/common-licenses/BSD-4-Clause
+++ b/meta/files/common-licenses/BSD-4-Clause
@@ -5,18 +5,18 @@ All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+ notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software
-must display the following acknowledgement:
-This product includes software developed by the <organization>.
+ must display the following acknowledgement:
+ This product includes software developed by the <organization>.
4. Neither the name of the <organization> nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY
+THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS`` AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
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
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+