| Message ID | 1513600744-13749-2-git-send-email-hemant.agrawal@nxp.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v4,1/4] Introducing SPDX License Identifiers | expand |
On Mon, Dec 18, 2017 at 06:09:02PM +0530, Hemant Agrawal wrote: > Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com> > --- > GNUmakefile | 29 +---------------------------- > Makefile | 29 +---------------------------- > 2 files changed, 2 insertions(+), 56 deletions(-) > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
On Mon, Dec 18, 2017 at 06:09:02PM +0530, Hemant Agrawal wrote: > Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com> > --- > GNUmakefile | 29 +---------------------------- > Makefile | 29 +---------------------------- > 2 files changed, 2 insertions(+), 56 deletions(-) > > diff --git a/GNUmakefile b/GNUmakefile > index 45b7fbb..2ff3e4b 100644 > --- a/GNUmakefile > +++ b/GNUmakefile > @@ -1,33 +1,6 @@ > -# BSD LICENSE > +# SPDX-License-Identifier: BSD-3-Clause > # > # Copyright(c) 2010-2015 Intel Corporation. All rights reserved. Actually, minor comment, can we remove the blank line between the SPDX identifier and the copyright? Given that in the majority of cases, we will only have one line each, having a space between them is a) probably unnecessary, and b) looks weird IMHO. I'm currently working on a patchset to update the meson.build files, and I think having: # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation looks better as a header than two one-line paragraphs. /Bruce
18/12/2017 16:52, Bruce Richardson: > On Mon, Dec 18, 2017 at 06:09:02PM +0530, Hemant Agrawal wrote: > > --- a/GNUmakefile > > +++ b/GNUmakefile > > @@ -1,33 +1,6 @@ > > -# BSD LICENSE > > +# SPDX-License-Identifier: BSD-3-Clause > > # > > # Copyright(c) 2010-2015 Intel Corporation. All rights reserved. > > Actually, minor comment, can we remove the blank line between the SPDX > identifier and the copyright? Given that in the majority of cases, we > will only have one line each, having a space between them is a) probably > unnecessary, and b) looks weird IMHO. > > I'm currently working on a patchset to update the meson.build files, and > I think having: > > # SPDX-License-Identifier: BSD-3-Clause > # Copyright(c) 2017 Intel Corporation > > looks better as a header than two one-line paragraphs. +1, I agree with Bruce
On 12/18/2017 10:00 PM, Thomas Monjalon wrote: > 18/12/2017 16:52, Bruce Richardson: >> On Mon, Dec 18, 2017 at 06:09:02PM +0530, Hemant Agrawal wrote: >>> --- a/GNUmakefile >>> +++ b/GNUmakefile >>> @@ -1,33 +1,6 @@ >>> -# BSD LICENSE >>> +# SPDX-License-Identifier: BSD-3-Clause >>> # >>> # Copyright(c) 2010-2015 Intel Corporation. All rights reserved. >> >> Actually, minor comment, can we remove the blank line between the SPDX >> identifier and the copyright? Given that in the majority of cases, we >> will only have one line each, having a space between them is a) probably >> unnecessary, and b) looks weird IMHO. >> >> I'm currently working on a patchset to update the meson.build files, and >> I think having: >> >> # SPDX-License-Identifier: BSD-3-Clause >> # Copyright(c) 2017 Intel Corporation >> >> looks better as a header than two one-line paragraphs. > > +1, I agree with Bruce > I will fix it. However, I will suggest to not enforced it as a policy. Let the copyright owners decide, how they want to place the copyright.
On Tue, Dec 19, 2017 at 10:59:26AM +0530, Hemant Agrawal wrote: > On 12/18/2017 10:00 PM, Thomas Monjalon wrote: > > 18/12/2017 16:52, Bruce Richardson: > > > On Mon, Dec 18, 2017 at 06:09:02PM +0530, Hemant Agrawal wrote: > > > > --- a/GNUmakefile > > > > +++ b/GNUmakefile > > > > @@ -1,33 +1,6 @@ > > > > -# BSD LICENSE > > > > +# SPDX-License-Identifier: BSD-3-Clause > > > > # > > > > # Copyright(c) 2010-2015 Intel Corporation. All rights reserved. > > > > > > Actually, minor comment, can we remove the blank line between the SPDX > > > identifier and the copyright? Given that in the majority of cases, we > > > will only have one line each, having a space between them is a) probably > > > unnecessary, and b) looks weird IMHO. > > > > > > I'm currently working on a patchset to update the meson.build files, and > > > I think having: > > > > > > # SPDX-License-Identifier: BSD-3-Clause > > > # Copyright(c) 2017 Intel Corporation > > > > > > looks better as a header than two one-line paragraphs. > > > > +1, I agree with Bruce > > > I will fix it. > However, I will suggest to not enforced it as a policy. Let the copyright > owners decide, how they want to place the copyright. Ok, I can live with that. I've started work on automatically replacing the license text for Intel copyright files. Those patch (when done) will use the 2-line, no-space version. :-)
diff --git a/GNUmakefile b/GNUmakefile index 45b7fbb..2ff3e4b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,33 +1,6 @@ -# BSD LICENSE +# SPDX-License-Identifier: BSD-3-Clause # # Copyright(c) 2010-2015 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # Head Makefile for compiling rte SDK diff --git a/Makefile b/Makefile index f4b807e..f87b84a 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,6 @@ -# BSD LICENSE +# SPDX-License-Identifier: BSD-3-Clause # # Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .error Error please compile using GNU Make (gmake)
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com> --- GNUmakefile | 29 +---------------------------- Makefile | 29 +---------------------------- 2 files changed, 2 insertions(+), 56 deletions(-) -- 2.7.4