[dpdk-dev] examples: update copyrights and license

Message ID 1516725978-51629-1-git-send-email-lee.daly@intel.com (mailing list archive)
State Changes Requested, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation fail Compilation issues

Commit Message

Daly, Lee Jan. 23, 2018, 4:46 p.m. UTC
  This updates the Intel, Cavium and Hasan Alayli license on files in examples
to be the standard BSD-3-Clause license used for the rest of DPDK,
bringing the files in compliance with the DPDK licensing policy.

Signed-off-by: Lee Daly <lee.daly@intel.com>
---
 .../performance-thread/common/arch/x86/stack.h     | 61 ++--------------------
 1 file changed, 5 insertions(+), 56 deletions(-)
  

Comments

Bruce Richardson Jan. 23, 2018, 5:09 p.m. UTC | #1
On Tue, Jan 23, 2018 at 04:46:18PM +0000, Lee Daly wrote:
> This updates the Intel, Cavium and Hasan Alayli license on files in examples
> to be the standard BSD-3-Clause license used for the rest of DPDK,
> bringing the files in compliance with the DPDK licensing policy.
> 
> Signed-off-by: Lee Daly <lee.daly@intel.com>
> ---

The non-BSD-3-Clause license again should not be replaced.

/Bruce
  
Hemant Agrawal Feb. 8, 2018, 8:49 a.m. UTC | #2
Hi Lee,
	Hasan Alayli's license seems to be BSD-2-Clause, which is typically 
compatible with BSD-3-Clause.
	It will be ideal to get ACK from Hasan Alayli to re-license it as 
BSD-3-clause and change it to SPDX tag.

regards,
Hemant

On 1/23/2018 10:16 PM, Lee Daly wrote:
> This updates the Intel, Cavium and Hasan Alayli license on files in examples
> to be the standard BSD-3-Clause license used for the rest of DPDK,
> bringing the files in compliance with the DPDK licensing policy.
> 
> Signed-off-by: Lee Daly <lee.daly@intel.com>
> ---
>   .../performance-thread/common/arch/x86/stack.h     | 61 ++--------------------
>   1 file changed, 5 insertions(+), 56 deletions(-)
> 
> diff --git a/examples/performance-thread/common/arch/x86/stack.h b/examples/performance-thread/common/arch/x86/stack.h
> index 98723ba..2c31f7c 100644
> --- a/examples/performance-thread/common/arch/x86/stack.h
> +++ b/examples/performance-thread/common/arch/x86/stack.h
> @@ -1,66 +1,15 @@
> -/*-
> - *   BSD LICENSE
> - *
> - *   Copyright(c) 2015 Intel Corporation. All rights reserved.
> - *   Copyright(c) Cavium, Inc. 2017.
> - *   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) 2015 Intel Corporation.
> + * Copyright(c) Cavium, Inc. 2017.
> + * All rights reserved
>    */
>   
>   /*
>    * Some portions of this software is derived from the
> - * https://github.com/halayli/lthread which carrys the following license.
> - *
> + * https://github.com/halayli/lthread which carries the following license.
>    * Copyright (C) 2012, Hasan Alayli <halayli@gmail.com>
> - *
> - * Redistribution and use in source and binary forms, with or without
> - * modification, are permitted provided that the following conditions
> - * are met:
> - * 1. Redistributions of source code must retain the above copyright
> - *    notice, this list of conditions and the following disclaimer.
> - * 2. 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.
> - *
> - * THIS SOFTWARE IS PROVIDED BY AUTHOR 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 AUTHOR 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.
>    */
>   
> -
>   #ifndef STACK_H
>   #define STACK_H
>   
>
  
Daly, Lee Feb. 8, 2018, 1:48 p.m. UTC | #3
> -----Original Message-----

> From: Hemant Agrawal [mailto:hemant.agrawal@nxp.com]

> Sent: Thursday, February 8, 2018 8:49 AM

> To: Daly, Lee <lee.daly@intel.com>; Mcnamara, John

> <john.mcnamara@intel.com>; De Lara Guarch, Pablo

> <pablo.de.lara.guarch@intel.com>; Richardson, Bruce

> <bruce.richardson@intel.com>; Van Haaren, Harry

> <harry.van.haaren@intel.com>; halayli@gmail.com

> Cc: dev@dpdk.org

> Subject: Re: [PATCH] examples: update copyrights and license

> 

> Hi Lee,

> 	Hasan Alayli's license seems to be BSD-2-Clause, which is typically

> compatible with BSD-3-Clause.

> 	It will be ideal to get ACK from Hasan Alayli to re-license it as BSD-3-

> clause and change it to SPDX tag.



Agree. This should be done for 18.05 release, 
This patch set it just updating the BSD-3 licenses.

Regards,
Lee.
  
Hemant Agrawal Feb. 9, 2018, 4:55 a.m. UTC | #4
On 2/8/2018 7:18 PM, Daly, Lee wrote:
>> Subject: Re: [PATCH] examples: update copyrights and license
>>
>> Hi Lee,
>> 	Hasan Alayli's license seems to be BSD-2-Clause, which is typically
>> compatible with BSD-3-Clause.
>> 	It will be ideal to get ACK from Hasan Alayli to re-license it as BSD-3-
>> clause and change it to SPDX tag.
> 
> 
> Agree. This should be done for 18.05 release,
> This patch set it just updating the BSD-3 licenses.
> 
Yes, this patch need to wait.

