Re: [Wiki Patch 2/2] Change preferred license of EDK II to BSD+Patent

["Leif Lindholm" <leif.lindholm@linaro.org>]

Minor suggestion below:

On Fri, Apr 12, 2019 at 03:50:40PM -0700, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1656
> 
> Change the Wiki documentation to state that the preferred license of the
> EDK II is the BSD+Patent License and remove references to the TianoCore
> Contributor's Agreement.
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  BSD-License.md               |  2 +-
>  BSD-Patent-License.md        | 18 ++++++++++++++++++
>  Code-Contributions.mediawiki |  4 +---
>  EDK-II.md                    |  2 +-
>  Edk2-buildtools.mediawiki    |  2 +-
>  Legalese.md                  |  9 +++++----
>  OVMF-FAQ.md                  | 11 +++--------
>  _Footer.md                   |  2 +-
>  8 files changed, 31 insertions(+), 19 deletions(-)
>  create mode 100644 BSD-Patent-License.md
> 
> diff --git a/BSD-License.md b/BSD-License.md
> index debf562..e846663 100644
> --- a/BSD-License.md
> +++ b/BSD-License.md
> @@ -1,4 +1,4 @@
> -The preferred license for TianoCore contributions is [BSD-2-Clause](http://opensource.org/licenses/BSD-2-Clause). The [[Legalese]] page contains information on other licenses accepted under the contributors agreement, and how licenses should be documented in TianoCore projects.
> +The preferred license for TianoCore contributions is [[BSD+Patent|BSD Patent License]]. The [[Legalese]] page contains information on other licenses accepted under the contributors agreement, and how licenses should be documented in TianoCore projects.
>  
>  # Example Language: BSD-2-Clause
>  
> diff --git a/BSD-Patent-License.md b/BSD-Patent-License.md
> new file mode 100644
> index 0000000..38c7b31
> --- /dev/null
> +++ b/BSD-Patent-License.md
> @@ -0,0 +1,18 @@
> +The preferred license for TianoCore contributions is [BSD+Patent](https://opensource.org/licenses/BSDplusPatent). 
> +The [[Legalese]] page contains information on other accepted licenses, and how licenses should be documented in
> +TianoCore projects.
> +
> +# Example Language: BSD+Patent
> +
> +The preferred method to specify a license for TianoCore contributions is to use
> +[SPDX](https://spdx.org/licenses/) identifiers.  The SPDX identifier for the
> +BSD+Patent License is `BSD-2-Clause-Patent`.  The following is example file
> +header content.
> +
> +```
> +
> +Copyright (c) 2019, Intel Corporation.  All rights reserved.
> +
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> +
> +```
> diff --git a/Code-Contributions.mediawiki b/Code-Contributions.mediawiki
> index 1ebd6d7..b5b226c 100644
> --- a/Code-Contributions.mediawiki
> +++ b/Code-Contributions.mediawiki
> @@ -1,6 +1,4 @@
> -Please refer to [https://github.com/tianocore/edk2/raw/master/Contributions.txt Contributions.txt] for more information.
> -
> -Contributions.txt should also be available in the source tree. (Older source releases may not have the file.)
> +Please refer to [https://github.com/tianocore/edk2/blob/master/Readme.md] for more information.
>  
>  See also
>  
> diff --git a/EDK-II.md b/EDK-II.md
> index ee886b9..0f9960b 100644
> --- a/EDK-II.md
> +++ b/EDK-II.md
> @@ -1,6 +1,6 @@
>  # EDK II
>  
> -EDK II is a modern, feature-rich, cross-platform firmware development environment for the UEFI and PI specifications. EDK II is open source, using a [BSD](http://www.opensource.org/licenses/bsd-license.php) license.
> +EDK II is a modern, feature-rich, cross-platform firmware development environment for the UEFI and PI specifications. EDK II is open source, using a [[BSD+Patent|BSD Patent License]].
>  
>  ## Source Repositories
>  
> diff --git a/Edk2-buildtools.mediawiki b/Edk2-buildtools.mediawiki
> index d71d4e2..540c916 100644
> --- a/Edk2-buildtools.mediawiki
> +++ b/Edk2-buildtools.mediawiki
> @@ -165,6 +165,6 @@ Your Feedback is critical to making EDK II a success. Please submit any enhancem
>  
>  Goto  [[edk2-devel]]  to Join the Mailing list
>  
> -License information: [http://www.opensource.org/licenses/bsd-license.php BSD]
> +License information: [[BSD+Patent|BSD Patent License]]
>  
>  Project owner(s):    See: [https://raw.githubusercontent.com/tianocore/edk2/master/Maintainers.txt Maintainers.txt]
> diff --git a/Legalese.md b/Legalese.md
> index eadc859..633dcb7 100644
> --- a/Legalese.md
> +++ b/Legalese.md
> @@ -2,7 +2,8 @@ If you would like to make code contributions to our community, please refer to o
>  
>  ## Licenses for TianoCore Contributions
>  
> -The preferred license for TianoCore is [[BSD-2-Clause|BSD License]]. The TianoCore contributors agreement describes acceptable licenses for community contributions. https://raw.githubusercontent.com/tianocore/edk2/master/MdePkg/Contributions.txt 
> +The preferred license for TianoCore is [[BSD+Patent|BSD Patent License]].  When that is not possible, then contributions using
> +the following licenses can be accepted:
>  
>  * BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause 
>  * BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause 
> @@ -12,8 +13,8 @@ The preferred license for TianoCore is [[BSD-2-Clause|BSD License]]. The TianoCo
>  
>  ## Documenting Licenses in Source Projects
>  
> -The full license should be documented in a LICENSE.TXT file, found in the package directory.
> +The full license should be documented in a LICENSE.TXT file, found in the root of a repository.

Change from LICENSE.TXT to License.txt (which is the correct case of
the actual file)?

Other than that, for the series,
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

Thanks!

>  
> -Example: https://github.com/tianocore/edk2/blob/master/MdeModulePkg/License.txt 
> +Example: https://github.com/tianocore/edk2/blob/master/License.txt
>  
> -Source file headers should contain an abbreviated version of the license, with a link to the full license text. An example is provided in the [EDK II Coding Standards Specification](https://edk2-docs.gitbooks.io/edk-ii-c-coding-standards-specification/content/), Section 5.2.3.4 ("License").
> \ No newline at end of file
> +Source file headers should contain an [SPDX](https://spdx.org/licenses/) identifier of the license. An example is provided on the [[BSD+Patent|BSD Patent License]] page.
> diff --git a/OVMF-FAQ.md b/OVMF-FAQ.md
> index 35e68fb..2e97589 100644
> --- a/OVMF-FAQ.md
> +++ b/OVMF-FAQ.md
> @@ -36,13 +36,8 @@ is built upon the EDK II code base.
>  
>  ### What source code license does OVMF use?
>  
> -OVMF follows the EDK II project in using the open source [BSD
> -license](http://opensource.org/licenses/bsd-license.php).
> -
> -Note: A binary of the [UEFI FAT](edk2-fat-driver "wikilink") driver may
> -be included with OVMF builds. The source code to this driver uses the
> -[BSD license](http://opensource.org/licenses/bsd-license.php) with [an
> -additional term](edk2-fat-driver "wikilink").
> +OVMF follows the EDK II project in using the open source [[BSD+Patent|BSD Patent License]] license.
> +Some OVMF content is convered by additional licenses detailed in [OvmfPkg/License.txt](https://github.com/tianocore/edk2/blob/master/OvmfPkg/License.txt).
>  
>  ### What does OVMF provide?
>  
> @@ -92,7 +87,7 @@ are supported for that release.
>  
>  ### Are only open source virtual machines supported?
>  
> -We have chosen the BSD license to enable easy incorporation of any of
> +We have chosen the BSD+Patent license to enable easy incorporation of any of
>  the piece of our code within nearly any type of product. But, it is
>  likely that the firmware images produced by OvmfPkg under edk2 will only
>  support open source virtual machines.
> diff --git a/_Footer.md b/_Footer.md
> index 7a72f7b..498afdb 100644
> --- a/_Footer.md
> +++ b/_Footer.md
> @@ -1 +1 @@
> -[[Home]] | [[Getting Started with EDK II]] | [[Reporting Issues]] | [[Community Information]] | [[Community Support]] | [[Tasks]] | [[BSD|BSD License]]
> \ No newline at end of file
> +[[Home]] | [[Getting Started with EDK II]] | [[Reporting Issues]] | [[Community Information]] | [[Community Support]] | [[Tasks]] | [[BSD+Patent|BSD Patent License]]
> \ No newline at end of file
> -- 
> 2.21.0.windows.1
>