From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: Laszlo Ersek <lersek@redhat.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>,
"Kinney, Michael D" <michael.d.kinney@intel.com>
Cc: Andrew Fish <afish@apple.com>, Leif Lindholm <leif.lindholm@linaro.org>
Subject: Re: [edk2-CCodingStandardsSpecification Patch] Change preferred license of EDK II to BSD+Patent
Date: Wed, 17 Apr 2019 17:25:59 +0000 [thread overview]
Message-ID: <E92EE9817A31E24EB0585FDF735412F5B9C9A413@ORSMSX113.amr.corp.intel.com> (raw)
In-Reply-To: <6c0c2b3d-2284-ac7d-d6ce-d929a5f2aa38@redhat.com>
Laszlo,
It is a good idea to relax the requirement of no blank
lines between the copyright and SPDX identifier.
I will send a V2.
Mike
> -----Original Message-----
> From: Laszlo Ersek [mailto:lersek@redhat.com]
> Sent: Tuesday, April 16, 2019 5:54 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com>;
> devel@edk2.groups.io
> Cc: Andrew Fish <afish@apple.com>; Leif Lindholm
> <leif.lindholm@linaro.org>
> Subject: Re: [edk2-CCodingStandardsSpecification Patch]
> Change preferred license of EDK II to BSD+Patent
>
> On 04/15/19 22:57, 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>
> > ---
> > 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.
>
> All of the above looks good, but this context line ("The
> license will
> follow the copyright notice without an intervening blank
> line.") catches
> my eye. I don't think we conform to that requirement
> (nor that we did
> before the conversion to SPDIX/BSD+Patent).
>
> Should we drop this line? Perhaps in a separate patch?
>
> Anyway, for this patch:
>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
>
> Thanks
> Laszlo
>
> > 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
> >
next prev parent reply other threads:[~2019-04-17 17:26 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 [this message]
2019-04-16 16:53 ` [edk2-devel] " Philippe Mathieu-Daudé
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=E92EE9817A31E24EB0585FDF735412F5B9C9A413@ORSMSX113.amr.corp.intel.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