You can not put a "SPDX-License-Identifier: BSD-3-Clause" on a mixed 
licensed file.


Regards,
Hemant
  
Hasan Alayli Feb. 9, 2018, 2:30 p.m. UTC | #5
Feel free to relicense lthread to BSD-3.

On Thu, Feb 8, 2018 at 8:55 PM, Hemant Agrawal <hemant.agrawal@nxp.com>
wrote:

> On 2/8/2018 7:18 PM, Daly, Lee wrote:
>
>> Subject: Re: [PATCH] examples: update copyrights and license
>>>
>>> Hi Lee,
>>>         Hasan Alayli's license seems to be BSD-2-Clause, which is
>>> typically
>>> compatible with BSD-3-Clause.
>>>         It will be ideal to get ACK from Hasan Alayli to re-license it
>>> as BSD-3-
>>> clause and change it to SPDX tag.
>>>
>>
>>
>> Agree. This should be done for 18.05 release,
>> This patch set it just updating the BSD-3 licenses.
>>
>> Yes, this patch need to wait.
>
> You can not put a "SPDX-License-Identifier: BSD-3-Clause" on a mixed
> licensed file.
>
>
> Regards,
> Hemant
>
>
  
Hemant Agrawal Feb. 9, 2018, 3:09 p.m. UTC | #6
Hi Lee,

On 1/23/2018 10:16 PM, Lee Daly wrote:
> This updates the Intel, Cavium and Hasan Alayli license on files in examples
> to be the standard BSD-3-Clause license used for the rest of DPDK,
> bringing the files in compliance with the DPDK licensing policy.

Please change the patch commit msg to examples/performance-thread:

> 
> Signed-off-by: Lee Daly <lee.daly@intel.com>
> ---
>   .../performance-thread/common/arch/x86/stack.h     | 61 ++--------------------
>   1 file changed, 5 insertions(+), 56 deletions(-)
> 
> diff --git a/examples/performance-thread/common/arch/x86/stack.h b/examples/performance-thread/common/arch/x86/stack.h
> index 98723ba..2c31f7c 100644
> --- a/examples/performance-thread/common/arch/x86/stack.h
> +++ b/examples/performance-thread/common/arch/x86/stack.h
> @@ -1,66 +1,15 @@
> -/*-
> - *   BSD LICENSE
> - *
> - *   Copyright(c) 2015 Intel Corporation. All rights reserved.
> - *   Copyright(c) Cavium, Inc. 2017.
> - *   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) 2015 Intel Corporation.
> + * Copyright(c) Cavium, Inc. 2017.
> + * All rights reserved
>    */
>   
>   /*
>    * Some portions of this software is derived from the
> - * https://github.com/halayli/lthread which carrys the following license.
> - *
> + * https://github.com/halayli/lthread which carries the following license.

>    * Copyright (C) 2012, Hasan Alayli <halayli@gmail.com>

I suggest following:

 > +/* SPDX-License-Identifier: BSD-3-Clause
 > + * Copyright(c) 2015 Intel Corporation.
 > + * Copyright(c) Cavium, Inc. 2017.
 > + * All rights reserved
 >   * Copyright (C) 2012, Hasan Alayli <halayli@gmail.com>
     * Portions derived from: https://github.com/halayli/lthread
     * With permissions form Hasan Alayli to use them as BSD-3-Clause
 >   */

Regards,
Hemant

> - *
> - * Redistribution and use in source and binary forms, with or without
> - * modification, are permitted provided that the following conditions
> - * are met:
> - * 1. Redistributions of source code must retain the above copyright
> - *    notice, this list of conditions and the following disclaimer.
> - * 2. 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.
> - *
> - * THIS SOFTWARE IS PROVIDED BY AUTHOR 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 AUTHOR 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.
>    */
>   
> -
>   #ifndef STACK_H
>   #define STACK_H
>   
>
  

Patch

diff --git a/examples/performance-thread/common/arch/x86/stack.h b/examples/performance-thread/common/arch/x86/stack.h
index 98723ba..2c31f7c 100644
--- a/examples/performance-thread/common/arch/x86/stack.h
+++ b/examples/performance-thread/common/arch/x86/stack.h
@@ -1,66 +1,15 @@ 
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2015 Intel Corporation. All rights reserved.
- *   Copyright(c) Cavium, Inc. 2017.
- *   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) 2015 Intel Corporation.
+ * Copyright(c) Cavium, Inc. 2017.
+ * All rights reserved
  */
 
 /*
  * Some portions of this software is derived from the
- * https://github.com/halayli/lthread which carrys the following license.
- *
+ * https://github.com/halayli/lthread which carries the following license.
  * Copyright (C) 2012, Hasan Alayli <halayli@gmail.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR 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 AUTHOR 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.
  */
 
-
 #ifndef STACK_H
 #define STACK_H