[dpdk-dev] net/pcap: convert license headers to SPDX tags

Message ID	20171218210616.37502-1-ferruh.yigit@intel.com (mailing list archive)
State	Superseded, archived
Headers	From: Ferruh Yigit <ferruh.yigit@intel.com> To: Bruce Richardson <bruce.richardson@intel.com>, John McNamara <john.mcnamara@intel.com> Cc: dev@dpdk.org, Ferruh Yigit <ferruh.yigit@intel.com> Date: Mon, 18 Dec 2017 21:06:15 +0000 Message-Id: <20171218210616.37502-1-ferruh.yigit@intel.com> Subject: [dpdk-dev] [PATCH] net/pcap: convert license headers to SPDX tags Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>

Message ID

20171218210616.37502-1-ferruh.yigit@intel.com (mailing list archive)

State

Superseded, archived

Headers

From: Ferruh Yigit <ferruh.yigit@intel.com>
To: Bruce Richardson <bruce.richardson@intel.com>,
	John McNamara <john.mcnamara@intel.com>
Cc: dev@dpdk.org,
	Ferruh Yigit <ferruh.yigit@intel.com>
Date: Mon, 18 Dec 2017 21:06:15 +0000
Message-Id: <20171218210616.37502-1-ferruh.yigit@intel.com>
Subject: [dpdk-dev] [PATCH] net/pcap: convert license headers to SPDX tags
Precedence: list
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/Intel-compilation	success	Compilation OK

Commit Message

Ferruh Yigit Dec. 18, 2017, 9:06 p.m. UTC

  Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 doc/guides/nics/pcap_ring.rst   | 29 +----------------------------
 drivers/net/pcap/Makefile       | 35 ++++-------------------------------
 drivers/net/pcap/rte_eth_pcap.c | 35 ++++-------------------------------
 3 files changed, 9 insertions(+), 90 deletions(-)

Comments

Ferruh Yigit Dec. 18, 2017, 9:18 p.m. UTC | #1

On 12/18/2017 1:06 PM, Ferruh Yigit wrote:
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

<...>

> + * SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
> + * Copyright(c) 2014 6WIND S.A.
> + * All rights reserved.
>   */

Hi Hemant, Thomas,

Can you please suggest about extra "All rights reserved." line.

It is in the part of the BSD header, and I _assume_ that has been intended to
cover all "Copyright" lines above it.
But since some of the Copyright holders (at least Intel ones) already has that
in same line with copyright and I _assume_ this is intentional because of legal
requirements, can we remove that line.

I guess we have two options while removing it, applying it to all previous
Copyright lines (B) or just remove it (A):

(A)
 SPDX-License-Identifier: BSD-3-Clause
 Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
 Copyright(c) 2014 6WIND S.A.

(B)
 SPDX-License-Identifier: BSD-3-Clause
 Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
 Copyright(c) 2014 6WIND S.A. All rights reserved.

Can we go with option (A)?

Thomas Monjalon Dec. 18, 2017, 9:35 p.m. UTC | #2

18/12/2017 22:18, Ferruh Yigit:
> On 12/18/2017 1:06 PM, Ferruh Yigit wrote:
> > Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> 
> <...>
> 
> > + * SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
> > + * Copyright(c) 2014 6WIND S.A.
> > + * All rights reserved.
> >   */
> 
> Hi Hemant, Thomas,
> 
> Can you please suggest about extra "All rights reserved." line.
> 
> It is in the part of the BSD header, and I _assume_ that has been intended to
> cover all "Copyright" lines above it.
> But since some of the Copyright holders (at least Intel ones) already has that
> in same line with copyright and I _assume_ this is intentional because of legal
> requirements, can we remove that line.
> 
> I guess we have two options while removing it, applying it to all previous
> Copyright lines (B) or just remove it (A):
> 
> (A)
>  SPDX-License-Identifier: BSD-3-Clause
>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>  Copyright(c) 2014 6WIND S.A.
> 
> (B)
>  SPDX-License-Identifier: BSD-3-Clause
>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>  Copyright(c) 2014 6WIND S.A. All rights reserved.
> 
> Can we go with option (A)?

I have absolutely no idea about "All rights reserved".
Please get some inputs from Intel lawyers.

Hemant Agrawal Dec. 19, 2017, 5:02 a.m. UTC | #3

HI Ferruh,

On 12/19/2017 2:48 AM, Ferruh Yigit wrote:
> On 12/18/2017 1:06 PM, Ferruh Yigit wrote:
>> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
>
> <...>
>
>> + * SPDX-License-Identifier: BSD-3-Clause
>> + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>> + * Copyright(c) 2014 6WIND S.A.
>> + * All rights reserved.
>>   */
>
> Hi Hemant, Thomas,
>
> Can you please suggest about extra "All rights reserved." line.
>
> It is in the part of the BSD header, and I _assume_ that has been intended to
> cover all "Copyright" lines above it.
> But since some of the Copyright holders (at least Intel ones) already has that
> in same line with copyright and I _assume_ this is intentional because of legal
> requirements, can we remove that line.
>
> I guess we have two options while removing it, applying it to all previous
> Copyright lines (B) or just remove it (A):
>
> (A)
>  SPDX-License-Identifier: BSD-3-Clause
>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>  Copyright(c) 2014 6WIND S.A.
>
> (B)
>  SPDX-License-Identifier: BSD-3-Clause
>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>  Copyright(c) 2014 6WIND S.A. All rights reserved.
>
>
> Can we go with option (A)?
>

