From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: michael.d.kinney@intel.com) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by groups.io with SMTP; Wed, 10 Apr 2019 23:46:48 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Apr 2019 23:46:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,336,1549958400"; d="scan'208";a="139316853" Received: from orsmsx109.amr.corp.intel.com ([10.22.240.7]) by fmsmga008.fm.intel.com with ESMTP; 10 Apr 2019 23:46:48 -0700 Received: from orsmsx151.amr.corp.intel.com (10.22.226.38) by ORSMSX109.amr.corp.intel.com (10.22.240.7) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 10 Apr 2019 23:46:47 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.24]) by ORSMSX151.amr.corp.intel.com ([169.254.7.24]) with mapi id 14.03.0415.000; Wed, 10 Apr 2019 23:46:47 -0700 From: "Michael D Kinney" To: "Gao, Liming" , "devel@edk2.groups.io" , "Kinney, Michael D" Subject: Re: [edk2-devel] [Patch] BaseTools/PatchCheck: Generate error if Contributed under found Thread-Topic: [edk2-devel] [Patch] BaseTools/PatchCheck: Generate error if Contributed under found Thread-Index: AQHU6zfUIwBr6qXyxUuzFPobyVp5n6Y2rO+A///hGgA= Date: Thu, 11 Apr 2019 06:46:47 +0000 Message-ID: References: <20190404224301.11360-1-michael.d.kinney@intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A14E42235E@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14E42235E@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Return-Path: michael.d.kinney@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Liming, Yes. I have that patch queued and will be sent out tomorrow. There are other Wiki changes for the preferred license. Mike > -----Original Message----- > From: Gao, Liming > Sent: Wednesday, April 10, 2019 6:37 PM > To: devel@edk2.groups.io; Kinney, Michael D > > Subject: RE: [edk2-devel] [Patch] BaseTools/PatchCheck: > Generate error if Contributed under found >=20 > Mike: > Could you also update wiki > https://github.com/tianocore/tianocore.github.io/wiki/C > ommit-Message-Format to remove Contributed-under: > TianoCore Contribution Agreement 1.1? >=20 > Thanks > Liming > >-----Original Message----- > >From: devel@edk2.groups.io > [mailto:devel@edk2.groups.io] On Behalf Of > >Michael D Kinney > >Sent: Friday, April 05, 2019 6:43 AM > >To: devel@edk2.groups.io > >Cc: Justen, Jordan L ; > Feng, Bob C > >; Gao, Liming > ; Zhu, > >Yonghong > >Subject: [edk2-devel] [Patch] BaseTools/PatchCheck: > Generate error if > >Contributed under found > > > >https://bugzilla.tianocore.org/show_bug.cgi?id=3D1655 > > > >With the change to BSD+Patent License, the TianoCore > Contributor's > >Agreement has been removed and as a result, a > Contributed under > >tag is no longer appropriate in patches. Remove the > check for > >the TianoCore Contributor's Agreement and instead, > generate an > >error if a patch contains a Contributed under tag in > the commit > >message. > > > >Cc: Jordan Justen > >Cc: Bob Feng > >Cc: Liming Gao > >Cc: Yonghong Zhu > >Signed-off-by: Michael D Kinney > > >--- > > BaseTools/Scripts/PatchCheck.py | 12 ++++-------- > > 1 file changed, 4 insertions(+), 8 deletions(-) > > > >diff --git a/BaseTools/Scripts/PatchCheck.py > >b/BaseTools/Scripts/PatchCheck.py > >index 0b580f3b31..19a7159358 100755 > >--- a/BaseTools/Scripts/PatchCheck.py > >+++ b/BaseTools/Scripts/PatchCheck.py > >@@ -1,7 +1,7 @@ > > ## @file > > # Check a patch for various format issues > > # > >-# Copyright (c) 2015 - 2018, Intel Corporation. All > rights reserved.
> >+# Copyright (c) 2015 - 2019, Intel Corporation. All > rights reserved.
> > # > > # This program and the accompanying materials are > licensed and made > > # available under the terms and conditions of the > BSD License which > >@@ -75,13 +75,9 @@ class CommitMessageCheck: > > count +=3D 1 > > > > def check_contributed_under(self): > >- cu_msg=3D'Contributed-under: TianoCore > Contribution Agreement 1.1' > >- if self.msg.find(cu_msg) < 0: > >- # Allow 1.0 for now while EDK II > community transitions to 1.1 > >- cu_msg=3D'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!)') > >+ if self.msg.find('Contributed-under') >=3D 0: > >+ self.error('Contributed-under! (Note: > this must be ' + > >+ 'removed by the code > contributor!)') > > > > @staticmethod > > def make_signature_re(sig, re_input=3DFalse): > >-- > >2.21.0.windows.1 > > > > > >