From nobody Tue Feb 10 04:15:46 2026 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+61975+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+61975+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1593689065; cv=none; d=zohomail.com; s=zohoarc; b=kIUuNv+5Jqo5ip4t2KWjsDQhjBqZjvP4ql+rgM1Y0EU2TTg9Sfmnz5ik9URFUq6NjUMqOrIxQGkdxX9B1IWH4erYGY7HbJj9dow1v0LE93tnHWqVKrSxfPzwSqbLSU99NRl2Qla7jlkWJH5WmUHWQ8S38j0+XgDwzZ7wKmfj/wo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593689065; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Gfupn9GUF+2kJwq7pNXPUDXzWfyGkzPEhIyoRHKgkhI=; b=HbJ84m8VLF8w/XDNew5Ld4xyy5sBi++k1llWe3Oj+vcDEvh/op+0MI4wnhT5lNLeb+eMpMdYKdwx+KXxe/lOY7klph0wF/wuVEuJEtPU4NLOvgDHtdIom+1JesvgAo51TkJaA730wIgkJN+BP5c8cj8/xngXYVWpNsTedPN7exg= 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+61975+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1593689065358320.4027955718136; Thu, 2 Jul 2020 04:24:25 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id JGx2YY1788612xpLB4auqLNN; Thu, 02 Jul 2020 04:24:25 -0700 X-Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web10.4342.1593689064266890972 for ; Thu, 02 Jul 2020 04:24:24 -0700 X-Received: by mail-wr1-f68.google.com with SMTP id z2so5476373wrp.2 for ; Thu, 02 Jul 2020 04:24:24 -0700 (PDT) X-Gm-Message-State: gk7yJtXk8fbunbsYn37B3M4Yx1787277AA= X-Google-Smtp-Source: ABdhPJzNnXhJt5HSbD5u1UZ4rQ0N5Wk1fUrJPVRc4kVe62Nolno1CfU6oZVVcCJkppBShw5LMjtz1Q== X-Received: by 2002:adf:e38b:: with SMTP id e11mr30701673wrm.65.1593689062591; Thu, 02 Jul 2020 04:24:22 -0700 (PDT) X-Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id b10sm9732148wmj.30.2020.07.02.04.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 04:24:22 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Andrew Fish , Laszlo Ersek , Michael D Kinney , Shenglei Zhang , Yuwei Chen , Liming Gao Subject: [edk2-devel] [PATCH 1/2] Revert "BaseTools/PatchCheck.py: Add LicenseCheck" Date: Thu, 2 Jul 2020 12:24:19 +0100 Message-Id: <20200702112420.18408-2-leif@nuviainc.com> In-Reply-To: <20200702112420.18408-1-leif@nuviainc.com> References: <20200702112420.18408-1-leif@nuviainc.com> MIME-Version: 1.0 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,leif@nuviainc.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1593689065; bh=L/7xhXPqAb4CNmwXxQxx+i4KtmhRnxI5PfJiYBrsPSA=; h=Cc:Date:From:Reply-To:Subject:To; b=Gzk7wC/+p9tsNC3LRVDvD9yglxuYwQAueqZ3vLuTiLyuIjCQVd1sIuw+KFHCCEUCuA8 CEMwlO5ZyAXSOq7CPJ4uf2zQVAbjthV0mlnF8rIKcA+bwH0fM4MFEkLEbHtKHFMUzeCki 7TQUeC1FkLuFZgwgjf9HrDMOahb9iFxqpx4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This reverts commit a4cfb842fca9693a330cb5435284c1ee8bfbbace. This commit suggests inclusion of non-edk2+license content without a contribution agreement is something the community has made a decision on, which is incorrect. Cc: Shenglei Zhang Cc: Yuwei Chen Cc: Liming Gao Signed-off-by: Leif Lindholm Acked-by: Laszlo Ersek Reviewed-by: Liming Gao --- BaseTools/Scripts/PatchCheck.py | 50 --------------------------------- 1 file changed, 50 deletions(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck= .py index e38cf61f93da..6372f71592d3 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -305,49 +305,12 @@ class GitDiffCheck: self.line_num =3D 0 self.state =3D START self.new_bin =3D [] - self.LicenseCheck(self.lines, self.count) while self.line_num < self.count and self.format_ok: line_num =3D self.line_num self.run() assert(self.line_num > line_num) self.report_message_result() =20 - def LicenseCheck(self, lines, count): - self.ok =3D True - self.startcheck =3D False - self.license =3D True - 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_format_preflix in line: - if self.bsd2_patent in line or self.bsd3_patent in line: - self.license =3D True - else: - for optional_license in self.license_optional_list: - if optional_license in line: - self.license =3D True - self.warning(added_file) - if line_index + 1 =3D=3D count or lines[line_index + 1].starts= with('diff --') and self.startcheck: - if not self.license: - error_message =3D "Invalid License in: " + added_file - self.error(error_message) - self.startcheck =3D False - self.license =3D True - line_index =3D line_index + 1 - - def warning(self, *err): - count =3D 0 - for line in err: - warning_format =3D 'Warning: License accepted but not BSD plus= patent license in' - print(warning_format, line) - count +=3D 1 - def report_message_result(self): if Verbose.level < Verbose.NORMAL: return @@ -534,19 +497,6 @@ class GitDiffCheck: print(prefix, line) count +=3D 1 =20 - license_format_preflix =3D 'SPDX-License-Identifier' - - bsd2_patent =3D 'BSD-2-Clause-Patent' - - bsd3_patent =3D 'BSD-3-Clause-Patent' - - license_optional_list =3D ['BSD-2-Clause', 'BSD-3-Clause', 'MIT', 'Pyt= hon-2.0', 'Zlib'] - - Readdedfileformat =3D re.compile(r'\+\+\+ b\/(.*)\n') - - file_extension_list =3D [".c", ".h", ".inf", ".dsc", ".dec", ".py", ".= bat", ".sh", ".uni", ".yaml", ".fdf", ".inc", "yml", ".asm", \ - ".asm16", ".asl", ".vfr", ".s", ".S", ".aslc", "= .nasm", ".nasmb", ".idf", ".Vfr", ".H"] - class CheckOnePatch: """Checks the contents of a git email formatted patch. =20 --=20 2.20.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 (#61975): https://edk2.groups.io/g/devel/message/61975 Mute This Topic: https://groups.io/mt/75255989/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-