"All rights reserved" depend on legal counsel.
e.g Freescale preferred it, with NXP migration, we have stopped doing it.

w.r.t your query, I will suggest option (c)
SPDX-License-Identifier: BSD-3-Clause
Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
Copyright(c) 2014 6WIND S.A.
All rights reserved.

i.e no change in copyright.

However, as Bruce mentioned, we can remove *All rights reserved*  for 
the files having duplicate statement for a single copyright.

Bruce Richardson Dec. 19, 2017, 10:18 a.m. UTC | #4

On Mon, Dec 18, 2017 at 01:18:33PM -0800, Ferruh Yigit wrote:
> On 12/18/2017 1:06 PM, Ferruh Yigit wrote:
> > Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> 
> <...>
> 
> > + * SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
> > + * Copyright(c) 2014 6WIND S.A.
> > + * All rights reserved.
> >   */
> 
> Hi Hemant, Thomas,
> 
> Can you please suggest about extra "All rights reserved." line.
> 
> It is in the part of the BSD header, and I _assume_ that has been intended to
> cover all "Copyright" lines above it.
> But since some of the Copyright holders (at least Intel ones) already has that
> in same line with copyright and I _assume_ this is intentional because of legal
> requirements, can we remove that line.
> 
> I guess we have two options while removing it, applying it to all previous
> Copyright lines (B) or just remove it (A):
> 
> (A)
>  SPDX-License-Identifier: BSD-3-Clause
>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>  Copyright(c) 2014 6WIND S.A.
> 
> (B)
>  SPDX-License-Identifier: BSD-3-Clause
>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>  Copyright(c) 2014 6WIND S.A. All rights reserved.
> 
> 
> Can we go with option (A)?

Hi Ferruh,

I'm looking to replace a lot of the Intel-copyright license headers -
automating it right now. The latest Intel template actually has the
"all rights reserved" omitted. [See my patch for meson.build files]

/Bruce

Ferruh Yigit Dec. 19, 2017, 7:29 p.m. UTC | #5

On 12/19/2017 2:18 AM, Bruce Richardson wrote:
> On Mon, Dec 18, 2017 at 01:18:33PM -0800, Ferruh Yigit wrote:
>> On 12/18/2017 1:06 PM, Ferruh Yigit wrote:
>>> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
>>
>> <...>
>>
>>> + * SPDX-License-Identifier: BSD-3-Clause
>>> + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>>> + * Copyright(c) 2014 6WIND S.A.
>>> + * All rights reserved.
>>>   */
>>
>> Hi Hemant, Thomas,
>>
>> Can you please suggest about extra "All rights reserved." line.
>>
>> It is in the part of the BSD header, and I _assume_ that has been intended to
>> cover all "Copyright" lines above it.
>> But since some of the Copyright holders (at least Intel ones) already has that
>> in same line with copyright and I _assume_ this is intentional because of legal
>> requirements, can we remove that line.
>>
>> I guess we have two options while removing it, applying it to all previous
>> Copyright lines (B) or just remove it (A):
>>
>> (A)
>>  SPDX-License-Identifier: BSD-3-Clause
>>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>>  Copyright(c) 2014 6WIND S.A.
>>
>> (B)
>>  SPDX-License-Identifier: BSD-3-Clause
>>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>>  Copyright(c) 2014 6WIND S.A. All rights reserved.
>>
>>
>> Can we go with option (A)?
> 
> Hi Ferruh,
> 
> I'm looking to replace a lot of the Intel-copyright license headers -
> automating it right now. The latest Intel template actually has the
> "all rights reserved" omitted. [See my patch for meson.build files]

Batch update is good idea, thanks.
If your patch doesn't cover this I update the patch to omit that part.

Thanks,
ferruh

> 
> /Bruce
>

Bruce Richardson Dec. 19, 2017, 7:41 p.m. UTC | #6

