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 <leif.lindh...@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com>
> ---
> 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<BR>
> #
> -# 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 rights reserved.
> *
> -* 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.h
>
> b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> index 8a0e4248b4..73a71ad3c4 100644
> ---
> a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> +++
> b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> @@ -2,13 +2,7 @@
> *
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* 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
> *
> **/
> #ifndef __NON_DISCOVERABLE_INIT_LIB_H__
> diff --git
> a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
>
> b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> index 56c08ecb19..946b9fd6d0 100644
> ---
> a/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> +++
> b/Platform/Marvell/Armada70x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> #
> -# 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/Armada80x0Db/Armada80x0Db.fdf.inc
> b/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
> index f2fcc55d38..92d2629931 100644
> --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.fdf.inc
> +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.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/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c
>
> b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c
> index 61b6202c16..f083c94982 100644
> ---
> a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.c
> +++
> b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.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/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
>
> b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
> index 786b7f0d78..07ee65dfa4 100644
> ---
> a/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
> +++
> b/Platform/Marvell/Armada80x0Db/Armada80x0DbBoardDescLib/Armada80x0DbBoardDescLib.inf
> @@ -2,13 +2,7 @@
> #
> # Copyright (C) 2018, Marvell International Ltd. and its affiliates<BR>
> #
> -# 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/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
>
> b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
> index e7a1d1e687..804339f43e 100644
> ---
> a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
> +++
> b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.c
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Linaro Ltd. All rights reserved.
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* 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/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
>
> b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> index 64373ff0e7..7e8075e591 100644
> ---
> a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> +++
> b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.h
> @@ -3,13 +3,7 @@
> * Copyright (c) 2017, Linaro Ltd. All rights reserved.
> * Copyright (c) 2018, Marvell International Ltd. All rights reserved.
> *
> -* 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
> *
> **/
> #ifndef __NON_DISCOVERABLE_INIT_LIB_H__
> diff --git
> a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
>
> b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> index fe21e5248f..fb303f3d89 100644
> ---
> a/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> +++
> b/Platform/Marvell/Armada80x0Db/NonDiscoverableInitLib/NonDiscoverableInitLib.inf
> @@ -3,13 +3,7 @@
> # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> # Copyright (c) 2018, Marvell International Ltd. All rights reserved.<BR>
> #
> -# 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
> #
> #
> ##
> --
> 2.21.0.windows.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40904): https://edk2.groups.io/g/devel/message/40904
Mute This Topic: https://groups.io/mt/31635484/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
