Re: [edk2-devel] [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent
Reviewed-by: Michael Kubacki > -Original Message- > From: Kinney, Michael D > Sent: Wednesday, May 15, 2019 4:10 PM > To: devel@edk2.groups.io > Cc: Leif Lindholm ; Ard Biesheuvel > ; Gillispie, Thad ; Bu, > Daocheng ; Oram, Isaac W > ; Piwko, Maciej ; Chiu, > Chasel ; Kubacki, Michael A > ; Lu, Shifei A ; Zhou, > Bowen ; Sinha, Ankit ; > Chaganty, Rangasai V > Subject: [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change > License.txt from 2-Clause BSD to BSD+Patent > > Change License.txt in the root of the edk2-platforms repository from the 2- > Clause BSD License to the BSD+Patent License. > > The text difference between these licenses in the patch is larger than > expected due to different choices for the position of the line breaks. The > text from the BSD 2-Clause license and its disclaimer are the same. New > clauses from the BSD+Patent license have been added. > > The License.txt files in other directories that contain the 2-Clause BSD > License are deleted. The single License.txt in the root of the edk2-platforms > repository with the BSD+Patent License contents is the preferred license for > the edk2-platforms repository. > > https://bugzilla.tianocore.org/show_bug.cgi?id=1373 > > This change is based on the following emails: > > https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html > https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html > > RFCs with detailed process for the license change: > > V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html > V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html > V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html > > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Cc: Thad Gillispie > Cc: Daocheng Bu > Cc: Isaac W Oram > Cc: Maciej Piwko > Cc: Chasel Chiu > Cc: Michael Kubacki > Cc: Shifei A Lu > Cc: Xiaohu Zhou > Cc: Ankit Sinha > Cc: Sai Chaganty > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael D Kinney > --- > License.txt | 70 +-- > Platform/AMD/License.txt | 25 --- > Platform/Intel/AdvancedFeaturePkg/License.txt | 25 --- > Platform/Intel/ClevoOpenBoardPkg/License.txt | 25 --- > .../Intel/KabylakeOpenBoardPkg/License.txt| 25 --- > Platform/Intel/MinPlatformPkg/License.txt | 25 --- > Platform/LeMaker/License.txt | 25 --- > Platform/SoftIron/License.txt | 25 --- > Silicon/AMD/Styx/License.txt | 25 --- > Silicon/Intel/KabylakeSiliconPkg/License.txt | 25 --- > 10 files changed, 48 insertions(+), 247 deletions(-) delete mode 100644 > Platform/AMD/License.txt delete mode 100644 > Platform/Intel/AdvancedFeaturePkg/License.txt > delete mode 100644 Platform/Intel/ClevoOpenBoardPkg/License.txt > delete mode 100644 Platform/Intel/KabylakeOpenBoardPkg/License.txt > delete mode 100644 Platform/Intel/MinPlatformPkg/License.txt > delete mode 100644 Platform/LeMaker/License.txt delete mode 100644 > Platform/SoftIron/License.txt delete mode 100644 > Silicon/AMD/Styx/License.txt delete mode 100644 > Silicon/Intel/KabylakeSiliconPkg/License.txt > > diff --git a/License.txt b/License.txt > index dea6f02f0f..ee840505cb 100644 > --- a/License.txt > +++ b/License.txt > @@ -1,25 +1,51 @@ > -Copyright (c) 2012-2017, Linaro Ltd. All rights reserved. > +Copyright (c) 2019, TianoCore and contributors. All rights reserved. > + > +SPDX-License-Identifier: BSD-2-Clause-Patent > > Redistribution and use in source and binary forms, with or without - > modification, are permitted provided that the following conditions -are met: > - > -* Redistributions of source code must retain the above copyright > - notice, this list of conditions and the following disclaimer. > -* 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. > - > -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND > CONTRIBUTORS -"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 THE -COPYRIGHT HOLDER OR > CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, > SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT > NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - > 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 > +modification, are permitted provided that the following conditions are met: > + > +1. Redistributions of
Re: [edk2-devel] [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent
Reviewed-by: Chasel Chiu > -Original Message- > From: Kinney, Michael D > Sent: Thursday, May 16, 2019 7:10 AM > To: devel@edk2.groups.io > Cc: Leif Lindholm ; Ard Biesheuvel > ; Gillispie, Thad ; Bu, > Daocheng ; Oram, Isaac W > ; Piwko, Maciej ; Chiu, > Chasel ; Kubacki, Michael A > ; Lu, Shifei A ; Zhou, > Bowen ; Sinha, Ankit ; > Chaganty, Rangasai V > Subject: [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change > License.txt from 2-Clause BSD to BSD+Patent > > Change License.txt in the root of the edk2-platforms repository from the > 2-Clause BSD License to the BSD+Patent License. > > The text difference between these licenses in the patch is larger than > expected > due to different choices for the position of the line breaks. The text from > the > BSD 2-Clause license and its disclaimer are the same. New clauses from the > BSD+Patent license have been added. > > The License.txt files in other directories that contain the 2-Clause BSD > License are > deleted. The single License.txt in the root of the edk2-platforms repository > with > the BSD+Patent License contents is the preferred license for the > edk2-platforms > repository. > > https://bugzilla.tianocore.org/show_bug.cgi?id=1373 > > This change is based on the following emails: > > https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html > https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html > > RFCs with detailed process for the license change: > > V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html > V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html > V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html > > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Cc: Thad Gillispie > Cc: Daocheng Bu > Cc: Isaac W Oram > Cc: Maciej Piwko > Cc: Chasel Chiu > Cc: Michael Kubacki > Cc: Shifei A Lu > Cc: Xiaohu Zhou > Cc: Ankit Sinha > Cc: Sai Chaganty > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael D Kinney > --- > License.txt | 70 +-- > Platform/AMD/License.txt | 25 --- > Platform/Intel/AdvancedFeaturePkg/License.txt | 25 --- > Platform/Intel/ClevoOpenBoardPkg/License.txt | 25 --- > .../Intel/KabylakeOpenBoardPkg/License.txt| 25 --- > Platform/Intel/MinPlatformPkg/License.txt | 25 --- > Platform/LeMaker/License.txt | 25 --- > Platform/SoftIron/License.txt | 25 --- > Silicon/AMD/Styx/License.txt | 25 --- > Silicon/Intel/KabylakeSiliconPkg/License.txt | 25 --- > 10 files changed, 48 insertions(+), 247 deletions(-) delete mode 100644 > Platform/AMD/License.txt delete mode 100644 > Platform/Intel/AdvancedFeaturePkg/License.txt > delete mode 100644 Platform/Intel/ClevoOpenBoardPkg/License.txt > delete mode 100644 Platform/Intel/KabylakeOpenBoardPkg/License.txt > delete mode 100644 Platform/Intel/MinPlatformPkg/License.txt > delete mode 100644 Platform/LeMaker/License.txt delete mode 100644 > Platform/SoftIron/License.txt delete mode 100644 > Silicon/AMD/Styx/License.txt delete mode 100644 > Silicon/Intel/KabylakeSiliconPkg/License.txt > > diff --git a/License.txt b/License.txt > index dea6f02f0f..ee840505cb 100644 > --- a/License.txt > +++ b/License.txt > @@ -1,25 +1,51 @@ > -Copyright (c) 2012-2017, Linaro Ltd. All rights reserved. > +Copyright (c) 2019, TianoCore and contributors. All rights reserved. > + > +SPDX-License-Identifier: BSD-2-Clause-Patent > > Redistribution and use in source and binary forms, with or without > -modification, are permitted provided that the following conditions -are met: > - > -* Redistributions of source code must retain the above copyright > - notice, this list of conditions and the following disclaimer. > -* 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. > - > -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND > CONTRIBUTORS -"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 THE -COPYRIGHT HOLDER OR CONTRIBUTORS > BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, > PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -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 > +modification, are permitted provided that the following conditions are met: > + > +1. Redistributions
[edk2-devel] [[edk2-platforms][PATCH V2] 02/30] edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent
Change License.txt in the root of the edk2-platforms repository from the 2-Clause BSD License to the BSD+Patent License. The text difference between these licenses in the patch is larger than expected due to different choices for the position of the line breaks. The text from the BSD 2-Clause license and its disclaimer are the same. New clauses from the BSD+Patent license have been added. The License.txt files in other directories that contain the 2-Clause BSD License are deleted. The single License.txt in the root of the edk2-platforms repository with the BSD+Patent License contents is the preferred license for the edk2-platforms repository. https://bugzilla.tianocore.org/show_bug.cgi?id=1373 This change is based on the following emails: https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html RFCs with detailed process for the license change: V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Thad Gillispie Cc: Daocheng Bu Cc: Isaac W Oram Cc: Maciej Piwko Cc: Chasel Chiu Cc: Michael Kubacki Cc: Shifei A Lu Cc: Xiaohu Zhou Cc: Ankit Sinha Cc: Sai Chaganty Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney --- License.txt | 70 +-- Platform/AMD/License.txt | 25 --- Platform/Intel/AdvancedFeaturePkg/License.txt | 25 --- Platform/Intel/ClevoOpenBoardPkg/License.txt | 25 --- .../Intel/KabylakeOpenBoardPkg/License.txt| 25 --- Platform/Intel/MinPlatformPkg/License.txt | 25 --- Platform/LeMaker/License.txt | 25 --- Platform/SoftIron/License.txt | 25 --- Silicon/AMD/Styx/License.txt | 25 --- Silicon/Intel/KabylakeSiliconPkg/License.txt | 25 --- 10 files changed, 48 insertions(+), 247 deletions(-) delete mode 100644 Platform/AMD/License.txt delete mode 100644 Platform/Intel/AdvancedFeaturePkg/License.txt delete mode 100644 Platform/Intel/ClevoOpenBoardPkg/License.txt delete mode 100644 Platform/Intel/KabylakeOpenBoardPkg/License.txt delete mode 100644 Platform/Intel/MinPlatformPkg/License.txt delete mode 100644 Platform/LeMaker/License.txt delete mode 100644 Platform/SoftIron/License.txt delete mode 100644 Silicon/AMD/Styx/License.txt delete mode 100644 Silicon/Intel/KabylakeSiliconPkg/License.txt diff --git a/License.txt b/License.txt index dea6f02f0f..ee840505cb 100644 --- a/License.txt +++ b/License.txt @@ -1,25 +1,51 @@ -Copyright (c) 2012-2017, Linaro Ltd. All rights reserved. +Copyright (c) 2019, TianoCore and contributors. All rights reserved. + +SPDX-License-Identifier: BSD-2-Clause-Patent Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -* 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. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"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 THE -COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -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 +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. + +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. + +Subject to the terms and conditions of this license, each copyright holder +and contributor hereby grants to those receiving rights under this license +a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except for failure to satisfy the conditions of this license) patent +license to make, have made, use, offer to sell, sell, import,