On Tue, Dec 19, 2017 at 11:29:25AM -0800, Ferruh Yigit wrote:
> On 12/19/2017 2:18 AM, Bruce Richardson wrote:
> > On Mon, Dec 18, 2017 at 01:18:33PM -0800, Ferruh Yigit wrote:
> >> On 12/18/2017 1:06 PM, Ferruh Yigit wrote:
> >>> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> >>
> >> <...>
> >>
> >>> + * SPDX-License-Identifier: BSD-3-Clause
> >>> + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
> >>> + * Copyright(c) 2014 6WIND S.A.
> >>> + * All rights reserved.
> >>>   */
> >>
> >> Hi Hemant, Thomas,
> >>
> >> Can you please suggest about extra "All rights reserved." line.
> >>
> >> It is in the part of the BSD header, and I _assume_ that has been intended to
> >> cover all "Copyright" lines above it.
> >> But since some of the Copyright holders (at least Intel ones) already has that
> >> in same line with copyright and I _assume_ this is intentional because of legal
> >> requirements, can we remove that line.
> >>
> >> I guess we have two options while removing it, applying it to all previous
> >> Copyright lines (B) or just remove it (A):
> >>
> >> (A)
> >>  SPDX-License-Identifier: BSD-3-Clause
> >>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
> >>  Copyright(c) 2014 6WIND S.A.
> >>
> >> (B)
> >>  SPDX-License-Identifier: BSD-3-Clause
> >>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
> >>  Copyright(c) 2014 6WIND S.A. All rights reserved.
> >>
> >>
> >> Can we go with option (A)?
> > 
> > Hi Ferruh,
> > 
> > I'm looking to replace a lot of the Intel-copyright license headers -
> > automating it right now. The latest Intel template actually has the
> > "all rights reserved" omitted. [See my patch for meson.build files]
> 
> Batch update is good idea, thanks.
> If your patch doesn't cover this I update the patch to omit that part.
> 
My patches don't cover files with multiple copyright holders, so
additional patches here will be needed.

Thanks,
/Bruce

Ferruh Yigit Dec. 19, 2017, 7:48 p.m. UTC | #7

On 12/19/2017 11:41 AM, Bruce Richardson wrote:
> On Tue, Dec 19, 2017 at 11:29:25AM -0800, Ferruh Yigit wrote:
>> On 12/19/2017 2:18 AM, Bruce Richardson wrote:
>>> On Mon, Dec 18, 2017 at 01:18:33PM -0800, Ferruh Yigit wrote:
>>>> On 12/18/2017 1:06 PM, Ferruh Yigit wrote:
>>>>> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
>>>>
>>>> <...>
>>>>
>>>>> + * SPDX-License-Identifier: BSD-3-Clause
>>>>> + * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>>>>> + * Copyright(c) 2014 6WIND S.A.
>>>>> + * All rights reserved.
>>>>>   */
>>>>
>>>> Hi Hemant, Thomas,
>>>>
>>>> Can you please suggest about extra "All rights reserved." line.
>>>>
>>>> It is in the part of the BSD header, and I _assume_ that has been intended to
>>>> cover all "Copyright" lines above it.
>>>> But since some of the Copyright holders (at least Intel ones) already has that
>>>> in same line with copyright and I _assume_ this is intentional because of legal
>>>> requirements, can we remove that line.
>>>>
>>>> I guess we have two options while removing it, applying it to all previous
>>>> Copyright lines (B) or just remove it (A):
>>>>
>>>> (A)
>>>>  SPDX-License-Identifier: BSD-3-Clause
>>>>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>>>>  Copyright(c) 2014 6WIND S.A.
>>>>
>>>> (B)
>>>>  SPDX-License-Identifier: BSD-3-Clause
>>>>  Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
>>>>  Copyright(c) 2014 6WIND S.A. All rights reserved.
>>>>
>>>>
>>>> Can we go with option (A)?
>>>
>>> Hi Ferruh,
>>>
>>> I'm looking to replace a lot of the Intel-copyright license headers -
>>> automating it right now. The latest Intel template actually has the
>>> "all rights reserved" omitted. [See my patch for meson.build files]
>>
>> Batch update is good idea, thanks.
>> If your patch doesn't cover this I update the patch to omit that part.
>>
> My patches don't cover files with multiple copyright holders, so
> additional patches here will be needed.

OK, I will send it,
and as I understand from Hemant's comment, we can't omit the standalone "All
rights reserved." although I would like to remove it (just for simplicity, not
with any legal basis :)), so final header becomes:

SPDX-License-Identifier: BSD-3-Clause
Copyright(c) 2010-2016 Intel Corporation.
Copyright(c) 2014 6WIND S.A.
All rights reserved.

> 
> Thanks,
> /Bruce
>

diff mbox

Patch

diff --git a/doc/guides/nics/pcap_ring.rst b/doc/guides/nics/pcap_ring.rst
index 5e4f5f605..5e0bab969 100644
--- a/doc/guides/nics/pcap_ring.rst
+++ b/doc/guides/nics/pcap_ring.rst
@@ -1,32 +1,5 @@ 
-..  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.
 
 Libpcap and Ring Based Poll Mode Drivers
 ========================================
diff --git a/drivers/net/pcap/Makefile b/drivers/net/pcap/Makefile
index b6487d42b..16738a233 100644
--- a/drivers/net/pcap/Makefile
+++ b/drivers/net/pcap/Makefile
@@ -1,34 +1,7 @@ 
-#   BSD LICENSE
-#
-#   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
-#   Copyright(c) 2014 6WIND S.A.
-#   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.
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+# Copyright(c) 2014 6WIND S.A.
+# All rights reserved.
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 5a86752f9..74581616d 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -1,35 +1,8 @@ 
 /*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
- *   Copyright(c) 2014 6WIND S.A.
- *   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.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
+ * Copyright(c) 2014 6WIND S.A.
+ * All rights reserved.
  */
 
 #include <time.h>