Re: [edk2-devel] [[edk2-platforms][PATCH V2] 14/30] Platform/Marvell: Replace BSD License with BSD+Patent License
On Wed, May 15, 2019 at 04:09:55PM -0700, Michael D Kinney wrote: > https://bugzilla.tianocore.org/show_bug.cgi?id=1373 > > Replace BSD 2-Clause License with BSD+Patent License. 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 As far as I can tell, this excludes the source files currently licensed under 3-clause BSD (2-clause plus non-endorsement clause). This is correct, and as discussed offline, but it would be worth pointing it out explicitly in the commit message. (Conversations about relicensing the 3-clause files are happening in the background.) Other than that, looks good to me. / Leif > Cc: Leif Lindholm > Cc: Ard Biesheuvel > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael D Kinney > --- > Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc| 8 +--- > .../Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c | 8 +--- > .../Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf | 8 +--- > .../NonDiscoverableInitLib/NonDiscoverableInitLib.c | 8 +--- > .../NonDiscoverableInitLib/NonDiscoverableInitLib.h | 8 +--- > .../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +--- > Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc| 8 +--- > .../Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c | 8 +--- > .../Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf | 8 +--- > .../NonDiscoverableInitLib/NonDiscoverableInitLib.c | 8 +--- > .../NonDiscoverableInitLib/NonDiscoverableInitLib.h | 8 +--- > .../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +--- > 12 files changed, 12 insertions(+), 84 deletions(-) > > diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc > b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc > index 712960636d..77e8b11bf5 100644 > --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc > +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc > @@ -1,13 +1,7 @@ > # > # Copyright (C) 2018 Marvell International Ltd. and its affiliates > # > -# This program and the accompanying materials > -# are licensed and made available under the terms and conditions of the BSD > License > -# which accompanies this distribution. The full text of the license may be > found at > -# http://opensource.org/licenses/bsd-license.php > -# > -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > IMPLIED. > +# SPDX-License-Identifier: BSD-2-Clause-Patent > # > > # Per-board additional content of the DXE phase firmware volume > diff --git > a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c > > b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c > index f0133ec253..dbd434ff96 100644 > --- > a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c > +++ > b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c > @@ -2,13 +2,7 @@ > * > * Copyright (C) 2018, Marvell International Ltd. and its affiliates. > * > -* This program and the accompanying materials are licensed and made > available > -* under the terms and conditions of the BSD License which accompanies this > -* distribution. The full text of the license may be found at > -* http://opensource.org/licenses/bsd-license.php > -* > -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > IMPLIED. > +* SPDX-License-Identifier: BSD-2-Clause-Patent > * > **/ > > diff --git > a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf > > b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf > index c995515064..20294ab43b 100644 > --- > a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf > +++ > b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf > @@ -2,13 +2,7 @@ > # > # Copyright (C) 2018, Marvell International Ltd. and its affiliates > # > -# This program and the accompanying materials are licensed and made > available > -# under the terms and conditions of the BSD License which accompanies this > -# distribution. The full text of the license may be found at > -# http://opensource.org/licenses/bsd-license.php > -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, >
[edk2-devel] [[edk2-platforms][PATCH V2] 14/30] Platform/Marvell: Replace BSD License with BSD+Patent License
https://bugzilla.tianocore.org/show_bug.cgi?id=1373 Replace BSD 2-Clause License with BSD+Patent License. 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 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney --- Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc| 8 +--- .../Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c | 8 +--- .../Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf | 8 +--- .../NonDiscoverableInitLib/NonDiscoverableInitLib.c | 8 +--- .../NonDiscoverableInitLib/NonDiscoverableInitLib.h | 8 +--- .../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +--- Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc| 8 +--- .../Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c | 8 +--- .../Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf | 8 +--- .../NonDiscoverableInitLib/NonDiscoverableInitLib.c | 8 +--- .../NonDiscoverableInitLib/NonDiscoverableInitLib.h | 8 +--- .../NonDiscoverableInitLib/NonDiscoverableInitLib.inf | 8 +--- 12 files changed, 12 insertions(+), 84 deletions(-) diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc index 712960636d..77e8b11bf5 100644 --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf.inc @@ -1,13 +1,7 @@ # # Copyright (C) 2018 Marvell International Ltd. and its affiliates # -# This program and the accompanying materials -# are licensed and made available under the terms and conditions of the BSD License -# which accompanies this distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# SPDX-License-Identifier: BSD-2-Clause-Patent # # Per-board additional content of the DXE phase firmware volume diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c index f0133ec253..dbd434ff96 100644 --- a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c +++ b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.c @@ -2,13 +2,7 @@ * * Copyright (C) 2018, Marvell International Ltd. and its affiliates. * -* This program and the accompanying materials are licensed and made available -* under the terms and conditions of the BSD License which accompanies this -* distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php -* -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +* SPDX-License-Identifier: BSD-2-Clause-Patent * **/ diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf index c995515064..20294ab43b 100644 --- a/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf +++ b/Platform/Marvell/Armada70x0Db/Armada70x0DbBoardDescLib/Armada70x0DbBoardDescLib.inf @@ -2,13 +2,7 @@ # # Copyright (C) 2018, Marvell International Ltd. and its affiliates # -# This program and the accompanying materials are licensed and made available -# under the terms and conditions of the BSD License which accompanies this -# distribution. The full text of the license may be found at -# http://opensource.org/licenses/bsd-license.php -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR -# IMPLIED. +# SPDX-License-Identifier: BSD-2-Clause-Patent # # ## diff --git a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c index d8dba6e9d8..554155eed6 100644 --- a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c +++ b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c @@ -3,13 +3,7 @@ * Copyright (c) 2017, Linaro Ltd. All rights reserved. * Copyright (c) 2018, Marvell International Ltd. All
