From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Thu, 18 Apr 2019 02:14:07 -0700 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 45845307E059; Thu, 18 Apr 2019 09:14:06 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-179.rdu2.redhat.com [10.10.120.179]) by smtp.corp.redhat.com (Postfix) with ESMTP id E72785D9CC; Thu, 18 Apr 2019 09:14:04 +0000 (UTC) Subject: Re: [edk2-devel] [WebSite Patch] Change preferred license of EDK II to BSD+Patent To: "Kinney, Michael D" , "devel@edk2.groups.io" Cc: Andrew Fish , Leif Lindholm References: <20190415203805.6932-1-michael.d.kinney@intel.com> <294a7f85-e4ae-c585-5748-f67951bc005d@redhat.com> From: "Laszlo Ersek" Message-ID: Date: Thu, 18 Apr 2019 11:14:03 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 18 Apr 2019 09:14:06 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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 ; >> devel@edk2.groups.io >> Cc: Andrew Fish ; Leif Lindholm >> >> 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 >>> Cc: Laszlo Ersek >>> Cc: Leif Lindholm >>> Signed-off-by: Michael D Kinney >> >>> --- >>> 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: >> {:tar >> get="_blank"} >>> >>> >> >> >> >