From nobody Tue Nov 26 04:14:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57780+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57780+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587538623; cv=none; d=zohomail.com; s=zohoarc; b=T1sXeKbjPumZgv+qWHJy62309YSZ6sRTgeAFgFr3Pw3XhxBXunqk8JZMDkv7AbRXKzxASO+38/c9v46znqbT4mtLwn5SJmBle3j/QOKHZeWNJNmZpwMKayazvh+iACfCPIJ1pKrxeWg7KMnYQudy3BszHIal7DKFirrKhgcVHvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587538623; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=0fvoW/3APukL/Syhdp9WLNQQhZkcBKAJs/5xpjS1M5o=; b=H+UPkY2zmfTdC/Dh/gWG6T3xh+7vr8pMKh+9n8DYhFBqmMDJGpOnPvPVLyY8kkpZ64rGi0aniDN2RH0i5ErYfaFL9FtWnl8j3MyO9Ruaw1H7mpXVXtReBzhdPbj6zBa28/xmY5rtqOc49TnCVmSn5eXHn0YIg3TPNxkEwFY1Vhk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57780+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1587538623095729.5000078705601; Tue, 21 Apr 2020 23:57:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Wzs8YY1788612xwHp1mdsPzF; Tue, 21 Apr 2020 23:57:02 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.1717.1587538622304706568 for ; Tue, 21 Apr 2020 23:57:02 -0700 IronPort-SDR: n1HCRdxQdgFvvUHN/GS7klKPlkF3xoHDLlSKSEflrWKrnL90xy+/CosZv8UFo9Tq73A6YEpWi1 oCIMHiWJEnRw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2020 23:57:01 -0700 IronPort-SDR: Al/+h+ZYll1XPwzPdi4fS1gYnRgs34YPxKvMe5dk6LP7DT8PDkcbcfaXGSW0UDjKXI0tHddMdc Ey2kvF6MxjVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,412,1580803200"; d="scan'208";a="258969164" X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga006.jf.intel.com with ESMTP; 21 Apr 2020 23:57:00 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [edk2-devel] [PATCH] BaseTools/PatchCheck.py: Add LicenseCheck Date: Wed, 22 Apr 2020 14:56:55 +0800 Message-Id: <20200422065655.75392-1-shenglei.zhang@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,shenglei.zhang@intel.com X-Gm-Message-State: rf91QJcHt7AmzkN402Jy2BFjx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587538622; bh=yK5+CkeOzeoRU+uMRkNAqLDOOrecxcvbBFDHpG11C8U=; h=Cc:Date:From:Reply-To:Subject:To; b=tXv4/jl6OWKcnoceI4JT0iq7gcCmM1/SRT69obMizAQ67DyYh6FSLl6sUSV/M0iPP+N DB9A2ulb4cjyIi9YbVrV+Al/UKOznEoDU5bJPeZP8Qa8CZG8eIYp0kK4ToMVXak2IvLuI 71xR5BcleAIiCQ77k563oSNPjiidVzKpaQs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For files to be added to the tree, this feature will check whether it has BSD license. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Shenglei Zhang --- BaseTools/Scripts/PatchCheck.py | 52 ++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck= .py index 13da6967785d..15663d02a3c0 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -491,6 +491,53 @@ class GitDiffCheck: print(prefix, line) count +=3D 1 =20 +class LicenseCheck(): + + def __init__(self, diff): + self.ok =3D True + self.startcheck =3D False + self.license =3D True + lines =3D diff.splitlines(True) + count =3D len(lines) + line_index =3D 0 + for line in lines: + if line.startswith('--- /dev/null'): + nextline =3D lines[line_index + 1] + added_file =3D self.Readdedfileformat.search(nextline).gro= up(1) + added_file_extension =3D os.path.splitext(added_file)[1] + if added_file_extension in self.file_extension_list: + self.startcheck =3D True + self.license =3D False + if self.startcheck and self.license_name in line: + self.license =3D True + if line_index + 1 =3D=3D count or lines[line_index + 1].starts= with('diff --') and self.startcheck: + if not self.license: + self.error(added_file) + self.startcheck =3D False + self.license =3D True + line_index =3D line_index + 1 + + def error(self, *err): + if self.ok and Verbose.level > Verbose.ONELINE: + print('License is missing!') + self.ok =3D False + if Verbose.level < Verbose.NORMAL: + return + count =3D 0 + for line in err: + prefix =3D (' *', ' ')[count > 0] + error_format =3D 'Missing license in:' + print(prefix, error_format, line) + count +=3D 1 + + + license_name =3D 'BSD-2-Clause-Patent' + + Readdedfileformat =3D re.compile(r'\+\+\+ b\/(.*)\n') + + file_extension_list =3D [".c", ".h", ".inf", ".dsc", ".dec", ".py", ".= bat", ".sh", ".uni", ".yaml", ".fdf", ".inc"] + + class CheckOnePatch: """Checks the contents of a git email formatted patch. =20 @@ -508,12 +555,15 @@ class CheckOnePatch: msg_check =3D CommitMessageCheck(self.commit_subject, self.commit_= msg) msg_ok =3D msg_check.ok =20 + license_check =3D LicenseCheck(self.diff) + license_ok =3D license_check.ok + diff_ok =3D True if self.diff is not None: diff_check =3D GitDiffCheck(self.diff) diff_ok =3D diff_check.ok =20 - self.ok =3D email_ok and msg_ok and diff_ok + self.ok =3D email_ok and msg_ok and diff_ok and license_ok =20 if Verbose.level =3D=3D Verbose.ONELINE: if self.ok: --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57780): https://edk2.groups.io/g/devel/message/57780 Mute This Topic: https://groups.io/mt/73190372/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-