[edk2,edk2-platforms] Contributions.txt: update to latest version from EDK2

Message ID 20170821143002.17076-1-leif.lindholm@linaro.org
State New
Headers show

Commit Message

Leif Lindholm Aug. 21, 2017, 2:30 p.m.
Update to require TianoCore Contribution Agreement 1.1,
taken from commmit
fc9f971e9745 ("edk2: Fix typo in Contributions.txt")

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

---
 Contributions.txt | 93 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 77 insertions(+), 16 deletions(-)

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Kinney, Michael D Aug. 22, 2017, 11:33 p.m. | #1
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>


Mike

> -----Original Message-----

> From: Leif Lindholm [mailto:leif.lindholm@linaro.org]

> Sent: Monday, August 21, 2017 7:30 AM

> To: edk2-devel@lists.01.org

> Cc: Kinney, Michael D <michael.d.kinney@intel.com>

> Subject: [PATCH edk2-platforms] Contributions.txt: update to

> latest version from EDK2

> 

> Update to require TianoCore Contribution Agreement 1.1,

> taken from commmit

> fc9f971e9745 ("edk2: Fix typo in Contributions.txt")

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---

>  Contributions.txt | 93

> +++++++++++++++++++++++++++++++++++++++++++++----------

>  1 file changed, 77 insertions(+), 16 deletions(-)

> 

> diff --git a/Contributions.txt b/Contributions.txt

> index b6c15df2d..f34626912 100644

> --- a/Contributions.txt

> +++ b/Contributions.txt

> @@ -11,7 +11,7 @@ To make a contribution to a TianoCore project,

> follow these steps.

>     contribution is made under the terms of the specified

>     contribution agreement.  Your "Contributed-under" message

>     must include the name of contribution agreement and version.

> -   For example: Contributed-under: TianoCore Contribution

> Agreement 1.0

> +   For example: Contributed-under: TianoCore Contribution

> Agreement 1.1

>     The "TianoCore Contribution Agreement" is included below in

>     this document.

>  4. Submit your code to the TianoCore project using the process

> @@ -26,7 +26,10 @@ To make a contribution to a TianoCore

> project, follow these steps.

>     * MIT: http://opensource.org/licenses/MIT

>     * Python-2.0: http://opensource.org/licenses/Python-2.0

>     * Zlib: http://opensource.org/licenses/Zlib

> -   For documentation:

> https://www.freebsd.org/copyright/freebsd-doc-license.html

> +

> +   For documentation:

> +   * FreeBSD Documentation License

> +     https://www.freebsd.org/copyright/freebsd-doc-license.html

> 

>     Contributions of code put into the public domain can also be

>     accepted.

> @@ -34,37 +37,94 @@ To make a contribution to a TianoCore

> project, follow these steps.

>     Contributions using other licenses might be accepted, but

> further

>     review will be required.

> 

> +=====================================================

> += Change Description / Commit Message / Patch Email =

> +=====================================================

> +

> +Your change description should use the standard format for a

> +commit message, and must include your "Signed-off-by" signature

> +and the "Contributed-under" message.

> +

> +== Sample Change Description / Commit Message =

> +

> +=== Start of sample patch email message ===

> +

> +From: Contributor Name <contributor@example.com>

> +Subject: [Repository/Branch PATCH] Module: Brief-single-line-

> summary

> +

> +Full-commit-message

> +

> +Contributed-under: TianoCore Contribution Agreement 1.1

> +Signed-off-by: Contributor Name <contributor@example.com>

> +---

> +

> +An extra message for the patch email which will not be

> considered part

> +of the commit message can be added here.

> +

> +Patch content inline or attached

> +

> +=== End of sample patch email message ===

> +

> +=== Notes for sample patch email ===

> +

> +* The first line of commit message is taken from the email's

> subject

> +  line following [Repository/Branch PATCH]. The remaining

> portion of the

> +  commit message is the email's content until the '---' line.

> +* git format-patch is one way to create this format

> +

> +=== Definitions for sample patch email ===

> +

> +* "Repository" is the identifier of the repository the patch

> applies.

> +  This identifier should only be provided for repositories

> other than

> +  'edk2'. For example 'edk2-BuildSpecification' or 'staging'.

> +* "Branch" is the identifier of the branch the patch applies.

> This

> +  identifier should only be provided for branches other than

> 'edk2/master'.

> +  For example 'edk2/UDK2015', 'edk2-

> BuildSpecification/release/1.27', or

> +  'staging/edk2-test'.

> +* "Module" is a short identifier for the affected code or

