public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Michael D Kinney <michael.d.kinney@intel.com>
To: edk2-devel@lists.01.org
Cc: Leif Lindholm <leif.lindholm@linaro.org>,
	Andrew Fish <afish@apple.com>,
	Jordan Justen <jordan.l.justen@intel.com>,
	Liming Gao <liming.gao@intel.com>
Subject: [Patch V3 1/8] BaseTools/PatchCheck: Support Contribution Agreement 1.1
Date: Wed, 19 Jul 2017 22:44:04 -0700	[thread overview]
Message-ID: <20170720054411.18928-2-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20170720054411.18928-1-michael.d.kinney@intel.com>

https://bugzilla.tianocore.org/show_bug.cgi?id=628

Update PatchCheck.py to support either
"Contributed-under: TianoCore Contribution Agreement 1.0"
or "Contributed-under: TianoCore Contribution Agreement 1.1"
in the commit message.

Temporarily continue to allow the TianoCore Contribution
Agreement 1.0 agreement.

Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Andrew Fish <afish@apple.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 BaseTools/Scripts/PatchCheck.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py
index 7bc5736dbf..43bfc2495c 100755
--- a/BaseTools/Scripts/PatchCheck.py
+++ b/BaseTools/Scripts/PatchCheck.py
@@ -75,10 +75,13 @@ class CommitMessageCheck:
             count += 1
 
     def check_contributed_under(self):
-        cu_msg='Contributed-under: TianoCore Contribution Agreement 1.0'
+        cu_msg='Contributed-under: TianoCore Contribution Agreement 1.1'
         if self.msg.find(cu_msg) < 0:
-            self.error('Missing Contributed-under! (Note: this must be ' +
-                       'added by the code contributor!)')
+            # Allow 1.0 for now while EDK II community transitions to 1.1
+            cu_msg='Contributed-under: TianoCore Contribution Agreement 1.0'
+            if self.msg.find(cu_msg) < 0:
+                self.error('Missing Contributed-under! (Note: this must be ' +
+                           'added by the code contributor!)')
 
     @staticmethod
     def make_signature_re(sig, re_input=False):
-- 
2.13.1.windows.2



  reply	other threads:[~2017-07-20  5:42 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-20  5:44 [Patch V3 0/8] Update to Tiano Contribution Agreement 1.1 Michael D Kinney
2017-07-20  5:44 ` Michael D Kinney [this message]
2017-07-20 22:57   ` [Patch V3 1/8] BaseTools/PatchCheck: Support " Jordan Justen
2017-07-20  5:44 ` [Patch V3 2/8] edk2: Move TianoCore Contribution Agreement to root Michael D Kinney
2017-07-20  5:44 ` [Patch V3 3/8] edk2: Remove commit message details from Contributions.txt Michael D Kinney
2017-07-21 21:16   ` Jordan Justen
2017-07-21 22:14     ` Leif Lindholm
2017-07-24 18:13       ` Kinney, Michael D
2017-07-24 19:33         ` Jordan Justen
2017-07-24 20:01           ` Kinney, Michael D
2017-07-24 20:46             ` Jordan Justen
2017-07-20  5:44 ` [Patch V3 4/8] edk2: Update to TianoCore Contribution Agreement 1.1 Michael D Kinney
2017-07-20  5:44 ` [Patch V3 5/8] edk2: Reformat " Michael D Kinney
2017-07-20  5:44 ` [Patch V3 6/8] edk2/OvmfPkg: Add MIT license files Michael D Kinney
2017-07-20  5:44 ` [Patch V3 7/8] edk2: Move License.txt file to root Michael D Kinney
2017-07-20  6:35   ` Jordan Justen
2017-07-20 15:09     ` Kinney, Michael D
2017-07-20 22:53       ` Jordan Justen
2017-07-20 23:39         ` Kinney, Michael D
2017-07-25 10:06           ` Laszlo Ersek
2017-07-20  5:44 ` [Patch V3 8/8] edk2: Add Readme.md to root of edk2 repository Michael D Kinney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170720054411.18928-2-michael.d.kinney@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox