From 08c11c06250d776267caecf82faa842eb57ab4b0 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 14 Sep 2018 14:56:51 -0400 Subject: aspeed: license: whitespace fixes Whitespace fixes. Replace the words Phosphor OpenBMC in the LICENSE file with the more precise meta-aspeed. (From meta-aspeed rev: f0bdc64dd7b0d22cd32a200b13c4ea0c704a2bb5) Change-Id: Iecbbde0a280dc9d72e15aba4924cc4b5d44d321d Signed-off-by: Brad Bishop --- meta-aspeed/COPYING.MIT | 24 ++++++++++++------------ meta-aspeed/LICENSE | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'meta-aspeed') diff --git a/meta-aspeed/COPYING.MIT b/meta-aspeed/COPYING.MIT index fb950dc69..89de35479 100644 --- a/meta-aspeed/COPYING.MIT +++ b/meta-aspeed/COPYING.MIT @@ -1,17 +1,17 @@ -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 +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 +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 -AUTHORS OR COPYRIGHT HOLDERS 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 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 +AUTHORS OR COPYRIGHT HOLDERS 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. diff --git a/meta-aspeed/LICENSE b/meta-aspeed/LICENSE index 2bf823dc4..63aedaaa4 100644 --- a/meta-aspeed/LICENSE +++ b/meta-aspeed/LICENSE @@ -1,4 +1,4 @@ -Different components of Phosphor OpenBMC are under different licenses (a mix +Different components of meta-aspeed are under different licenses (a mix of MIT and Apache-2.0). Please see: COPYING.Apache-2.0 @@ -8,5 +8,5 @@ All metadata is MIT licensed unless otherwise stated. Source code included in tree for individual recipes is under the LICENSE stated in the associated recipe (.bb file) unless otherwise stated. -License information for any other files is either explicitly stated +License information for any other files is either explicitly stated or defaults to Apache-2.0. -- cgit v1.2.1