From fad213a3db737a5601869d155abe499a7df66715 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Mon, 25 Aug 2014 23:10:18 +0000 Subject: 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 Reviewed-by: Mark Doran git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15892 6f19259b-4bc3-4df7-8a09-765794883524 --- IntelFrameworkModulePkg/Contributions.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'IntelFrameworkModulePkg') diff --git a/IntelFrameworkModulePkg/Contributions.txt b/IntelFrameworkModulePkg/Contributions.txt index 667ca1035c..5dd8a47bad 100644 --- a/IntelFrameworkModulePkg/Contributions.txt +++ b/IntelFrameworkModulePkg/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 = -- cgit v1.2.3