[WebSite Patch] Change preferred license of EDK II to BSD+Patent

[WebSite Patch] Change preferred license of EDK II to BSD+Patent

[Michael D Kinney]

https://bugzilla.tianocore.org/show_bug.cgi?id=1656

Change the web page documentation to state that the preferred license
of the EDK II is the BSD+Patent License.

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>
---
 edk2/index.md | 3 +--
 legalese.md   | 3 ++-
 ovmf/index.md | 2 +-
 site/index.md | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/edk2/index.md b/edk2/index.md
index 2596fb3..6c6c6ea 100644
--- a/edk2/index.md
+++ b/edk2/index.md
@@ -10,8 +10,7 @@ EDK II is a modern, feature-rich, cross-platform firmware development
 environment for the UEFI and PI specifications.
 
 #### License information:  
-[BSD](http://www.opensource.org/licenses/bsd-license.php)
-
+[BSD+Patent]((https://opensource.org/licenses/BSDplusPatent)
 
 #### Source repositories:  
 * edk2 main repository - [https://github.com/tianocore/edk2](https://github.com/tianocore/edk2)
diff --git a/legalese.md b/legalese.md
index 9a2c8b2..03965b6 100644
--- a/legalese.md
+++ b/legalese.md
@@ -6,7 +6,8 @@ title: Legal
 
 ## Licenses for TianoCore Contributions
 
-The preferred license for TianoCore is [BSD-2-Clause]({{wiki}}/BSD-License){:target="_blank"}. The [TianoCore contributors agreement](https://raw.githubusercontent.com/tianocore/edk2/master/Contributions.txt){:target="_blank"} describes acceptable licenses for community contributions.
+The preferred license for TianoCore is [BSD+Patent]({{wiki}}/BSD-Plus-Patent-License){:target="_blank"}. When that is not possible, then contributions using
+the following licenses can be accepted:
 * BSD (2-clause): [http://opensource.org/licenses/BSD-2-Clause](https://opensource.org/licenses/BSD-2-Clause){:target="_blank"}
 * BSD (3-clause): [http://opensource.org/licenses/BSD-3-Clause](http://opensource.org/licenses/BSD-3-Clause){:target="_blank"}
 * MIT: [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT){:target="_blank"}
diff --git a/ovmf/index.md b/ovmf/index.md
index 843ad71..97c0cf3 100644
--- a/ovmf/index.md
+++ b/ovmf/index.md
@@ -9,7 +9,7 @@ OVMF is an [EDK II] based project to enable UEFI support for Virtual
 Machines.  OVMF contains a sample UEFI firmware for [QEMU] and [KVM].
 
 License information:
- [BSD](http://www.opensource.org/licenses/bsd-license.php)
+  [BSD+Patent]((https://opensource.org/licenses/BSDplusPatent)
 
 More information:
   [OVMF FAQ]({{wiki}}/OVMF FAQ),
diff --git a/site/index.md b/site/index.md
index 9684422..dd3ffcc 100644
--- a/site/index.md
+++ b/site/index.md
@@ -7,7 +7,7 @@ title: TianoCore web site
 Our website is open source. Let us know if you have site content or
 other website improvements!
 
-License information: [BSD](http://www.opensource.org/licenses/bsd-license.php){:target="_blank"}
+License information: [BSD+Patent]((https://opensource.org/licenses/BSDplusPatent){:target="_blank"}
 
 Source repository: <https://github.com/tianocore/tianocore.github.io>{:target="_blank"}
 
-- 
2.21.0.windows.1

Re: [WebSite Patch] Change preferred license of EDK II to BSD+Patent

[Laszlo Ersek]

Hi Mike,

On 04/15/19 22:38, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1656
> 
> Change the web page documentation to state that the preferred license
> of the EDK II is the BSD+Patent License.
> 
> 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>
> ---
>  edk2/index.md | 3 +--
>  legalese.md   | 3 ++-
>  ovmf/index.md | 2 +-
>  site/index.md | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)

can you please remind me where I can clone the website repo, and at what
*individual* URLs I can look at these four rendered pages? (Pre-patch
state is fine too.)

Thanks!
Laszlo

> diff --git a/edk2/index.md b/edk2/index.md
> index 2596fb3..6c6c6ea 100644
> --- a/edk2/index.md
> +++ b/edk2/index.md
> @@ -10,8 +10,7 @@ EDK II is a modern, feature-rich, cross-platform firmware development
>  environment for the UEFI and PI specifications.
>  
>  #### License information:  
> -[BSD](http://www.opensource.org/licenses/bsd-license.php)
> -
> +[BSD+Patent]((https://opensource.org/licenses/BSDplusPatent)
>  
>  #### Source repositories:  
>  * edk2 main repository - [https://github.com/tianocore/edk2](https://github.com/tianocore/edk2)
> diff --git a/legalese.md b/legalese.md
> index 9a2c8b2..03965b6 100644
> --- a/legalese.md
> +++ b/legalese.md
> @@ -6,7 +6,8 @@ title: Legal
>  
>  ## Licenses for TianoCore Contributions
>  
> -The preferred license for TianoCore is [BSD-2-Clause]({{wiki}}/BSD-License){:target="_blank"}. The [TianoCore contributors agreement](https://raw.githubusercontent.com/tianocore/edk2/master/Contributions.txt){:target="_blank"} describes acceptable licenses for community contributions.
> +The preferred license for TianoCore is [BSD+Patent]({{wiki}}/BSD-Plus-Patent-License){:target="_blank"}. When that is not possible, then contributions using
> +the following licenses can be accepted:
>  * BSD (2-clause): [http://opensource.org/licenses/BSD-2-Clause](https://opensource.org/licenses/BSD-2-Clause){:target="_blank"}
>  * BSD (3-clause): [http://opensource.org/licenses/BSD-3-Clause](http://opensource.org/licenses/BSD-3-Clause){:target="_blank"}
>  * MIT: [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT){:target="_blank"}
> diff --git a/ovmf/index.md b/ovmf/index.md
> index 843ad71..97c0cf3 100644
> --- a/ovmf/index.md
> +++ b/ovmf/index.md
> @@ -9,7 +9,7 @@ OVMF is an [EDK II] based project to enable UEFI support for Virtual
>  Machines.  OVMF contains a sample UEFI firmware for [QEMU] and [KVM].
>  
>  License information:
> - [BSD](http://www.opensource.org/licenses/bsd-license.php)
> +  [BSD+Patent]((https://opensource.org/licenses/BSDplusPatent)
>  
>  More information:
>    [OVMF FAQ]({{wiki}}/OVMF FAQ),
> diff --git a/site/index.md b/site/index.md
> index 9684422..dd3ffcc 100644
> --- a/site/index.md
> +++ b/site/index.md
> @@ -7,7 +7,7 @@ title: TianoCore web site
>  Our website is open source. Let us know if you have site content or
>  other website improvements!
>  
> -License information: [BSD](http://www.opensource.org/licenses/bsd-license.php){:target="_blank"}
> +License information: [BSD+Patent]((https://opensource.org/licenses/BSDplusPatent){:target="_blank"}
>  
>  Source repository: <https://github.com/tianocore/tianocore.github.io>{:target="_blank"}
>  
> 

Re: [edk2-devel] [WebSite Patch] Change preferred license of EDK II to BSD+Patent

[Michael D Kinney]

Laszlo,

I am still working on how to pre-view these changes as they
would appear on the website once checked in.

There are 4 files patched.  Only the following one is 
accessible from GitHub pages.

	https://www.tianocore.org/legalese.html

The other three files appear to be old information that
needs to be deleted.  The links for these details now point
to a wiki page instead of a web site page.

	> >  edk2/index.md | 3 +--
	> >  ovmf/index.md | 2 +-
	> >  site/index.md | 2 +-

Mike

> -----Original Message-----
> From: devel@edk2.groups.io
> [mailto:devel@edk2.groups.io] On Behalf Of Laszlo Ersek
> Sent: Tuesday, April 16, 2019 5:47 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com>;
> devel@edk2.groups.io
> Cc: Andrew Fish <afish@apple.com>; Leif Lindholm
> <leif.lindholm@linaro.org>
> Subject: Re: [edk2-devel] [WebSite Patch] Change
> preferred license of EDK II to BSD+Patent
> 
> Hi Mike,
> 
> On 04/15/19 22:38, Michael D Kinney wrote:
> > https://bugzilla.tianocore.org/show_bug.cgi?id=1656
> >
> > Change the web page documentation to state that the
> preferred license
> > of the EDK II is the BSD+Patent License.
> >
> > 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>
> > ---
> >  edk2/index.md | 3 +--
> >  legalese.md   | 3 ++-
> >  ovmf/index.md | 2 +-
> >  site/index.md | 2 +-
> >  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> can you please remind me where I can clone the website
> repo, and at what
> *individual* URLs I can look at these four rendered
> pages? (Pre-patch
> state is fine too.)
> 
> Thanks!
> Laszlo
> 
> > diff --git a/edk2/index.md b/edk2/index.md
> > index 2596fb3..6c6c6ea 100644
> > --- a/edk2/index.md
> > +++ b/edk2/index.md
> > @@ -10,8 +10,7 @@ EDK II is a modern, feature-rich,
> cross-platform firmware development
> >  environment for the UEFI and PI specifications.
> >
> >  #### License information:
> > -[BSD](http://www.opensource.org/licenses/bsd-
> license.php)
> > -
> >
> +[BSD+Patent]((https://opensource.org/licenses/BSDplusP
> atent)
> >
> >  #### Source repositories:
> >  * edk2 main repository -
> [https://github.com/tianocore/edk2](https://github.com/
> tianocore/edk2)
> > diff --git a/legalese.md b/legalese.md
> > index 9a2c8b2..03965b6 100644
> > --- a/legalese.md
> > +++ b/legalese.md
> > @@ -6,7 +6,8 @@ title: Legal
> >
> >  ## Licenses for TianoCore Contributions
> >
> > -The preferred license for TianoCore is [BSD-2-
> Clause]({{wiki}}/BSD-License){:target="_blank"}. The
> [TianoCore contributors
> agreement](https://raw.githubusercontent.com/tianocore/
> edk2/master/Contributions.txt){:target="_blank"}
> describes acceptable licenses for community
> contributions.
> > +The preferred license for TianoCore is
> [BSD+Patent]({{wiki}}/BSD-Plus-Patent-
> License){:target="_blank"}. When that is not possible,
> then contributions using
> > +the following licenses can be accepted:
> >  * BSD (2-clause):
> [http://opensource.org/licenses/BSD-2-
> Clause](https://opensource.org/licenses/BSD-2-
> Clause){:target="_blank"}
> >  * BSD (3-clause):
> [http://opensource.org/licenses/BSD-3-
> Clause](http://opensource.org/licenses/BSD-3-
> Clause){:target="_blank"}
> >  * MIT:
> [http://opensource.org/licenses/MIT](http://opensource.
> org/licenses/MIT){:target="_blank"}
> > diff --git a/ovmf/index.md b/ovmf/index.md
> > index 843ad71..97c0cf3 100644
> > --- a/ovmf/index.md
> > +++ b/ovmf/index.md
> > @@ -9,7 +9,7 @@ OVMF is an [EDK II] based project to
> enable UEFI support for Virtual
> >  Machines.  OVMF contains a sample UEFI firmware for
> [QEMU] and [KVM].
> >
> >  License information:
> > - [BSD](http://www.opensource.org/licenses/bsd-
> license.php)
> > +
> [BSD+Patent]((https://opensource.org/licenses/BSDplusPa
> tent)
> >
> >  More information:
> >    [OVMF FAQ]({{wiki}}/OVMF FAQ),
> > diff --git a/site/index.md b/site/index.md
> > index 9684422..dd3ffcc 100644
> > --- a/site/index.md
> > +++ b/site/index.md
> > @@ -7,7 +7,7 @@ title: TianoCore web site
> >  Our website is open source. Let us know if you have
> site content or
> >  other website improvements!
> >
> > -License information:
> [BSD](http://www.opensource.org/licenses/bsd-
> license.php){:target="_blank"}
> > +License information:
> [BSD+Patent]((https://opensource.org/licenses/BSDplusPa
> tent){:target="_blank"}
> >
> >  Source repository:
> <https://github.com/tianocore/tianocore.github.io>{:tar
> get="_blank"}
> >
> >
> 
> 
> 

Re: [edk2-devel] [WebSite Patch] Change preferred license of EDK II to BSD+Patent

[Laszlo Ersek]

On 04/18/19 05:31, Kinney, Michael D wrote:
> Laszlo,
> 
> I am still working on how to pre-view these changes as they
> would appear on the website once checked in.

That's OK -- in this case I'm fine if I can only look at the pre-patch
rendering. But those rendered pages, I would like to see.

> There are 4 files patched.  Only the following one is 
> accessible from GitHub pages.
> 
> 	https://www.tianocore.org/legalese.html
> 
> The other three files appear to be old information that
> needs to be deleted.  The links for these details now point
> to a wiki page instead of a web site page.
> 
> 	> >  edk2/index.md | 3 +--
> 	> >  ovmf/index.md | 2 +-
> 	> >  site/index.md | 2 +-

Yes, this was my experience exactly -- from the filenames in the patch,
I tried to construct the URLs manually, and all except one redirected me
to the wiki.

So we're updating dead pages too, in this patch. Should we replace those
hunks with the removals of the dead pages instad? (I presume the dead
pages do not participate in the redirection actions.)

Thanks
Laszlo

>> -----Original Message-----
>> From: devel@edk2.groups.io
>> [mailto:devel@edk2.groups.io] On Behalf Of Laszlo Ersek
>> Sent: Tuesday, April 16, 2019 5:47 AM
>> To: Kinney, Michael D <michael.d.kinney@intel.com>;
>> devel@edk2.groups.io
>> Cc: Andrew Fish <afish@apple.com>; Leif Lindholm
>> <leif.lindholm@linaro.org>
>> Subject: Re: [edk2-devel] [WebSite Patch] Change
>> preferred license of EDK II to BSD+Patent
>>
>> Hi Mike,
>>
>> On 04/15/19 22:38, Michael D Kinney wrote:
>>> https://bugzilla.tianocore.org/show_bug.cgi?id=1656
>>>
>>> Change the web page documentation to state that the
>> preferred license
>>> of the EDK II is the BSD+Patent License.
>>>
>>> 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>
>>> ---
>>>  edk2/index.md | 3 +--
>>>  legalese.md   | 3 ++-
>>>  ovmf/index.md | 2 +-
>>>  site/index.md | 2 +-
>>>  4 files changed, 5 insertions(+), 5 deletions(-)
>>
>> can you please remind me where I can clone the website
>> repo, and at what
>> *individual* URLs I can look at these four rendered
>> pages? (Pre-patch
>> state is fine too.)
>>
>> Thanks!
>> Laszlo
>>
>>> diff --git a/edk2/index.md b/edk2/index.md
>>> index 2596fb3..6c6c6ea 100644
>>> --- a/edk2/index.md
>>> +++ b/edk2/index.md
>>> @@ -10,8 +10,7 @@ EDK II is a modern, feature-rich,
>> cross-platform firmware development
>>>  environment for the UEFI and PI specifications.
>>>
>>>  #### License information:
>>> -[BSD](http://www.opensource.org/licenses/bsd-
>> license.php)
>>> -
>>>
>> +[BSD+Patent]((https://opensource.org/licenses/BSDplusP
>> atent)
>>>
>>>  #### Source repositories:
>>>  * edk2 main repository -
>> [https://github.com/tianocore/edk2](https://github.com/
>> tianocore/edk2)
>>> diff --git a/legalese.md b/legalese.md
>>> index 9a2c8b2..03965b6 100644
>>> --- a/legalese.md
>>> +++ b/legalese.md
>>> @@ -6,7 +6,8 @@ title: Legal
>>>
>>>  ## Licenses for TianoCore Contributions
>>>
>>> -The preferred license for TianoCore is [BSD-2-
>> Clause]({{wiki}}/BSD-License){:target="_blank"}. The
>> [TianoCore contributors
>> agreement](https://raw.githubusercontent.com/tianocore/
>> edk2/master/Contributions.txt){:target="_blank"}
>> describes acceptable licenses for community
>> contributions.
>>> +The preferred license for TianoCore is
>> [BSD+Patent]({{wiki}}/BSD-Plus-Patent-
>> License){:target="_blank"}. When that is not possible,
>> then contributions using
>>> +the following licenses can be accepted:
>>>  * BSD (2-clause):
>> [http://opensource.org/licenses/BSD-2-
>> Clause](https://opensource.org/licenses/BSD-2-
>> Clause){:target="_blank"}
>>>  * BSD (3-clause):
>> [http://opensource.org/licenses/BSD-3-
>> Clause](http://opensource.org/licenses/BSD-3-
>> Clause){:target="_blank"}
>>>  * MIT:
>> [http://opensource.org/licenses/MIT](http://opensource.
>> org/licenses/MIT){:target="_blank"}
>>> diff --git a/ovmf/index.md b/ovmf/index.md
>>> index 843ad71..97c0cf3 100644
>>> --- a/ovmf/index.md
>>> +++ b/ovmf/index.md
>>> @@ -9,7 +9,7 @@ OVMF is an [EDK II] based project to
>> enable UEFI support for Virtual
>>>  Machines.  OVMF contains a sample UEFI firmware for
>> [QEMU] and [KVM].
>>>
>>>  License information:
>>> - [BSD](http://www.opensource.org/licenses/bsd-
>> license.php)
>>> +
>> [BSD+Patent]((https://opensource.org/licenses/BSDplusPa
>> tent)
>>>
>>>  More information:
>>>    [OVMF FAQ]({{wiki}}/OVMF FAQ),
>>> diff --git a/site/index.md b/site/index.md
>>> index 9684422..dd3ffcc 100644
>>> --- a/site/index.md
>>> +++ b/site/index.md
>>> @@ -7,7 +7,7 @@ title: TianoCore web site
>>>  Our website is open source. Let us know if you have
>> site content or
>>>  other website improvements!
>>>
>>> -License information:
>> [BSD](http://www.opensource.org/licenses/bsd-
>> license.php){:target="_blank"}
>>> +License information:
>> [BSD+Patent]((https://opensource.org/licenses/BSDplusPa
>> tent){:target="_blank"}
>>>
>>>  Source repository:
>> <https://github.com/tianocore/tianocore.github.io>{:tar
>> get="_blank"}
>>>
>>>
>>
>>
>> 
> 

Re: [edk2-devel] [WebSite Patch] Change preferred license of EDK II to BSD+Patent

[Michael D Kinney]

> -----Original Message-----
> From: devel@edk2.groups.io
> [mailto:devel@edk2.groups.io] On Behalf Of Laszlo Ersek
> Sent: Thursday, April 18, 2019 2:14 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com>;
> devel@edk2.groups.io
> Cc: Andrew Fish <afish@apple.com>; Leif Lindholm
> <leif.lindholm@linaro.org>
> Subject: Re: [edk2-devel] [WebSite Patch] Change
> preferred license of EDK II to BSD+Patent
> 
> On 04/18/19 05:31, Kinney, Michael D wrote:
> > Laszlo,
> >
> > I am still working on how to pre-view these changes
> as they
> > would appear on the website once checked in.
> 
> That's OK -- in this case I'm fine if I can only look
> at the pre-patch
> rendering. But those rendered pages, I would like to
> see.
> 
> > There are 4 files patched.  Only the following one is
> > accessible from GitHub pages.
> >
> > 	https://www.tianocore.org/legalese.html
> >
> > The other three files appear to be old information
> that
> > needs to be deleted.  The links for these details now
> point
> > to a wiki page instead of a web site page.
> >
> > 	> >  edk2/index.md | 3 +--
> > 	> >  ovmf/index.md | 2 +-
> > 	> >  site/index.md | 2 +-
> 
> Yes, this was my experience exactly -- from the
> filenames in the patch,
> I tried to construct the URLs manually, and all except
> one redirected me
> to the wiki.
> 
> So we're updating dead pages too, in this patch. Should
> we replace those
> hunks with the removals of the dead pages instad? (I
> presume the dead
> pages do not participate in the redirection actions.)

I did the patch based on the content from the git repo
for the web site.  I did not realize that three of them
appear to be unreachable content.

I would prefer to have this patch series go through, and I
will open a new BZ to remove dead pages.

> 
> Thanks
> Laszlo
> 
> >> -----Original Message-----
> >> From: devel@edk2.groups.io
> >> [mailto:devel@edk2.groups.io] On Behalf Of Laszlo
> Ersek
> >> Sent: Tuesday, April 16, 2019 5:47 AM
> >> To: Kinney, Michael D <michael.d.kinney@intel.com>;
> >> devel@edk2.groups.io
> >> Cc: Andrew Fish <afish@apple.com>; Leif Lindholm
> >> <leif.lindholm@linaro.org>
> >> Subject: Re: [edk2-devel] [WebSite Patch] Change
> >> preferred license of EDK II to BSD+Patent
> >>
> >> Hi Mike,
> >>
> >> On 04/15/19 22:38, Michael D Kinney wrote:
> >>> https://bugzilla.tianocore.org/show_bug.cgi?id=1656
> >>>
> >>> Change the web page documentation to state that the
> >> preferred license
> >>> of the EDK II is the BSD+Patent License.
> >>>
> >>> 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>
> >>> ---
> >>>  edk2/index.md | 3 +--
> >>>  legalese.md   | 3 ++-
> >>>  ovmf/index.md | 2 +-
> >>>  site/index.md | 2 +-
> >>>  4 files changed, 5 insertions(+), 5 deletions(-)
> >>
> >> can you please remind me where I can clone the
> website
> >> repo, and at what
> >> *individual* URLs I can look at these four rendered
> >> pages? (Pre-patch
> >> state is fine too.)
> >>
> >> Thanks!
> >> Laszlo
> >>
> >>> diff --git a/edk2/index.md b/edk2/index.md
> >>> index 2596fb3..6c6c6ea 100644
> >>> --- a/edk2/index.md
> >>> +++ b/edk2/index.md
> >>> @@ -10,8 +10,7 @@ EDK II is a modern, feature-rich,
> >> cross-platform firmware development
> >>>  environment for the UEFI and PI specifications.
> >>>
> >>>  #### License information:
> >>> -[BSD](http://www.opensource.org/licenses/bsd-
> >> license.php)
> >>> -
> >>>
> >>
> +[BSD+Patent]((https://opensource.org/licenses/BSDplusP
> >> atent)
> >>>
> >>>  #### Source repositories:
> >>>  * edk2 main repository -
> >>
> [https://github.com/tianocore/edk2](https://github.com/
> >> tianocore/edk2)
> >>> diff --git a/legalese.md b/legalese.md
> >>> index 9a2c8b2..03965b6 100644
> >>> --- a/legalese.md
> >>> +++ b/legalese.md
> >>> @@ -6,7 +6,8 @@ title: Legal
> >>>
> >>>  ## Licenses for TianoCore Contributions
> >>>
> >>> -The preferred license for TianoCore is [BSD-2-
> >> Clause]({{wiki}}/BSD-License){:target="_blank"}. The
> >> [TianoCore contributors
> >>
> agreement](https://raw.githubusercontent.com/tianocore/
> >> edk2/master/Contributions.txt){:target="_blank"}
> >> describes acceptable licenses for community
> >> contributions.
> >>> +The preferred license for TianoCore is
> >> [BSD+Patent]({{wiki}}/BSD-Plus-Patent-
> >> License){:target="_blank"}. When that is not
> possible,
> >> then contributions using
> >>> +the following licenses can be accepted:
> >>>  * BSD (2-clause):
> >> [http://opensource.org/licenses/BSD-2-
> >> Clause](https://opensource.org/licenses/BSD-2-
> >> Clause){:target="_blank"}
> >>>  * BSD (3-clause):
> >> [http://opensource.org/licenses/BSD-3-
> >> Clause](http://opensource.org/licenses/BSD-3-
> >> Clause){:target="_blank"}
> >>>  * MIT:
> >>
> [http://opensource.org/licenses/MIT](http://opensource.
> >> org/licenses/MIT){:target="_blank"}
> >>> diff --git a/ovmf/index.md b/ovmf/index.md
> >>> index 843ad71..97c0cf3 100644
> >>> --- a/ovmf/index.md
> >>> +++ b/ovmf/index.md
> >>> @@ -9,7 +9,7 @@ OVMF is an [EDK II] based project
> to
> >> enable UEFI support for Virtual
> >>>  Machines.  OVMF contains a sample UEFI firmware
> for
> >> [QEMU] and [KVM].
> >>>
> >>>  License information:
> >>> - [BSD](http://www.opensource.org/licenses/bsd-
> >> license.php)
> >>> +
> >>
> [BSD+Patent]((https://opensource.org/licenses/BSDplusPa
> >> tent)
> >>>
> >>>  More information:
> >>>    [OVMF FAQ]({{wiki}}/OVMF FAQ),
> >>> diff --git a/site/index.md b/site/index.md
> >>> index 9684422..dd3ffcc 100644
> >>> --- a/site/index.md
> >>> +++ b/site/index.md
> >>> @@ -7,7 +7,7 @@ title: TianoCore web site
> >>>  Our website is open source. Let us know if you
> have
> >> site content or
> >>>  other website improvements!
> >>>
> >>> -License information:
> >> [BSD](http://www.opensource.org/licenses/bsd-
> >> license.php){:target="_blank"}
> >>> +License information:
> >>
> [BSD+Patent]((https://opensource.org/licenses/BSDplusPa
> >> tent){:target="_blank"}
> >>>
> >>>  Source repository:
> >>
> <https://github.com/tianocore/tianocore.github.io>{:tar
> >> get="_blank"}
> >>>
> >>>
> >>
> >>
> >>
> >
> 
> 
> 

Re: [edk2-devel] [WebSite Patch] Change preferred license of EDK II to BSD+Patent

[Laszlo Ersek]

On 04/18/19 22:27, Kinney, Michael D wrote:
> 
> 
>> -----Original Message-----
>> From: devel@edk2.groups.io
>> [mailto:devel@edk2.groups.io] On Behalf Of Laszlo Ersek
>> Sent: Thursday, April 18, 2019 2:14 AM
>> To: Kinney, Michael D <michael.d.kinney@intel.com>;
>> devel@edk2.groups.io
>> Cc: Andrew Fish <afish@apple.com>; Leif Lindholm
>> <leif.lindholm@linaro.org>
>> Subject: Re: [edk2-devel] [WebSite Patch] Change
>> preferred license of EDK II to BSD+Patent
>>
>> On 04/18/19 05:31, Kinney, Michael D wrote:
>>> Laszlo,
>>>
>>> I am still working on how to pre-view these changes
>> as they
>>> would appear on the website once checked in.
>>
>> That's OK -- in this case I'm fine if I can only look
>> at the pre-patch
>> rendering. But those rendered pages, I would like to
>> see.
>>
>>> There are 4 files patched.  Only the following one is
>>> accessible from GitHub pages.
>>>
>>> 	https://www.tianocore.org/legalese.html
>>>
>>> The other three files appear to be old information
>> that
>>> needs to be deleted.  The links for these details now
>> point
>>> to a wiki page instead of a web site page.
>>>
>>> 	> >  edk2/index.md | 3 +--
>>> 	> >  ovmf/index.md | 2 +-
>>> 	> >  site/index.md | 2 +-
>>
>> Yes, this was my experience exactly -- from the
>> filenames in the patch,
>> I tried to construct the URLs manually, and all except
>> one redirected me
>> to the wiki.
>>
>> So we're updating dead pages too, in this patch. Should
>> we replace those
>> hunks with the removals of the dead pages instad? (I
>> presume the dead
>> pages do not participate in the redirection actions.)
> 
> I did the patch based on the content from the git repo
> for the web site.  I did not realize that three of them
> appear to be unreachable content.
> 
> I would prefer to have this patch series go through, and I
> will open a new BZ to remove dead pages.

OK, I'll review the patch right under the thread starter -- the context
has been garbled here, down-thread, by now.

Thanks
Laszlo

Re: [edk2-devel] [WebSite Patch] Change preferred license of EDK II to BSD+Patent

[Laszlo Ersek]

On 04/15/19 22:38, Michael D Kinney wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=1656
> 
> Change the web page documentation to state that the preferred license
> of the EDK II is the BSD+Patent License.
> 
> 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>
> ---
>  edk2/index.md | 3 +--
>  legalese.md   | 3 ++-
>  ovmf/index.md | 2 +-
>  site/index.md | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/edk2/index.md b/edk2/index.md
> index 2596fb3..6c6c6ea 100644
> --- a/edk2/index.md
> +++ b/edk2/index.md
> @@ -10,8 +10,7 @@ EDK II is a modern, feature-rich, cross-platform firmware development
>  environment for the UEFI and PI specifications.
>  
>  #### License information:  
> -[BSD](http://www.opensource.org/licenses/bsd-license.php)
> -
> +[BSD+Patent]((https://opensource.org/licenses/BSDplusPatent)
>  
>  #### Source repositories:  
>  * edk2 main repository - [https://github.com/tianocore/edk2](https://github.com/tianocore/edk2)
> diff --git a/legalese.md b/legalese.md
> index 9a2c8b2..03965b6 100644
> --- a/legalese.md
> +++ b/legalese.md
> @@ -6,7 +6,8 @@ title: Legal
>  
>  ## Licenses for TianoCore Contributions
>  
> -The preferred license for TianoCore is [BSD-2-Clause]({{wiki}}/BSD-License){:target="_blank"}. The [TianoCore contributors agreement](https://raw.githubusercontent.com/tianocore/edk2/master/Contributions.txt){:target="_blank"} describes acceptable licenses for community contributions.
> +The preferred license for TianoCore is [BSD+Patent]({{wiki}}/BSD-Plus-Patent-License){:target="_blank"}. When that is not possible, then contributions using
> +the following licenses can be accepted:
>  * BSD (2-clause): [http://opensource.org/licenses/BSD-2-Clause](https://opensource.org/licenses/BSD-2-Clause){:target="_blank"}
>  * BSD (3-clause): [http://opensource.org/licenses/BSD-3-Clause](http://opensource.org/licenses/BSD-3-Clause){:target="_blank"}
>  * MIT: [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT){:target="_blank"}

I'm fine with the patch as-is, hence:

Reviewed-by: Laszlo Ersek <lersek@redhat.com>


I have one suggestion (feel free to incorporate it (no need to repost)
or to ignore it):

Rather than fully remove the reference to the "TianoCore contributors
agreement" as the document that lists further acceptable licenses, we
could preserve the link, just update it to the edk2 *code* repository's
"Readme.md" document. The URL would be:

https://github.com/tianocore/edk2/#code-contributions


Hmmm... Actually, "Readme.md" already reachable from the website. At the
bottom of the subject page, we have "Code Contributions", which points to

https://github.com/tianocore/tianocore.github.io/wiki/Code-Contributions

and that one references

https://github.com/tianocore/edk2/blob/master/Readme.md

which is the same Readme.md document I just recommended. OK then. :)

Thanks
Laszlo

> diff --git a/ovmf/index.md b/ovmf/index.md
> index 843ad71..97c0cf3 100644
> --- a/ovmf/index.md
> +++ b/ovmf/index.md
> @@ -9,7 +9,7 @@ OVMF is an [EDK II] based project to enable UEFI support for Virtual
>  Machines.  OVMF contains a sample UEFI firmware for [QEMU] and [KVM].
>  
>  License information:
> - [BSD](http://www.opensource.org/licenses/bsd-license.php)
> +  [BSD+Patent]((https://opensource.org/licenses/BSDplusPatent)
>  
>  More information:
>    [OVMF FAQ]({{wiki}}/OVMF FAQ),
> diff --git a/site/index.md b/site/index.md
> index 9684422..dd3ffcc 100644
> --- a/site/index.md
> +++ b/site/index.md
> @@ -7,7 +7,7 @@ title: TianoCore web site
>  Our website is open source. Let us know if you have site content or
>  other website improvements!
>  
> -License information: [BSD](http://www.opensource.org/licenses/bsd-license.php){:target="_blank"}
> +License information: [BSD+Patent]((https://opensource.org/licenses/BSDplusPatent){:target="_blank"}
>  
>  Source repository: <https://github.com/tianocore/tianocore.github.io>{:target="_blank"}
>  
>