> documentation. For

> +  example 'MdePkg', 'MdeModulePkg/UsbBusDxe', 'Introduction',

> or

> +  'EDK II INF File Format'.

> +* "Brief-single-line-summary" is a short summary of the change.

> +* The entire first line should be less than ~70 characters.

> +* "Full-commit-message" a verbose multiple line comment

> describing

> +  the change.  Each line should be less than ~70 characters.

> +* "Contributed-under" explicitly states that the contribution

> is

> +  made under the terms of the contribution agreement. This

> +  agreement is included below in this document.

> +* "Signed-off-by" is the contributor's signature identifying

> them

> +  by their real/legal name and their email address.

> +

>  ========================================

>  = TianoCore Contribution Agreement 1.1 =

>  ========================================

> 

> -INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE,

> DOCUMENTATION ("DOCUMENTATION"),

> -INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE

> OPEN SOURCE

> -PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS

> GOVERNED BY THE

> -TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL

> AND/OR THE

> -TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED

> OR

> -REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE

> OF THE

> -CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND

> CONDITIONS

> -OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR

> REFERENCED

> -BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS

> +INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE,

> DOCUMENTATION

> +("DOCUMENTATION"), INFORMATION AND/OR OTHER MATERIALS FOR USE

> IN THE

> +TIANOCORE OPEN SOURCE PROJECT (COLLECTIVELY "CONTENT"). USE OF

> THE CONTENT

> +IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT

> BETWEEN YOU AND

> +INTEL AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR

> NOTICES

> +INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE

> THAT YOUR

> +USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE

> TERMS AND

> +CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES

> INDICATED OR

> +REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND

> CONDITIONS OF THIS

>  AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE

> LICENSE

>  AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU

> MAY NOT

>  USE THE CONTENT.

> 

> -Unless otherwise indicated, all Content (except Documentation)

> made available on the TianoCore

> -site is provided to you under the terms and conditions of the

> BSD

> -License ("BSD"). A copy of the BSD License is available at

> +Unless otherwise indicated, all Content (except Documentation)

> made available

> +on the TianoCore site is provided to you under the terms and

> conditions of the

> +BSD License ("BSD"). A copy of the BSD License is available at

>  http://opensource.org/licenses/bsd-license.php

>  or when applicable, in the associated License.txt file.

> 

>  Unless otherwise indicated, all Documentation made available on

> the

>  TianoCore site is provided to you under the terms and

> conditions of the

> -FreeBSD Documentation License ("FreeBSD"). A copy of the BSD

> License is

> +FreeBSD Documentation License ("FreeBSD"). A copy of the

> license is

>  available at https://www.freebsd.org/copyright/freebsd-doc-

> license.html or,

>  when applicable, in the associated License.txt file.

> 

>  Certain other content may be made available under other

> licenses as

> -indicated in or with such Content(for example, in a License.txt

> file).

> +indicated in or with such Content (for example, in a

> License.txt file).

> 

>  You accept and agree to the following terms and conditions for

> Your

>  present and future Contributions submitted to TianoCore site.

> Except

> @@ -172,3 +232,4 @@ title, and interest in and to Your

> Contributions.

>    or given pursuant to this Agreement, and all documentation

> and

>    support to be provided, unless otherwise noted, shall be in

> the

>    English language.

> +

> --

> 2.11.0


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/Contributions.txt b/Contributions.txt
index b6c15df2d..f34626912 100644
--- a/Contributions.txt
+++ b/Contributions.txt
@@ -11,7 +11,7 @@  To make a contribution to a TianoCore project, follow these steps.
    contribution is made under the terms of the specified
    contribution agreement.  Your "Contributed-under" message
    must include the name of contribution agreement and version.
-   For example: Contributed-under: TianoCore Contribution Agreement 1.0
+   For example: Contributed-under: TianoCore Contribution Agreement 1.1
    The "TianoCore Contribution Agreement" is included below in
    this document.
 4. Submit your code to the TianoCore project using the process
@@ -26,7 +26,10 @@  To make a contribution to a TianoCore project, follow these steps.
    * MIT: http://opensource.org/licenses/MIT
    * Python-2.0: http://opensource.org/licenses/Python-2.0
    * Zlib: http://opensource.org/licenses/Zlib
-   For documentation:  https://www.freebsd.org/copyright/freebsd-doc-license.html
+
+   For documentation:
+   * FreeBSD Documentation License
+     https://www.freebsd.org/copyright/freebsd-doc-license.html
 
    Contributions of code put into the public domain can also be
    accepted.
