[dpdk-dev] [PATCH] igb_uio: convert license headers to SPDX tags

[dpdk-dev] [PATCH] igb_uio: convert license headers to SPDX tags

[Ferruh Yigit]

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_eal/linuxapp/igb_uio/Makefile  | 32 ++-----------------------------
 lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 23 ++--------------------
 2 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/lib/librte_eal/linuxapp/igb_uio/Makefile b/lib/librte_eal/linuxapp/igb_uio/Makefile
index ec6e702f0..bfb265d2f 100644
--- a/lib/librte_eal/linuxapp/igb_uio/Makefile
+++ b/lib/librte_eal/linuxapp/igb_uio/Makefile
@@ -1,33 +1,5 @@
-#   BSD LICENSE
-#
-#   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.
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
index a3a98c173..d0e4fd966 100644
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
@@ -1,25 +1,6 @@
 /*-
- * GPL LICENSE SUMMARY
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of version 2 of the GNU General Public License as
- *   published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *   General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *   The full GNU General Public License is included in this distribution
- *   in the file called LICENSE.GPL.
- *
- *   Contact Information:
- *   Intel Corporation
+ * SPDX-License-Identifier: GPL-2.0
+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-- 
2.14.3

Re: [dpdk-dev] [PATCH] igb_uio: convert license headers to SPDX tags

[Stephen Hemminger]

On Mon, 18 Dec 2017 21:06:58 +0000
Ferruh Yigit <ferruh.yigit@intel.com> wrote:

> diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
> index a3a98c173..d0e4fd966 100644
> --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
> +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
> @@ -1,25 +1,6 @@
>  /*-
> - * GPL LICENSE SUMMARY
> - *
> - *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
> - *
> - *   This program is free software; you can redistribute it and/or modify
> - *   it under the terms of version 2 of the GNU General Public License as
> - *   published by the Free Software Foundation.
> - *
> - *   This program is distributed in the hope that it will be useful, but
> - *   WITHOUT ANY WARRANTY; without even the implied warranty of
> - *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - *   General Public License for more details.
> - *
> - *   You should have received a copy of the GNU General Public License
> - *   along with this program; if not, write to the Free Software
> - *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
> - *   The full GNU General Public License is included in this distribution
> - *   in the file called LICENSE.GPL.
> - *
> - *   Contact Information:
> - *   Intel Corporation
> + * SPDX-License-Identifier: GPL-2.0
> + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
>   */
>  
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

SPDX looks better, and since this is a kernel file it should follow
the Linux kernel standard.

// SPDX-License-Identifier: GPL-2.0
/*
 * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
 */

You might also want to do the update of year as well.

Re: [dpdk-dev] [PATCH] igb_uio: convert license headers to SPDX tags

[Ferruh Yigit]

On 12/18/2017 2:13 PM, Stephen Hemminger wrote:
> On Mon, 18 Dec 2017 21:06:58 +0000
> Ferruh Yigit <ferruh.yigit@intel.com> wrote:
> 
>> diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
>> index a3a98c173..d0e4fd966 100644
>> --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
>> +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
>> @@ -1,25 +1,6 @@
>>  /*-
>> - * GPL LICENSE SUMMARY
>> - *
>> - *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
>> - *
>> - *   This program is free software; you can redistribute it and/or modify
>> - *   it under the terms of version 2 of the GNU General Public License as
>> - *   published by the Free Software Foundation.
>> - *
>> - *   This program is distributed in the hope that it will be useful, but
>> - *   WITHOUT ANY WARRANTY; without even the implied warranty of
>> - *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>> - *   General Public License for more details.
>> - *
>> - *   You should have received a copy of the GNU General Public License
>> - *   along with this program; if not, write to the Free Software
>> - *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
>> - *   The full GNU General Public License is included in this distribution
>> - *   in the file called LICENSE.GPL.
>> - *
>> - *   Contact Information:
>> - *   Intel Corporation
>> + * SPDX-License-Identifier: GPL-2.0
>> + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
>>   */
>>  
>>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> 
> SPDX looks better, and since this is a kernel file it should follow
> the Linux kernel standard.
> 
> // SPDX-License-Identifier: GPL-2.0
> /*
>  * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
>  */

OK, I will update.

Is there any benefit of following Linux kernel standard not only for kernel
modules but for all DPDK files?

> 
> You might also want to do the update of year as well.
> 

Re: [dpdk-dev] [PATCH] igb_uio: convert license headers to SPDX tags

[Stephen Hemminger]

On Mon, 18 Dec 2017 15:08:06 -0800
Ferruh Yigit <ferruh.yigit@intel.com> wrote:

> OK, I will update.
> 
> Is there any benefit of following Linux kernel standard not only for kernel
> modules but for all DPDK files?

Nothing immediate, since SPDX usage is so new.
But I expect that there will be tools and scripts that scan for SPDX and expect
a certain format.

[dpdk-dev] [PATCH v2] igb_uio: convert license headers to SPDX tags

[Ferruh Yigit]

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
v2:
* follow Linux kernel standard for Linux kernel module source files
---
 lib/librte_eal/linuxapp/igb_uio/Makefile  | 32 ++-----------------------------
 lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 23 ++--------------------
 2 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/lib/librte_eal/linuxapp/igb_uio/Makefile b/lib/librte_eal/linuxapp/igb_uio/Makefile
index ec6e702f0..c1999c022 100644
--- a/lib/librte_eal/linuxapp/igb_uio/Makefile
+++ b/lib/librte_eal/linuxapp/igb_uio/Makefile
@@ -1,33 +1,5 @@
-#   BSD LICENSE
-#
-#   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.
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
 
 include $(RTE_SDK)/mk/rte.vars.mk
 
diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
index a3a98c173..7f2b4c86d 100644
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
@@ -1,25 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0
 /*-
- * GPL LICENSE SUMMARY
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of version 2 of the GNU General Public License as
- *   published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful, but
- *   WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *   General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *   The full GNU General Public License is included in this distribution
- *   in the file called LICENSE.GPL.
- *
- *   Contact Information:
- *   Intel Corporation
+ * Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-- 
2.14.3

Re: [dpdk-dev] [PATCH v2] igb_uio: convert license headers to SPDX tags

[Stephen Hemminger]

On Tue, 19 Dec 2017 00:03:14 +0000
Ferruh Yigit <ferruh.yigit@intel.com> wrote:

> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
>  

It doesn't matter much, but it seems odd that Makefile is BSD-3-Clause but the kernel driver
itself is GPL-2.0.  Wouldn't it make sense to have all files in one directory as GPL-2.0

Re: [dpdk-dev] [PATCH v2] igb_uio: convert license headers to SPDX tags

[Ferruh Yigit]

On 12/18/2017 4:10 PM, Stephen Hemminger wrote:
> On Tue, 19 Dec 2017 00:03:14 +0000
> Ferruh Yigit <ferruh.yigit@intel.com> wrote:
> 
>> +# SPDX-License-Identifier: BSD-3-Clause
>> +# Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
>>  
> 
> It doesn't matter much, but it seems odd that Makefile is BSD-3-Clause but the kernel driver
> itself is GPL-2.0.  Wouldn't it make sense to have all files in one directory as GPL-2.0

I just preserved the existing license but that is a simple DPDK makefile with
nothing fancy in it, not sure if it worth effort to change license of it.

Re: [dpdk-dev] [PATCH v2] igb_uio: convert license headers to SPDX tags

[Thomas Monjalon]

19/12/2017 01:03, Ferruh Yigit:
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied (Makefile was already updated), thanks