From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.85.221.67, mailfrom: philmd@redhat.com) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by groups.io with SMTP; Thu, 18 Apr 2019 04:34:21 -0700 Received: by mail-wr1-f67.google.com with SMTP id f14so1975322wrj.5 for ; Thu, 18 Apr 2019 04:34:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=6TYYozpo1D6qsyt7c4RwsC+JHhAUEoO+WCxbEux8h1A=; b=MU5Cdx00u/UpVULDsstPfE2B0O9sYuZLaHr2MjB2IY8jtPrM2zwVuWmVPq6KZV25Jw shz3X1Jv9CpxitLYwEvhdlCrgbsvVTX5dmAIEZT/neq/qLft3/Y04FGoOaEwNKyUh+vR JSZR7NqurRbUNNfc7MMkPaxmf70E0OyyjjZbgtQYM0XE4wFdhsuDz7PaH4cK3Jdc3528 Teb0twNtFhetOOi8Q1C2IQcJ/V5+ORH0Yn3QJxEOh2WTW8R+GcQZFX7oBjDTofth1gDx 9skGWsmDKmOfSbRBjRTbxBtx4AW8JmnUIwsBdavKdMlhZfYkG1PLgb5Sr2D92Qz9eaXS 1TKQ== X-Gm-Message-State: APjAAAUjIVYmM2sbbH2BOCtg7VERFmDehlcBem7u8HtAsyyZFFt6Ndnh Txzo5OzIgbRp8idghxqpDBpu7g== X-Google-Smtp-Source: APXvYqyK0K5vYLgRBvQ/ggi2mVGhv1oD+pt9Z51TaNRjomyh5kTiHXv1XGrnQhSvGdpFTvCsoEsNVA== X-Received: by 2002:a5d:530e:: with SMTP id e14mr2339355wrv.18.1555587259054; Thu, 18 Apr 2019 04:34:19 -0700 (PDT) Return-Path: Received: from [192.168.1.33] (193.red-88-21-103.staticip.rima-tde.net. [88.21.103.193]) by smtp.gmail.com with ESMTPSA id k9sm2076541wru.55.2019.04.18.04.34.18 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 04:34:18 -0700 (PDT) Subject: Re: [edk2-devel] [edk2-CCodingStandardsSpecification Patch V2] Change preferred license of EDK II to BSD+Patent To: devel@edk2.groups.io, michael.d.kinney@intel.com Cc: Andrew Fish , Laszlo Ersek , Leif Lindholm References: <20190417172752.1984-1-michael.d.kinney@intel.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Openpgp: id=89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE; url=http://pgp.mit.edu/pks/lookup?op=get&search=0xA2A3FD6EDEADC0DE Message-ID: <473b63b3-72ed-79dc-8c2a-47a3a3806072@redhat.com> Date: Thu, 18 Apr 2019 13:34:17 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190417172752.1984-1-michael.d.kinney@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit On 4/17/19 7:27 PM, Michael D Kinney wrote: > https://bugzilla.tianocore.org/show_bug.cgi?id=1656 > > 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. > > Remove the requirement that there are no blank lines between > the copyright statement and the SPDX identifier. This rule is not > consistently followed. > > Cc: Andrew Fish > Cc: Laszlo Ersek > Cc: Leif Lindholm > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Michael D Kinney Reviewed-by: Philippe Mathieu-Daude > --- > 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(-) > > diff --git a/5_source_files/52_spacing.md b/5_source_files/52_spacing.md > 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 spaces) is also acceptable. > information for a person viewing the file for the first time. > > 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 > > @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. > > -The majority of the files in EDK II contain the following "BSD" license. > +The preferred license for EDK II is the "BSD+Patent" license. The license for > +a file is provided in the file header using an SPDX identifier. The following > +shows the SPDX identifier for the "BSD+Patent" license. > > ``` > -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 > ``` > > -The license will follow the copyright notice without an intervening blank 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 from the > +Specification Reference, if present, by a single blank line. > > #### 5.2.3.5 Specification Reference > > diff --git a/5_source_files/53_include_files.md b/5_source_files/53_include_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. > > 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 > > @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. > > 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 > > @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 rights 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=425) [CCS] clarify line breaking and indentation requirements for multi-line function calls | | > +| | [#1656](https://bugzilla.tianocore.org/show_bug.cgi?id=1656) Update all Wiki pages for the BSD+Patent license change with SPDX identifiers | | > 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’s purpose. > > 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 > > @par Specification Reference: > - UEFI 2.3, Chapter 9, Device Path Protocol >