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.88, mailfrom: liming.gao@intel.com) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by groups.io with SMTP; Wed, 10 Apr 2019 18:36:44 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Apr 2019 18:36:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,335,1549958400"; d="scan'208";a="314883752" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga005.jf.intel.com with ESMTP; 10 Apr 2019 18:36:43 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 10 Apr 2019 18:36:43 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.93]) with mapi id 14.03.0415.000; Thu, 11 Apr 2019 09:36:41 +0800 From: "Liming Gao" To: "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: AQHU6zfHYywiUK4Ymk2YPc0+c9YRMKY2N3AQ Date: Thu, 11 Apr 2019 01:36:41 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E42235E@SHSMSX104.ccr.corp.intel.com> References: <20190404224301.11360-1-michael.d.kinney@intel.com> In-Reply-To: <20190404224301.11360-1-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Mike: Could you also update wiki https://github.com/tianocore/tianocore.github= .io/wiki/Commit-Message-Format to remove Contributed-under: TianoCore Contr= ibution Agreement 1.1? 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 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!)') >+ 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 > > >