From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <jordan.l.justen@intel.com> Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 22E972193B804 for <edk2-devel@lists.01.org>; Thu, 20 Jul 2017 15:55:32 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP; 20 Jul 2017 15:57:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,386,1496127600"; d="scan'208";a="1197792226" Received: from jljusten-skl.jf.intel.com (HELO localhost) ([10.54.75.36]) by fmsmga002.fm.intel.com with ESMTP; 20 Jul 2017 15:57:14 -0700 MIME-Version: 1.0 To: Michael D Kinney <michael.d.kinney@intel.com>, edk2-devel@lists.01.org Message-ID: <150059143130.4016.737785023732820830@jljusten-skl.jf.intel.com> From: Jordan Justen <jordan.l.justen@intel.com> In-Reply-To: <20170720054411.18928-2-michael.d.kinney@intel.com> Cc: Liming Gao <liming.gao@intel.com>, Andrew Fish <afish@apple.com>, Leif Lindholm <leif.lindholm@linaro.org> References: <20170720054411.18928-1-michael.d.kinney@intel.com> <20170720054411.18928-2-michael.d.kinney@intel.com> User-Agent: alot/0.5.1 Date: Thu, 20 Jul 2017 15:57:11 -0700 Subject: Re: [Patch V3 1/8] BaseTools/PatchCheck: Support Contribution Agreement 1.1 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development <edk2-devel.lists.01.org> List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>, <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe> List-Archive: <http://lists.01.org/pipermail/edk2-devel/> List-Post: <mailto:edk2-devel@lists.01.org> List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help> List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>, <mailto:edk2-devel-request@lists.01.org?subject=subscribe> X-List-Received-Date: Thu, 20 Jul 2017 22:55:32 -0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The changes look consistent with my conditional r-b: https://lists.01.org/pipermail/edk2-devel/2017-July/012413.html On 2017-07-19 22:44:04, Michael D Kinney wrote: > https://bugzilla.tianocore.org/show_bug.cgi?id=3D628 > = > 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/PatchChe= ck.py > index 7bc5736dbf..43bfc2495c 100755 > --- a/BaseTools/Scripts/PatchCheck.py > +++ b/BaseTools/Scripts/PatchCheck.py > @@ -75,10 +75,13 @@ class CommitMessageCheck: > count +=3D 1 > = > def check_contributed_under(self): > - cu_msg=3D'Contributed-under: TianoCore Contribution Agreement 1.= 0' > + cu_msg=3D'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=3D'Contributed-under: TianoCore Contribution Agreemen= t 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=3DFalse): > -- = > 2.13.1.windows.2 > = > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel