public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: devel@edk2.groups.io, michael.d.kinney@intel.com
Cc: Andrew Fish <afish@apple.com>, Laszlo Ersek <lersek@redhat.com>,
	Leif Lindholm <leif.lindholm@linaro.org>
Subject: Re: [edk2-devel] [edk2-CCodingStandardsSpecification Patch] Change preferred license of EDK II to BSD+Patent
Date: Tue, 16 Apr 2019 18:53:16 +0200	[thread overview]
Message-ID: <bb10dde4-2e5f-95b4-1fb5-0d6d5879b6ed@redhat.com> (raw)
In-Reply-To: <20190415205722.20752-1-michael.d.kinney@intel.com>

On 4/15/19 10:57 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.
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael Kinney <michael.d.kinney@intel.com>

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

> ---
>  5_source_files/52_spacing.md             | 23 +++++------------------
>  5_source_files/53_include_files.md       | 10 +---------
>  5_source_files/54_code_file_structure.md | 10 +---------
>  appendix_a_common_examples.md            |  9 +--------
>  4 files changed, 8 insertions(+), 44 deletions(-)
> 
> diff --git a/5_source_files/52_spacing.md b/5_source_files/52_spacing.md
> index ddeabf7..012a192 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.<BR>
> -  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,17 +356,12 @@ 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.
> 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.<BR>
> -  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.<BR>
> -  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/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.<BR>
> -  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
> 

      parent reply	other threads:[~2019-04-16 16:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-15 20:57 [edk2-CCodingStandardsSpecification Patch] Change preferred license of EDK II to BSD+Patent Michael D Kinney
2019-04-16 12:53 ` Laszlo Ersek
2019-04-17 17:25   ` Michael D Kinney
2019-04-16 16:53 ` Philippe Mathieu-Daudé [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bb10dde4-2e5f-95b4-1fb5-0d6d5879b6ed@redhat.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox