From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Thu, 18 Apr 2019 01:05:51 -0700 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1B62E81114; Thu, 18 Apr 2019 08:05:51 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-179.rdu2.redhat.com [10.10.120.179]) by smtp.corp.redhat.com (Postfix) with ESMTP id B925E600C2; Thu, 18 Apr 2019 08:05:49 +0000 (UTC) Subject: Re: [edk2-CCodingStandardsSpecification Patch V2] Change preferred license of EDK II to BSD+Patent To: Michael D Kinney , devel@edk2.groups.io Cc: Andrew Fish , Leif Lindholm References: <20190417172752.1984-1-michael.d.kinney@intel.com> From: "Laszlo Ersek" Message-ID: <1f818496-f229-f5d5-bf22-5e2a8eede081@redhat.com> Date: Thu, 18 Apr 2019 10:05:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190417172752.1984-1-michael.d.kinney@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 18 Apr 2019 08:05:51 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 04/17/19 19:27, Michael D Kinney wrote: > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1656 >=20 > Change the EDK II C Coding Standards Specification to state that > the preferred license of the EDK II is the BSD+Patent License and > that file headers should use SPDX license identifiers. >=20 > Remove the requirement that there are no blank lines between > the copyright statement and the SPDX identifier. This rule is not > consistently followed. >=20 > Cc: Andrew Fish > Cc: Laszlo Ersek > Cc: Leif Lindholm > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael D Kinney > --- > 5_source_files/52_spacing.md | 28 ++++++------------------ > 5_source_files/53_include_files.md | 10 +-------- > 5_source_files/54_code_file_structure.md | 10 +-------- > README.md | 1 + > appendix_a_common_examples.md | 9 +------- > 5 files changed, 11 insertions(+), 47 deletions(-) >=20 > diff --git a/5_source_files/52_spacing.md b/5_source_files/52_spacing.m= d > index ddeabf7..fca0044 100644 > --- a/5_source_files/52_spacing.md > +++ b/5_source_files/52_spacing.md > @@ -279,15 +279,7 @@ the preferred indentation, but two tabs (four spac= es) is also acceptable. > information for a person viewing the file for the first time. > =20 > Copyright (C) --20XX, Acme 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 accompanies this distribution. The full > - text of the license may be found at > - http://opensource.org/licenses/bsd-license. > - > - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > - BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > - EXPRESS OR IMPLIED. > + SPDX-License-Identifier: BSD-2-Clause-Patent > =20 > @par Revision Reference: > - PI Version 1.0 > @@ -364,22 +356,16 @@ the location and content of the file. The correct= license will be determined by > the project leader at the time the file is created. In most cases, the= license > will be the same as for other files in the module or package. > =20 > -The majority of the files in EDK II contain the following "BSD" licens= e. > +The preferred license for EDK II is the "BSD+Patent" license. The lic= ense for > +a file is provided in the file header using an SPDX identifier. The f= ollowing > +shows the SPDX identifier for the "BSD+Patent" license. > =20 > ``` > -This program and the accompanying materials are licensed and made > -available under the terms and conditions of the BSD License that > -accompanies this distribution. The full text of the license may be > -found at http://opensource.org/licenses/bsd-license. > - > -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > -IMPLIED. > +SPDX-License-Identifier: BSD-2-Clause-Patent > ``` > =20 > -The license will follow the copyright notice without an intervening bl= ank line. > -It will be separated from the Specification Reference, if present, by = a single > -blank line. > +The license follows the copyright notice. The license is separated fr= om the > +Specification Reference, if present, by a single blank line. > =20 > #### 5.2.3.5 Specification Reference > =20 > diff --git a/5_source_files/53_include_files.md b/5_source_files/53_inc= lude_files.md > index 890e1c7..a859b76 100644 > --- a/5_source_files/53_include_files.md > +++ b/5_source_files/53_include_files.md > @@ -151,15 +151,7 @@ Not all types of declarations are present in every= file. > you should probably also explain your rationale. > =20 > Copyright (c) 20XX, Acme 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 accompanies this distribution. The full > - text of the license may be found at > - http://opensource.org/licenses/bsd-license. > - > - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > - BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > - EXPRESS OR IMPLIED. > + SPDX-License-Identifier: BSD-2-Clause-Patent > =20 > @par Specification Reference: > - UEFI 2.3, Chapter 9, Device Path Protocol > diff --git a/5_source_files/54_code_file_structure.md b/5_source_files/= 54_code_file_structure.md > index 8cc9f4f..caaeab9 100644 > --- a/5_source_files/54_code_file_structure.md > +++ b/5_source_files/54_code_file_structure.md > @@ -45,15 +45,7 @@ these are C files with an extension of "`.c`". > you should probably also explain your rationale. > =20 > Copyright (c) 20XX, Acme 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 accompanies this distribution. The full > - text of the license may be found at > - http://opensource.org/licenses/bsd-license.php > - > - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" > - BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER > - EXPRESS OR IMPLIED. > + SPDX-License-Identifier: BSD-2-Clause-Patent > =20 > @par Specification Reference: > - UEFI 2.3, Chapter 9, Device Path Protocol > diff --git a/README.md b/README.md > index 8b9675b..e261335 100644 > --- a/README.md > +++ b/README.md > @@ -112,3 +112,4 @@ Copyright (c) 2006-2017, Intel Corporation. All rig= hts reserved. > | 2.1 | DRAFT for REFORMAT = = | 10/30/2015 | > | 2.2 | Convert to Gitbook = = | June 2017 | > | | [#425](https://bugzilla.tianocore.org/show_bug.cgi?id=3D4= 25) [CCS] clarify line breaking and indentation requirements for multi-li= ne function calls | | > +| | [#1656](https://bugzilla.tianocore.org/show_bug.cgi?id=3D= 1656) Update all Wiki pages for the BSD+Patent license change with SPDX i= dentifiers | | > diff --git a/appendix_a_common_examples.md b/appendix_a_common_examples= .md > index 1f247f3..d7b1a89 100644 > --- a/appendix_a_common_examples.md > +++ b/appendix_a_common_examples.md > @@ -40,14 +40,7 @@ > Detailed description of file=E2=80=99s purpose. > =20 > Copyright (c) 2006 - 2014, Acme 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 accompanies this distribution. The full > - text of the license may be found at > - http://opensource.org/licenses/bsd-license.php > - > - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS= , > - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR= IMPLIED. > + SPDX-License-Identifier: BSD-2-Clause-Patent > =20 > @par Specification Reference: > - UEFI 2.3, Chapter 9, Device Path Protocol >=20 Reviewed-by: Laszlo Ersek