@@ -34,37 +37,94 @@  To make a contribution to a TianoCore project, follow these steps.
    Contributions using other licenses might be accepted, but further
    review will be required.
 
+=====================================================
+= Change Description / Commit Message / Patch Email =
+=====================================================
+
+Your change description should use the standard format for a
+commit message, and must include your "Signed-off-by" signature
+and the "Contributed-under" message.
+
+== Sample Change Description / Commit Message =
+
+=== Start of sample patch email message ===
+
+From: Contributor Name <contributor@example.com>
+Subject: [Repository/Branch PATCH] Module: Brief-single-line-summary
+
+Full-commit-message
+
+Contributed-under: TianoCore Contribution Agreement 1.1
+Signed-off-by: Contributor Name <contributor@example.com>
+---
+
+An extra message for the patch email which will not be considered part
+of the commit message can be added here.
+
+Patch content inline or attached
+
+=== End of sample patch email message ===
+
+=== Notes for sample patch email ===
+
+* The first line of commit message is taken from the email's subject
+  line following [Repository/Branch PATCH]. The remaining portion of the
+  commit message is the email's content until the '---' line.
+* git format-patch is one way to create this format
+
+=== Definitions for sample patch email ===
+
+* "Repository" is the identifier of the repository the patch applies.
+  This identifier should only be provided for repositories other than
+  'edk2'. For example 'edk2-BuildSpecification' or 'staging'.
+* "Branch" is the identifier of the branch the patch applies. This
+  identifier should only be provided for branches other than 'edk2/master'.
+  For example 'edk2/UDK2015', 'edk2-BuildSpecification/release/1.27', or
+  'staging/edk2-test'.
+* "Module" is a short identifier for the affected code or documentation. For
+  example 'MdePkg', 'MdeModulePkg/UsbBusDxe', 'Introduction', or
+  'EDK II INF File Format'.
+* "Brief-single-line-summary" is a short summary of the change.
+* The entire first line should be less than ~70 characters.
+* "Full-commit-message" a verbose multiple line comment describing
+  the change.  Each line should be less than ~70 characters.
+* "Contributed-under" explicitly states that the contribution is
+  made under the terms of the contribution agreement. This
+  agreement is included below in this document.
+* "Signed-off-by" is the contributor's signature identifying them
+  by their real/legal name and their email address.
+
 ========================================
 = TianoCore Contribution Agreement 1.1 =
 ========================================
 
-INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION ("DOCUMENTATION"),
-INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE TIANOCORE OPEN SOURCE
-PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE
-TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND INTEL AND/OR THE
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR
-REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE
-CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
+INTEL CORPORATION ("INTEL") MAKES AVAILABLE SOFTWARE, DOCUMENTATION
+("DOCUMENTATION"), INFORMATION AND/OR OTHER MATERIALS FOR USE IN THE
+TIANOCORE OPEN SOURCE PROJECT (COLLECTIVELY "CONTENT"). USE OF THE CONTENT
+IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT BETWEEN YOU AND
+INTEL AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES
+INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR
+USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND
+CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR
+REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
 AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
 AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
 USE THE CONTENT.
 
-Unless otherwise indicated, all Content (except Documentation) made available on the TianoCore
-site is provided to you under the terms and conditions of the BSD
-License ("BSD"). A copy of the BSD License is available at
+Unless otherwise indicated, all Content (except Documentation) made available
+on the TianoCore site is provided to you under the terms and conditions of the
+BSD License ("BSD"). A copy of the BSD License is available at
 http://opensource.org/licenses/bsd-license.php
 or when applicable, in the associated License.txt file.
 
 Unless otherwise indicated, all Documentation made available on the
 TianoCore site is provided to you under the terms and conditions of the
-FreeBSD Documentation License ("FreeBSD"). A copy of the BSD License is
+FreeBSD Documentation License ("FreeBSD"). A copy of the license is
 available at https://www.freebsd.org/copyright/freebsd-doc-license.html or,
 when applicable, in the associated License.txt file.
 
 Certain other content may be made available under other licenses as
-indicated in or with such Content(for example, in a License.txt file).
+indicated in or with such Content (for example, in a License.txt file).
 
 You accept and agree to the following terms and conditions for Your
 present and future Contributions submitted to TianoCore site. Except
@@ -172,3 +232,4 @@  title, and interest in and to Your Contributions.
   or given pursuant to this Agreement, and all documentation and
   support to be provided, unless otherwise noted, shall be in the
   English language.
+