From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: michael.d.kinney@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Mon, 15 Apr 2019 13:38:10 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Apr 2019 13:38:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,355,1549958400"; d="scan'208";a="164984527" Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.98.74]) by fmsmga001.fm.intel.com with ESMTP; 15 Apr 2019 13:38:07 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Andrew Fish , Laszlo Ersek , Leif Lindholm Subject: [WebSite Patch] Change preferred license of EDK II to BSD+Patent Date: Mon, 15 Apr 2019 13:38:05 -0700 Message-Id: <20190415203805.6932-1-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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(-) 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: {:target="_blank"} -- 2.21.0.windows.1