From nobody Mon May 6 12:59:42 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+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- From nobody Mon May 6 12:59:42 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+61976+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+61976+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1593689066; cv=none; d=zohomail.com; s=zohoarc; b=IzfAVH7yhx6HAjJlHBYKrmTtJ2ujlvHIbEJvpDPdWnW3ppaW3GNSNsviaHRs9zM/iA5Q5NowD6CMNkNjjH63LFYXWCuCqLoPozERel5XTS+0WeEh4Xd8zetSOodmTgoQgPR38fe94EkW0TWbnH2eW48oJMf1xpIwPj9tdxn8eXU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593689066; 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=wviYUCgwCNtREZ32G7QzDuOnBaXOq/uvQ/0cdtuuaqc=; b=XWqLMuJNGW9EBt/hyCdgm90iWlIcW2HK+Z1T8U58OYVquAGQlIA1ngbcajas29Qb2OUtWWvHWyXyAuRKltzmTq5HVI6xeCjZDa7hAl8F9rdinA9Wtb96tyTl5Ap+Q+nKebTZ0+wJw+v71RMWprDKZT0AWf70yRAw7oFS6GdLWt8= 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+61976+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1593689066012751.4168718968649; Thu, 2 Jul 2020 04:24:26 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id sgKiYY1788612xoxPLcylxke; Thu, 02 Jul 2020 04:24:25 -0700 X-Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.groups.io with SMTP id smtpd.web12.4363.1593689064956217035 for ; Thu, 02 Jul 2020 04:24:25 -0700 X-Received: by mail-wr1-f67.google.com with SMTP id f7so24735657wrw.1 for ; Thu, 02 Jul 2020 04:24:24 -0700 (PDT) X-Gm-Message-State: DyF9HpaNnimxz5rYNw5n1j1Px1787277AA= X-Google-Smtp-Source: ABdhPJxuwk67QfFK4+1p0jCYEHQA/pt6x+JOXRJoSGfjmUFGNcxmEdLUKjYBquWHtDqAtZIzZH/f9g== X-Received: by 2002:adf:f203:: with SMTP id p3mr2598544wro.331.1593689063332; Thu, 02 Jul 2020 04:24:23 -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.22 (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 Subject: [edk2-devel] [PATCH 2/2] ReadMe.rst: delete statements about other accepted licenses Date: Thu, 2 Jul 2020 12:24:20 +0100 Message-Id: <20200702112420.18408-3-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=x5Ss0uIJfpphnIl1q5bJquFZyoZ4eqqeUc+uWLq6vjc=; h=Cc:Date:From:Reply-To:Subject:To; b=RpNrmHMPWkdniMRGQmy49/e5jsIhik63EeoMZCKPRbEkPPDcwALymzb6ZQYxKCJu970 YYLr4DJ6TWqj1/iVkmLHRhG0HicDqvFhEqdx1cSJY9lL2yWY+/0/MJdhpCUqwIwNXLJRF 5G2ArMvFXlT6X5O+8qBs0Tf4m4UtqR0Zenk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" In the past, the TianoCore Contribution Agreement provided equal to what the (+patent) gives us, but also for all the alternative licenses listed under "Code Contributions". When the contribution agreement was dropped, no conversation was had about this aspect. Until this issue is resolved, only code licensed under edk2+patent should be accepted into the project. This addresses, but does not resolve, https://bugzilla.tianocore.org/show_bug.cgi?id=3D2834 Cc: Andrew Fish Cc: Laszlo Ersek Cc: Michael D Kinney Signed-off-by: Leif Lindholm Acked-by: Laszlo Ersek --- ReadMe.rst | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/ReadMe.rst b/ReadMe.rst index d597e34efc22..79f07240039e 100644 --- a/ReadMe.rst +++ b/ReadMe.rst @@ -111,23 +111,14 @@ To make a contribution to a TianoCore project, follow= these steps. that the project documents on its web page. If the process is not documented, then submit the code on development email list for the project. -#. It is preferred that contributions are submitted using the same - copyright license as the base project. When that is not possible, - then contributions using the following licenses can be accepted: - -- BSD (2-clause): http://opensource.org/licenses/BSD-2-Clause -- BSD (3-clause): http://opensource.org/licenses/BSD-3-Clause -- MIT: http://opensource.org/licenses/MIT -- Python-2.0: http://opensource.org/licenses/Python-2.0 -- Zlib: http://opensource.org/licenses/Zlib +#. Contributions must be submitted using the same copyright license + as the base project. =20 For documentation: =20 - FreeBSD Documentation License https://www.freebsd.org/copyright/freebsd-doc-license.html =20 -Contributions of code put into the public domain can also be accepted. - Contributions using other licenses might be accepted, but further review will be required. =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 (#61976): https://edk2.groups.io/g/devel/message/61976 Mute This Topic: https://groups.io/mt/75255990/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-