summaryrefslogtreecommitdiffstats
path: root/AppPkg
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2014-08-25 23:10:18 +0000
committerjljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>2014-08-25 23:10:18 +0000
commitfad213a3db737a5601869d155abe499a7df66715 (patch)
treeac9e6c767414eede77b5cd3f956ff0b8ac316415 /AppPkg
parent460f337bc035b61dec3819f4b62a7181e3631b3f (diff)
downloadedk2-fad213a3db737a5601869d155abe499a7df66715.tar.gz
edk2-fad213a3db737a5601869d155abe499a7df66715.tar.bz2
edk2-fad213a3db737a5601869d155abe499a7df66715.zip
EDK II Contributions.txt: Note acceptable contribution licenses
We strongly prefer that contribtions be offered using the same license as the project/module. But, we should document other acceptable licenses for contributions. This will allow package owners to more easily know if they can accept a contribution under a different source license. NOTE: This does not modify the wording of the "TianoCore Contribution Agreement 1.0" section Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Mark Doran <mark.doran@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15892 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'AppPkg')
-rw-r--r--AppPkg/Contributions.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/AppPkg/Contributions.txt b/AppPkg/Contributions.txt
index 667ca1035c..5dd8a47bad 100644
--- a/AppPkg/Contributions.txt
+++ b/AppPkg/Contributions.txt
@@ -19,6 +19,20 @@ To make a contribution to a TianoCore project, follow these steps.
that the project documents on its web page. If the process is
not documented, then submit the code on development email list
for the project.
+5. It is preferred that contributions are submitted using the same
+ copyright license as the base project. 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
+ * MIT: http://opensource.org/licenses/MIT
+ * Python-2.0: http://opensource.org/licenses/Python-2.0
+ * Zlib: http://opensource.org/licenses/Zlib
+
+ Contributions of code put into the public domain can also be
+ accepted.
+
+ Contributions using other licenses might be accepted, but further
+ review will be required.
=======================================
= Change Description / Commit Message =