* [spp] [PATCH 1/7] license: add bsd-3-clause text
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
@ 2018-04-23 6:28 ` ogawa.yasufumi
2018-04-23 6:28 ` [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag ogawa.yasufumi
` (11 subsequent siblings)
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-04-23 6:28 UTC (permalink / raw)
To: ferruh.yigit, geminoa; +Cc: spp, ogawa.yasufumi
From: ogawa.yasufumi@lab.ntt.co.jp
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
license/bsd-3-clause.txt | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 license/bsd-3-clause.txt
diff --git a/license/bsd-3-clause.txt b/license/bsd-3-clause.txt
new file mode 100644
index 0000000..731a737
--- /dev/null
+++ b/license/bsd-3-clause.txt
@@ -0,0 +1,9 @@
+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.
+
+3. Neither the name of the copyright holder 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 HOLDER 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.
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
2018-04-23 6:28 ` [spp] [PATCH 1/7] license: add bsd-3-clause text ogawa.yasufumi
@ 2018-04-23 6:28 ` ogawa.yasufumi
2018-05-03 16:08 ` Ferruh Yigit
2018-04-23 6:28 ` [spp] [PATCH 3/7] spp_nfv: " ogawa.yasufumi
` (10 subsequent siblings)
12 siblings, 1 reply; 42+ messages in thread
From: ogawa.yasufumi @ 2018-04-23 6:28 UTC (permalink / raw)
To: ferruh.yigit, geminoa; +Cc: spp, ogawa.yasufumi
From: ogawa.yasufumi@lab.ntt.co.jp
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/primary/Makefile | 32 ++------------------------------
src/primary/args.c | 34 +++-------------------------------
src/primary/args.h | 34 +++-------------------------------
src/primary/init.c | 34 +++-------------------------------
src/primary/init.h | 33 ++-------------------------------
src/primary/main.c | 34 +++-------------------------------
6 files changed, 16 insertions(+), 185 deletions(-)
diff --git a/src/primary/Makefile b/src/primary/Makefile
index ec4d98b..e8a5d8d 100644
--- a/src/primary/Makefile
+++ b/src/primary/Makefile
@@ -1,33 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/primary/args.c b/src/primary/args.c
index ba7c69b..d87fc3b 100644
--- a/src/primary/args.c
+++ b/src/primary/args.c
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <getopt.h>
diff --git a/src/primary/args.h b/src/primary/args.h
index 020e848..fbd3067 100644
--- a/src/primary/args.h
+++ b/src/primary/args.h
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _ARGS_H_
diff --git a/src/primary/init.c b/src/primary/init.c
index 2630783..b0dda4e 100644
--- a/src/primary/init.c
+++ b/src/primary/init.c
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <limits.h>
diff --git a/src/primary/init.h b/src/primary/init.h
index 915552c..638a4e9 100644
--- a/src/primary/init.h
+++ b/src/primary/init.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _INIT_H_
diff --git a/src/primary/main.c b/src/primary/main.c
index d3feef7..1e8feb4 100644
--- a/src/primary/main.c
+++ b/src/primary/main.c
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <arpa/inet.h>
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag
2018-04-23 6:28 ` [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag ogawa.yasufumi
@ 2018-05-03 16:08 ` Ferruh Yigit
2018-05-15 16:55 ` Ferruh Yigit
0 siblings, 1 reply; 42+ messages in thread
From: Ferruh Yigit @ 2018-05-03 16:08 UTC (permalink / raw)
To: ogawa.yasufumi, geminoa
Cc: spp, tdelanerolle, Tim O'Driscoll, St Leger, Jim
On 4/23/2018 7:28 AM, ogawa.yasufumi@lab.ntt.co.jp wrote:
> @@ -1,34 +1,6 @@
> -/*-
> - * BSD LICENSE
> - *
> - * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
> + * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
> */
Hi Ogawa-san,
Thanks for taking initiative to switch spp to SPDX, appreciated.
First Trishan from Linux foundation and Jim from DPDK governance board are cc'ed
for input if there is any concern or more process to follow from governance
point of view.
Second these patches are both converts licensing to SPDX tag and adds ntt as
copyright holder. Can we separate these two please? A patchset to convert
existing licensing to SPDX as it is, and another set to add ntt.
Thanks,
ferruh
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag
2018-05-03 16:08 ` Ferruh Yigit
@ 2018-05-15 16:55 ` Ferruh Yigit
2018-05-16 9:08 ` Yasufumi Ogawa
0 siblings, 1 reply; 42+ messages in thread
From: Ferruh Yigit @ 2018-05-15 16:55 UTC (permalink / raw)
To: ogawa.yasufumi, geminoa
Cc: spp, tdelanerolle, Tim O'Driscoll, St Leger, Jim
On 5/3/2018 5:08 PM, Ferruh Yigit wrote:
> On 4/23/2018 7:28 AM, ogawa.yasufumi@lab.ntt.co.jp wrote:
>> @@ -1,34 +1,6 @@
>> -/*-
>> - * BSD LICENSE
>> - *
>> - * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
>> + * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
>> */
>
> Hi Ogawa-san,
>
> Thanks for taking initiative to switch spp to SPDX, appreciated.
>
> First Trishan from Linux foundation and Jim from DPDK governance board are cc'ed
> for input if there is any concern or more process to follow from governance
> point of view.
The is no response, which I am taking as there is no concern and will move
forward on getting patches. Please shout if there are concerns.
>
> Second these patches are both converts licensing to SPDX tag and adds ntt as
> copyright holder. Can we separate these two please? A patchset to convert
> existing licensing to SPDX as it is, and another set to add ntt.
>
>
> Thanks,
> ferruh
>
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag
2018-05-15 16:55 ` Ferruh Yigit
@ 2018-05-16 9:08 ` Yasufumi Ogawa
2018-05-16 14:06 ` Trishan de Lanerolle
0 siblings, 1 reply; 42+ messages in thread
From: Yasufumi Ogawa @ 2018-05-16 9:08 UTC (permalink / raw)
To: Ferruh Yigit, tdelanerolle, Tim O'Driscoll, St Leger, Jim; +Cc: spp
On 2018/05/16 1:55, Ferruh Yigit wrote:
> On 5/3/2018 5:08 PM, Ferruh Yigit wrote:
>> On 4/23/2018 7:28 AM, ogawa.yasufumi@lab.ntt.co.jp wrote:
>>> @@ -1,34 +1,6 @@
>>> -/*-
>>> - * BSD LICENSE
>>> - *
>>> - * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
>>> + * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
>>> */
>>
>> Hi Ogawa-san,
>>
>> Thanks for taking initiative to switch spp to SPDX, appreciated.
>>
>> First Trishan from Linux foundation and Jim from DPDK governance board are cc'ed
>> for input if there is any concern or more process to follow from governance
>> point of view.
>
> The is no response, which I am taking as there is no concern and will move
> forward on getting patches. Please shout if there are concerns.
Hi Trishan, Jim,
SPP was provided originally from Intel, but currently is maintained by NTT and planed to change license to SPDX. We have made
many changes on SPP and I would like to add NTT to the license only for considerably modified or newly created files by NTT.
Could you give us advice if there are any concern?
Thanks,
Yasufumi
>
>>
>> Second these patches are both converts licensing to SPDX tag and adds ntt as
>> copyright holder. Can we separate these two please? A patchset to convert
>> existing licensing to SPDX as it is, and another set to add ntt.
>>
>>
>> Thanks,
>> ferruh
>>
>
>
>
--
Yasufumi Ogawa
NTT Network Service Systems Labs
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag
2018-05-16 9:08 ` Yasufumi Ogawa
@ 2018-05-16 14:06 ` Trishan de Lanerolle
2018-05-17 7:09 ` Yasufumi Ogawa
0 siblings, 1 reply; 42+ messages in thread
From: Trishan de Lanerolle @ 2018-05-16 14:06 UTC (permalink / raw)
To: Yasufumi Ogawa; +Cc: Ferruh Yigit, Tim O'Driscoll, St Leger, Jim, spp
Hi,
Thanks for bringing up the question. Generally, we recommend that SPDX
license identifiers -- for existing files be thought as supplemental
information to add. Don't replace the existing license information, add the
tags on. Suggest reviewing the patch against that criteria. Remember to
maintain the attribution information. You may want to speak to your
in-house counsel with respect to any changes you would like to make to
files over which you hold copyright.
Regards,
Trishan
On Wed, May 16, 2018 at 5:08 AM, Yasufumi Ogawa <
ogawa.yasufumi@lab.ntt.co.jp> wrote:
> On 2018/05/16 1:55, Ferruh Yigit wrote:
>
>> On 5/3/2018 5:08 PM, Ferruh Yigit wrote:
>>
>>> On 4/23/2018 7:28 AM, ogawa.yasufumi@lab.ntt.co.jp wrote:
>>>
>>>> @@ -1,34 +1,6 @@
>>>> -/*-
>>>> - * BSD LICENSE
>>>> - *
>>>> - * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
>>>> + * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
>>>> */
>>>>
>>>
>>> Hi Ogawa-san,
>>>
>>> Thanks for taking initiative to switch spp to SPDX, appreciated.
>>>
>>> First Trishan from Linux foundation and Jim from DPDK governance board
>>> are cc'ed
>>> for input if there is any concern or more process to follow from
>>> governance
>>> point of view.
>>>
>>
>> The is no response, which I am taking as there is no concern and will move
>> forward on getting patches. Please shout if there are concerns.
>>
> Hi Trishan, Jim,
>
> SPP was provided originally from Intel, but currently is maintained by NTT
> and planed to change license to SPDX. We have made many changes on SPP and
> I would like to add NTT to the license only for considerably modified or
> newly created files by NTT. Could you give us advice if there are any
> concern?
>
> Thanks,
> Yasufumi
>
>
>>
>>> Second these patches are both converts licensing to SPDX tag and adds
>>> ntt as
>>> copyright holder. Can we separate these two please? A patchset to convert
>>> existing licensing to SPDX as it is, and another set to add ntt.
>>>
>>>
>>> Thanks,
>>> ferruh
>>>
>>>
>>
>>
>>
>
> --
> Yasufumi Ogawa
> NTT Network Service Systems Labs
>
>
--
Trishan R. de Lanerolle
Program Manager, Networking
Linux Foundation
voice: +1.203.699.6401
skype: tdelanerolle
email: tdelanerolle@linuxfoundation.org
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag
2018-05-16 14:06 ` Trishan de Lanerolle
@ 2018-05-17 7:09 ` Yasufumi Ogawa
2018-05-17 14:25 ` Trishan de Lanerolle
0 siblings, 1 reply; 42+ messages in thread
From: Yasufumi Ogawa @ 2018-05-17 7:09 UTC (permalink / raw)
To: Trishan de Lanerolle; +Cc: Ferruh Yigit, Tim O'Driscoll, St Leger, Jim, spp
On 2018/05/16 23:06, Trishan de Lanerolle wrote:
> Hi,
> Thanks for bringing up the question. Generally, we recommend that SPDX license identifiers -- for existing files be thought as
> supplemental information to add. Don't replace the existing license information, add the tags on. Suggest reviewing the patch
> against that criteria. Remember to maintain the attribution information. You may want to speak to your in-house counsel with
> respect to any changes you would like to make to files over which you hold copyright.
>
> Regards,
> Trishan
Hi Trishan,
Thank you for your reply. I understand that I should not replace existing license info. I would like to have a talk to and
confirm that it is acceptable.
Regards,
Yasufumi
>
>
> On Wed, May 16, 2018 at 5:08 AM, Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>> wrote:
>
> On 2018/05/16 1:55, Ferruh Yigit wrote:
>
> On 5/3/2018 5:08 PM, Ferruh Yigit wrote:
>
> On 4/23/2018 7:28 AM, ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp> wrote:
>
> @@ -1,34 +1,6 @@
> -/*-
> - * BSD LICENSE
> - *
> - * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
> + * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
> */
>
>
> Hi Ogawa-san,
>
> Thanks for taking initiative to switch spp to SPDX, appreciated.
>
> First Trishan from Linux foundation and Jim from DPDK governance board are cc'ed
> for input if there is any concern or more process to follow from governance
> point of view.
>
>
> The is no response, which I am taking as there is no concern and will move
> forward on getting patches. Please shout if there are concerns.
>
> Hi Trishan, Jim,
>
> SPP was provided originally from Intel, but currently is maintained by NTT and planed to change license to SPDX. We have
> made many changes on SPP and I would like to add NTT to the license only for considerably modified or newly created files by
> NTT. Could you give us advice if there are any concern?
>
> Thanks,
> Yasufumi
>
>
>
> Second these patches are both converts licensing to SPDX tag and adds ntt as
> copyright holder. Can we separate these two please? A patchset to convert
> existing licensing to SPDX as it is, and another set to add ntt.
>
>
> Thanks,
> ferruh
>
>
>
>
>
>
> --
> Yasufumi Ogawa
> NTT Network Service Systems Labs
>
>
>
>
> --
> Trishan R. de Lanerolle
> Program Manager, Networking
> Linux Foundation
> voice: +1.203.699.6401
> skype: tdelanerolle
> email: tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoundation.org>
--
Yasufumi Ogawa
NTT Network Service Systems Labs
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag
2018-05-17 7:09 ` Yasufumi Ogawa
@ 2018-05-17 14:25 ` Trishan de Lanerolle
2018-05-18 8:03 ` Yasufumi Ogawa
0 siblings, 1 reply; 42+ messages in thread
From: Trishan de Lanerolle @ 2018-05-17 14:25 UTC (permalink / raw)
To: Yasufumi Ogawa; +Cc: Ferruh Yigit, Tim O'Driscoll, St Leger, Jim, spp
Can you provide additional details on what you need clarification on?
Regards,
Trishan
On Thu, May 17, 2018 at 3:09 AM, Yasufumi Ogawa <
ogawa.yasufumi@lab.ntt.co.jp> wrote:
> On 2018/05/16 23:06, Trishan de Lanerolle wrote:
>
>> Hi,
>> Thanks for bringing up the question. Generally, we recommend that SPDX
>> license identifiers -- for existing files be thought as supplemental
>> information to add. Don't replace the existing license information, add the
>> tags on. Suggest reviewing the patch against that criteria. Remember to
>> maintain the attribution information. You may want to speak to your
>> in-house counsel with respect to any changes you would like to make to
>> files over which you hold copyright.
>>
>> Regards,
>> Trishan
>>
> Hi Trishan,
>
> Thank you for your reply. I understand that I should not replace existing
> license info. I would like to have a talk to and confirm that it is
> acceptable.
>
> Regards,
> Yasufumi
>
>>
>>
>> On Wed, May 16, 2018 at 5:08 AM, Yasufumi Ogawa <
>> ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>>
>> wrote:
>>
>> On 2018/05/16 1:55, Ferruh Yigit wrote:
>>
>> On 5/3/2018 5:08 PM, Ferruh Yigit wrote:
>>
>> On 4/23/2018 7:28 AM, ogawa.yasufumi@lab.ntt.co.jp <mailto:
>> ogawa.yasufumi@lab.ntt.co.jp> wrote:
>>
>> @@ -1,34 +1,6 @@
>> -/*-
>> - * BSD LICENSE
>> - *
>> - * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
>> + * Copyright(c) 2017-2018 Nippon Telegraph and Telephone
>> Corporation
>> */
>>
>>
>> Hi Ogawa-san,
>>
>> Thanks for taking initiative to switch spp to SPDX,
>> appreciated.
>>
>> First Trishan from Linux foundation and Jim from DPDK
>> governance board are cc'ed
>> for input if there is any concern or more process to follow
>> from governance
>> point of view.
>>
>>
>> The is no response, which I am taking as there is no concern and
>> will move
>> forward on getting patches. Please shout if there are concerns.
>>
>> Hi Trishan, Jim,
>>
>> SPP was provided originally from Intel, but currently is maintained
>> by NTT and planed to change license to SPDX. We have
>> made many changes on SPP and I would like to add NTT to the license
>> only for considerably modified or newly created files by
>> NTT. Could you give us advice if there are any concern?
>>
>> Thanks,
>> Yasufumi
>>
>>
>>
>> Second these patches are both converts licensing to SPDX tag
>> and adds ntt as
>> copyright holder. Can we separate these two please? A
>> patchset to convert
>> existing licensing to SPDX as it is, and another set to add
>> ntt.
>>
>>
>> Thanks,
>> ferruh
>>
>>
>>
>>
>>
>>
>> -- Yasufumi Ogawa
>> NTT Network Service Systems Labs
>>
>>
>>
>>
>> --
>> Trishan R. de Lanerolle
>> Program Manager, Networking
>> Linux Foundation
>> voice: +1.203.699.6401
>> skype: tdelanerolle
>> email: tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoun
>> dation.org>
>>
>
>
> --
> Yasufumi Ogawa
> NTT Network Service Systems Labs
>
>
--
Trishan R. de Lanerolle
Program Manager, Networking
Linux Foundation
voice: +1.203.699.6401
skype: tdelanerolle
email: tdelanerolle@linuxfoundation.org
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag
2018-05-17 14:25 ` Trishan de Lanerolle
@ 2018-05-18 8:03 ` Yasufumi Ogawa
2018-05-24 12:29 ` Ferruh Yigit
0 siblings, 1 reply; 42+ messages in thread
From: Yasufumi Ogawa @ 2018-05-18 8:03 UTC (permalink / raw)
To: Trishan de Lanerolle, Ferruh Yigit; +Cc: Tim O'Driscoll, St Leger, Jim, spp
On 2018/05/17 23:25, Trishan de Lanerolle wrote:
> Can you provide additional details on what you need clarification on?
Sorry for ambiguously. I meant that I need to talk with my boss about your suggestion.
I was not sure that I should add our license if I make considerable changes, or not. But I understand that I don't need to add
without if I will to do. As your suggestion, we decided to not replace existing license.
Ferruh,
I would like to send modified patches to not include NTT beside Intel.
Thanks,
Yasufumi
>
> Regards,
> Trishan
>
>
> On Thu, May 17, 2018 at 3:09 AM, Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>> wrote:
>
> On 2018/05/16 23:06, Trishan de Lanerolle wrote:
>
> Hi,
> Thanks for bringing up the question. Generally, we recommend that SPDX license identifiers -- for existing files be
> thought as supplemental information to add. Don't replace the existing license information, add the tags on. Suggest
> reviewing the patch against that criteria. Remember to maintain the attribution information. You may want to speak to
> your in-house counsel with respect to any changes you would like to make to files over which you hold copyright.
>
> Regards,
> Trishan
>
> Hi Trishan,
>
> Thank you for your reply. I understand that I should not replace existing license info. I would like to have a talk to and
> confirm that it is acceptable.
>
> Regards,
> Yasufumi
>
>
>
> On Wed, May 16, 2018 at 5:08 AM, Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>
> <mailto:ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>>> wrote:
>
> On 2018/05/16 1:55, Ferruh Yigit wrote:
>
> On 5/3/2018 5:08 PM, Ferruh Yigit wrote:
>
> On 4/23/2018 7:28 AM, ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>
> <mailto:ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>> wrote:
>
> @@ -1,34 +1,6 @@
> -/*-
> - * BSD LICENSE
> - *
> - * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
> + * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
> */
>
>
> Hi Ogawa-san,
>
> Thanks for taking initiative to switch spp to SPDX, appreciated.
>
> First Trishan from Linux foundation and Jim from DPDK governance board are cc'ed
> for input if there is any concern or more process to follow from governance
> point of view.
>
>
> The is no response, which I am taking as there is no concern and will move
> forward on getting patches. Please shout if there are concerns.
>
> Hi Trishan, Jim,
>
> SPP was provided originally from Intel, but currently is maintained by NTT and planed to change license to SPDX. We
> have
> made many changes on SPP and I would like to add NTT to the license only for considerably modified or newly created
> files by
> NTT. Could you give us advice if there are any concern?
>
> Thanks,
> Yasufumi
>
>
>
> Second these patches are both converts licensing to SPDX tag and adds ntt as
> copyright holder. Can we separate these two please? A patchset to convert
> existing licensing to SPDX as it is, and another set to add ntt.
>
>
> Thanks,
> ferruh
>
>
>
>
>
>
> -- Yasufumi Ogawa
> NTT Network Service Systems Labs
>
>
>
>
> --
> Trishan R. de Lanerolle
> Program Manager, Networking
> Linux Foundation
> voice: +1.203.699.6401
> skype: tdelanerolle
> email: tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoundation.org>
> <mailto:tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoundation.org>>
>
>
>
> --
> Yasufumi Ogawa
> NTT Network Service Systems Labs
>
>
>
>
> --
> Trishan R. de Lanerolle
> Program Manager, Networking
> Linux Foundation
> voice: +1.203.699.6401
> skype: tdelanerolle
> email: tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoundation.org>
--
Yasufumi Ogawa
NTT Network Service Systems Labs
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag
2018-05-18 8:03 ` Yasufumi Ogawa
@ 2018-05-24 12:29 ` Ferruh Yigit
2018-05-25 20:45 ` Yasufumi Ogawa
0 siblings, 1 reply; 42+ messages in thread
From: Ferruh Yigit @ 2018-05-24 12:29 UTC (permalink / raw)
To: Yasufumi Ogawa, Trishan de Lanerolle
Cc: Tim O'Driscoll, St Leger, Jim, spp
On 5/18/2018 9:03 AM, Yasufumi Ogawa wrote:
> On 2018/05/17 23:25, Trishan de Lanerolle wrote:
>> Can you provide additional details on what you need clarification on?
> Sorry for ambiguously. I meant that I need to talk with my boss about your suggestion.
>
> I was not sure that I should add our license if I make considerable changes, or not. But I understand that I don't need to add
> without if I will to do. As your suggestion, we decided to not replace existing license.
>
> Ferruh,
> I would like to send modified patches to not include NTT beside Intel.
Hi Yasufumi,
I have seen the new version, thank you for the update, I will get them today.
And I would like to acknowledge that some of the files that NTT did lots of
contribution. I guess concern here is introduce the copyright as part of SPDX
work. I am OK to introduce copyright to them later as the significant
contribution done on them.
Thanks,
ferruh
>
> Thanks,
> Yasufumi
>>
>> Regards,
>> Trishan
>>
>>
>> On Thu, May 17, 2018 at 3:09 AM, Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>> wrote:
>>
>> On 2018/05/16 23:06, Trishan de Lanerolle wrote:
>>
>> Hi,
>> Thanks for bringing up the question. Generally, we recommend that SPDX license identifiers -- for existing files be
>> thought as supplemental information to add. Don't replace the existing license information, add the tags on. Suggest
>> reviewing the patch against that criteria. Remember to maintain the attribution information. You may want to speak to
>> your in-house counsel with respect to any changes you would like to make to files over which you hold copyright.
>>
>> Regards,
>> Trishan
>>
>> Hi Trishan,
>>
>> Thank you for your reply. I understand that I should not replace existing license info. I would like to have a talk to and
>> confirm that it is acceptable.
>>
>> Regards,
>> Yasufumi
>>
>>
>>
>> On Wed, May 16, 2018 at 5:08 AM, Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>
>> <mailto:ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>>> wrote:
>>
>> On 2018/05/16 1:55, Ferruh Yigit wrote:
>>
>> On 5/3/2018 5:08 PM, Ferruh Yigit wrote:
>>
>> On 4/23/2018 7:28 AM, ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>
>> <mailto:ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>> wrote:
>>
>> @@ -1,34 +1,6 @@
>> -/*-
>> - * BSD LICENSE
>> - *
>> - * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
>> + * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
>> */
>>
>>
>> Hi Ogawa-san,
>>
>> Thanks for taking initiative to switch spp to SPDX, appreciated.
>>
>> First Trishan from Linux foundation and Jim from DPDK governance board are cc'ed
>> for input if there is any concern or more process to follow from governance
>> point of view.
>>
>>
>> The is no response, which I am taking as there is no concern and will move
>> forward on getting patches. Please shout if there are concerns.
>>
>> Hi Trishan, Jim,
>>
>> SPP was provided originally from Intel, but currently is maintained by NTT and planed to change license to SPDX. We
>> have
>> made many changes on SPP and I would like to add NTT to the license only for considerably modified or newly created
>> files by
>> NTT. Could you give us advice if there are any concern?
>>
>> Thanks,
>> Yasufumi
>>
>>
>>
>> Second these patches are both converts licensing to SPDX tag and adds ntt as
>> copyright holder. Can we separate these two please? A patchset to convert
>> existing licensing to SPDX as it is, and another set to add ntt.
>>
>>
>> Thanks,
>> ferruh
>>
>>
>>
>>
>>
>>
>> -- Yasufumi Ogawa
>> NTT Network Service Systems Labs
>>
>>
>>
>>
>> --
>> Trishan R. de Lanerolle
>> Program Manager, Networking
>> Linux Foundation
>> voice: +1.203.699.6401
>> skype: tdelanerolle
>> email: tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoundation.org>
>> <mailto:tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoundation.org>>
>>
>>
>>
>> --
>> Yasufumi Ogawa
>> NTT Network Service Systems Labs
>>
>>
>>
>>
>> --
>> Trishan R. de Lanerolle
>> Program Manager, Networking
>> Linux Foundation
>> voice: +1.203.699.6401
>> skype: tdelanerolle
>> email: tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoundation.org>
>
>
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag
2018-05-24 12:29 ` Ferruh Yigit
@ 2018-05-25 20:45 ` Yasufumi Ogawa
0 siblings, 0 replies; 42+ messages in thread
From: Yasufumi Ogawa @ 2018-05-25 20:45 UTC (permalink / raw)
To: Ferruh Yigit
Cc: Yasufumi Ogawa, Trishan de Lanerolle, Tim O'Driscoll,
St Leger, Jim, spp
On 2018/05/24 5:29, Ferruh Yigit wrote:
> On 5/18/2018 9:03 AM, Yasufumi Ogawa wrote:
>> On 2018/05/17 23:25, Trishan de Lanerolle wrote:
>>> Can you provide additional details on what you need clarification on?
>> Sorry for ambiguously. I meant that I need to talk with my boss about your suggestion.
>>
>> I was not sure that I should add our license if I make considerable changes, or not. But I understand that I don't need to add
>> without if I will to do. As your suggestion, we decided to not replace existing license.
>>
>> Ferruh,
>> I would like to send modified patches to not include NTT beside Intel.
> Hi Yasufumi,
>
> I have seen the new version, thank you for the update, I will get them today.
>
> And I would like to acknowledge that some of the files that NTT did lots of
> contribution. I guess concern here is introduce the copyright as part of SPDX
> work. I am OK to introduce copyright to them later as the significant
> contribution done on them.
>
> Thanks,
> ferruh
Hi Ferruh,
Thank you for your comment kindly. I think it would be better to talk
with Sy Jong or others who has responsibility for. I would like to add
NTT later if they agree with it, and I hope so.
Thanks,
Yasufumi
>
>> Thanks,
>> Yasufumi
>>> Regards,
>>> Trishan
>>>
>>>
>>> On Thu, May 17, 2018 at 3:09 AM, Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>> wrote:
>>>
>>> On 2018/05/16 23:06, Trishan de Lanerolle wrote:
>>>
>>> Hi,
>>> Thanks for bringing up the question. Generally, we recommend that SPDX license identifiers -- for existing files be
>>> thought as supplemental information to add. Don't replace the existing license information, add the tags on. Suggest
>>> reviewing the patch against that criteria. Remember to maintain the attribution information. You may want to speak to
>>> your in-house counsel with respect to any changes you would like to make to files over which you hold copyright.
>>>
>>> Regards,
>>> Trishan
>>>
>>> Hi Trishan,
>>>
>>> Thank you for your reply. I understand that I should not replace existing license info. I would like to have a talk to and
>>> confirm that it is acceptable.
>>>
>>> Regards,
>>> Yasufumi
>>>
>>>
>>>
>>> On Wed, May 16, 2018 at 5:08 AM, Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>
>>> <mailto:ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>>> wrote:
>>>
>>> On 2018/05/16 1:55, Ferruh Yigit wrote:
>>>
>>> On 5/3/2018 5:08 PM, Ferruh Yigit wrote:
>>>
>>> On 4/23/2018 7:28 AM, ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>
>>> <mailto:ogawa.yasufumi@lab.ntt.co.jp <mailto:ogawa.yasufumi@lab.ntt.co.jp>> wrote:
>>>
>>> @@ -1,34 +1,6 @@
>>> -/*-
>>> - * BSD LICENSE
>>> - *
>>> - * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
>>> + * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
>>> */
>>>
>>>
>>> Hi Ogawa-san,
>>>
>>> Thanks for taking initiative to switch spp to SPDX, appreciated.
>>>
>>> First Trishan from Linux foundation and Jim from DPDK governance board are cc'ed
>>> for input if there is any concern or more process to follow from governance
>>> point of view.
>>>
>>>
>>> The is no response, which I am taking as there is no concern and will move
>>> forward on getting patches. Please shout if there are concerns.
>>>
>>> Hi Trishan, Jim,
>>>
>>> SPP was provided originally from Intel, but currently is maintained by NTT and planed to change license to SPDX. We
>>> have
>>> made many changes on SPP and I would like to add NTT to the license only for considerably modified or newly created
>>> files by
>>> NTT. Could you give us advice if there are any concern?
>>>
>>> Thanks,
>>> Yasufumi
>>>
>>>
>>>
>>> Second these patches are both converts licensing to SPDX tag and adds ntt as
>>> copyright holder. Can we separate these two please? A patchset to convert
>>> existing licensing to SPDX as it is, and another set to add ntt.
>>>
>>>
>>> Thanks,
>>> ferruh
>>>
>>>
>>>
>>>
>>>
>>>
>>> -- Yasufumi Ogawa
>>> NTT Network Service Systems Labs
>>>
>>>
>>>
>>>
>>> --
>>> Trishan R. de Lanerolle
>>> Program Manager, Networking
>>> Linux Foundation
>>> voice: +1.203.699.6401
>>> skype: tdelanerolle
>>> email: tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoundation.org>
>>> <mailto:tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoundation.org>>
>>>
>>>
>>>
>>> --
>>> Yasufumi Ogawa
>>> NTT Network Service Systems Labs
>>>
>>>
>>>
>>>
>>> --
>>> Trishan R. de Lanerolle
>>> Program Manager, Networking
>>> Linux Foundation
>>> voice: +1.203.699.6401
>>> skype: tdelanerolle
>>> email: tdelanerolle@linuxfoundation.org <mailto:tdelanerolle@linuxfoundation.org>
>>
>
^ permalink raw reply [flat|nested] 42+ messages in thread
* [spp] [PATCH 3/7] spp_nfv: convert license to SPDX tag
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
2018-04-23 6:28 ` [spp] [PATCH 1/7] license: add bsd-3-clause text ogawa.yasufumi
2018-04-23 6:28 ` [spp] [PATCH 2/7] spp_primary: convert license to SPDX tag ogawa.yasufumi
@ 2018-04-23 6:28 ` ogawa.yasufumi
2018-04-23 6:28 ` [spp] [PATCH 4/7] controller: " ogawa.yasufumi
` (9 subsequent siblings)
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-04-23 6:28 UTC (permalink / raw)
To: ferruh.yigit, geminoa; +Cc: spp, ogawa.yasufumi
From: ogawa.yasufumi@lab.ntt.co.jp
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/nfv/Makefile | 32 ++------------------------------
src/nfv/nfv.c | 34 +++-------------------------------
2 files changed, 5 insertions(+), 61 deletions(-)
diff --git a/src/nfv/Makefile b/src/nfv/Makefile
index aab58a7..4d5eec6 100644
--- a/src/nfv/Makefile
+++ b/src/nfv/Makefile
@@ -1,33 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/nfv/nfv.c b/src/nfv/nfv.c
index f677691..e4e98ee 100644
--- a/src/nfv/nfv.c
+++ b/src/nfv/nfv.c
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <arpa/inet.h>
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH 4/7] controller: convert license to SPDX tag
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
` (2 preceding siblings ...)
2018-04-23 6:28 ` [spp] [PATCH 3/7] spp_nfv: " ogawa.yasufumi
@ 2018-04-23 6:28 ` ogawa.yasufumi
2018-04-23 6:28 ` [spp] [PATCH 5/7] spp_vm: " ogawa.yasufumi
` (8 subsequent siblings)
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-04-23 6:28 UTC (permalink / raw)
To: ferruh.yigit, geminoa; +Cc: spp, ogawa.yasufumi
From: ogawa.yasufumi@lab.ntt.co.jp
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/controller/command/hello.py | 3 ++-
src/controller/conn_thread.py | 5 +++++
src/controller/shell.py | 5 +++++
src/controller/shell_lib/common.py | 4 ++++
src/controller/spp.py | 4 +++-
src/controller/spp_common.py | 5 +++++
src/controller/topo.py | 3 ++-
src/spp.py | 4 +++-
8 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/controller/command/hello.py b/src/controller/command/hello.py
index e3d974b..418bc16 100644
--- a/src/controller/command/hello.py
+++ b/src/controller/command/hello.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
-# coding: utf-8
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
class Hello(object):
diff --git a/src/controller/conn_thread.py b/src/controller/conn_thread.py
index 039a3ad..6325843 100644
--- a/src/controller/conn_thread.py
+++ b/src/controller/conn_thread.py
@@ -1,3 +1,8 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
+
from Queue import Queue
import select
import socket
diff --git a/src/controller/shell.py b/src/controller/shell.py
index 1cf712c..e0d13ca 100644
--- a/src/controller/shell.py
+++ b/src/controller/shell.py
@@ -1,3 +1,8 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
+
import cmd
import json
import os
diff --git a/src/controller/shell_lib/common.py b/src/controller/shell_lib/common.py
index b4e8fb9..360d601 100644
--- a/src/controller/shell_lib/common.py
+++ b/src/controller/shell_lib/common.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
+
import os
diff --git a/src/controller/spp.py b/src/controller/spp.py
index d5cbf46..757a1d4 100644
--- a/src/controller/spp.py
+++ b/src/controller/spp.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
-"""Soft Patch Panel"""
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
from __future__ import print_function
diff --git a/src/controller/spp_common.py b/src/controller/spp_common.py
index b1ab60f..c507d55 100644
--- a/src/controller/spp_common.py
+++ b/src/controller/spp_common.py
@@ -1,3 +1,8 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
+
import logging
import os
from Queue import Queue
diff --git a/src/controller/topo.py b/src/controller/topo.py
index ff1349c..a09a873 100644
--- a/src/controller/topo.py
+++ b/src/controller/topo.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
-# coding: utf-8
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
import os
import re
diff --git a/src/spp.py b/src/spp.py
index c494327..f52e063 100755
--- a/src/spp.py
+++ b/src/spp.py
@@ -1,5 +1,7 @@
#!/usr/bin/env python
-# coding: utf-8
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
from controller import spp
import sys
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH 5/7] spp_vm: convert license to SPDX tag
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
` (3 preceding siblings ...)
2018-04-23 6:28 ` [spp] [PATCH 4/7] controller: " ogawa.yasufumi
@ 2018-04-23 6:28 ` ogawa.yasufumi
2018-04-23 6:28 ` [spp] [PATCH 6/7] shared: " ogawa.yasufumi
` (7 subsequent siblings)
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-04-23 6:28 UTC (permalink / raw)
To: ferruh.yigit, geminoa; +Cc: spp, ogawa.yasufumi
From: ogawa.yasufumi@lab.ntt.co.jp
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/vm/Makefile | 33 +++------------------------------
src/vm/args.c | 34 +++-------------------------------
src/vm/args.h | 34 +++-------------------------------
src/vm/init.c | 34 +++-------------------------------
src/vm/init.h | 34 +++-------------------------------
src/vm/main.c | 34 +++-------------------------------
6 files changed, 18 insertions(+), 185 deletions(-)
diff --git a/src/vm/Makefile b/src/vm/Makefile
index 8996d84..5aa1a07 100644
--- a/src/vm/Makefile
+++ b/src/vm/Makefile
@@ -1,33 +1,6 @@
-# BSD LICENSE
-#
-# Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/vm/args.c b/src/vm/args.c
index f4bf856..a90f18b 100644
--- a/src/vm/args.c
+++ b/src/vm/args.c
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <getopt.h>
diff --git a/src/vm/args.h b/src/vm/args.h
index 15243e5..eaffd36 100644
--- a/src/vm/args.h
+++ b/src/vm/args.h
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _ARGS_H_
diff --git a/src/vm/init.c b/src/vm/init.c
index fb9b7ec..7e036eb 100644
--- a/src/vm/init.c
+++ b/src/vm/init.c
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <limits.h>
diff --git a/src/vm/init.h b/src/vm/init.h
index 91f54df..1da3062 100644
--- a/src/vm/init.h
+++ b/src/vm/init.h
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _INIT_H_
diff --git a/src/vm/main.c b/src/vm/main.c
index 94ba8d1..503a03e 100644
--- a/src/vm/main.c
+++ b/src/vm/main.c
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <arpa/inet.h>
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH 6/7] shared: convert license to SPDX tag
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
` (4 preceding siblings ...)
2018-04-23 6:28 ` [spp] [PATCH 5/7] spp_vm: " ogawa.yasufumi
@ 2018-04-23 6:28 ` ogawa.yasufumi
2018-04-23 6:28 ` [spp] [PATCH 7/7] spp_vf: " ogawa.yasufumi
` (6 subsequent siblings)
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-04-23 6:28 UTC (permalink / raw)
To: ferruh.yigit, geminoa; +Cc: spp, ogawa.yasufumi
From: ogawa.yasufumi@lab.ntt.co.jp
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/shared/common.c | 34 +++-------------------------------
src/shared/common.h | 34 +++-------------------------------
2 files changed, 6 insertions(+), 62 deletions(-)
diff --git a/src/shared/common.c b/src/shared/common.c
index b11cb6d..d159770 100644
--- a/src/shared/common.c
+++ b/src/shared/common.c
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <rte_cycles.h>
diff --git a/src/shared/common.h b/src/shared/common.h
index 2dc31c9..cad88fe 100644
--- a/src/shared/common.h
+++ b/src/shared/common.h
@@ -1,34 +1,6 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMON_H_
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH 7/7] spp_vf: convert license to SPDX tag
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
` (5 preceding siblings ...)
2018-04-23 6:28 ` [spp] [PATCH 6/7] shared: " ogawa.yasufumi
@ 2018-04-23 6:28 ` ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
` (5 subsequent siblings)
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-04-23 6:28 UTC (permalink / raw)
To: ferruh.yigit, geminoa; +Cc: spp, ogawa.yasufumi
From: ogawa.yasufumi@lab.ntt.co.jp
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/spp_vf.py | 5 +++--
src/vf/Makefile | 33 ++-------------------------------
src/vf/classifier_mac.c | 34 ++--------------------------------
src/vf/classifier_mac.h | 34 ++--------------------------------
src/vf/command_conn.c | 34 ++--------------------------------
src/vf/command_conn.h | 34 ++--------------------------------
src/vf/command_dec.c | 34 ++--------------------------------
src/vf/command_dec.h | 34 ++--------------------------------
src/vf/command_proc.c | 34 ++--------------------------------
src/vf/command_proc.h | 34 ++--------------------------------
src/vf/ringlatencystats.c | 34 ++--------------------------------
src/vf/ringlatencystats.h | 34 ++--------------------------------
src/vf/spp_forward.c | 34 ++--------------------------------
src/vf/spp_forward.h | 34 ++--------------------------------
src/vf/spp_port.c | 33 ++-------------------------------
src/vf/spp_port.h | 34 +++-------------------------------
src/vf/spp_vf.c | 34 ++--------------------------------
src/vf/spp_vf.h | 34 ++--------------------------------
src/vf/string_buffer.c | 34 ++--------------------------------
src/vf/string_buffer.h | 34 ++--------------------------------
20 files changed, 42 insertions(+), 607 deletions(-)
diff --git a/src/spp_vf.py b/src/spp_vf.py
index 8c2c002..124c714 100755
--- a/src/spp_vf.py
+++ b/src/spp_vf.py
@@ -1,5 +1,6 @@
-#!/usr/bin/python
-"""Soft Patch Panel"""
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
from __future__ import print_function
from Queue import Queue
diff --git a/src/vf/Makefile b/src/vf/Makefile
index f1a1325..43d3db0 100644
--- a/src/vf/Makefile
+++ b/src/vf/Makefile
@@ -1,34 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
-# 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/vf/classifier_mac.c b/src/vf/classifier_mac.c
index d07870d..1ca788d 100644
--- a/src/vf/classifier_mac.c
+++ b/src/vf/classifier_mac.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/classifier_mac.h b/src/vf/classifier_mac.h
index af1f212..2a97dc5 100644
--- a/src/vf/classifier_mac.h
+++ b/src/vf/classifier_mac.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _CLASSIFIER_MAC_H_
diff --git a/src/vf/command_conn.c b/src/vf/command_conn.c
index d964ade..e81eda9 100644
--- a/src/vf/command_conn.c
+++ b/src/vf/command_conn.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/command_conn.h b/src/vf/command_conn.h
index 22e616e..09b19c4 100644
--- a/src/vf/command_conn.h
+++ b/src/vf/command_conn.h
@@ -1,35 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMAND_CONN_H_
diff --git a/src/vf/command_dec.c b/src/vf/command_dec.c
index 35d421a..2c7debc 100644
--- a/src/vf/command_dec.c
+++ b/src/vf/command_dec.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/command_dec.h b/src/vf/command_dec.h
index 9f7bada..0fee2e0 100644
--- a/src/vf/command_dec.h
+++ b/src/vf/command_dec.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMAND_DEC_H_
diff --git a/src/vf/command_proc.c b/src/vf/command_proc.c
index 11c7cc3..e13ae2c 100644
--- a/src/vf/command_proc.c
+++ b/src/vf/command_proc.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/command_proc.h b/src/vf/command_proc.h
index d0e5672..3a8d0cd 100644
--- a/src/vf/command_proc.h
+++ b/src/vf/command_proc.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMAND_PROC_H_
diff --git a/src/vf/ringlatencystats.c b/src/vf/ringlatencystats.c
index f7af5d6..4ad469d 100644
--- a/src/vf/ringlatencystats.c
+++ b/src/vf/ringlatencystats.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/ringlatencystats.h b/src/vf/ringlatencystats.h
index 3cb3c67..0daa7c4 100644
--- a/src/vf/ringlatencystats.h
+++ b/src/vf/ringlatencystats.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _RINGLATENCYSTATS_H_
diff --git a/src/vf/spp_forward.c b/src/vf/spp_forward.c
index bad965e..f8bd1d1 100644
--- a/src/vf/spp_forward.c
+++ b/src/vf/spp_forward.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <rte_cycles.h>
diff --git a/src/vf/spp_forward.h b/src/vf/spp_forward.h
index 4f8b5d2..526ffcb 100644
--- a/src/vf/spp_forward.h
+++ b/src/vf/spp_forward.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef __SPP_FORWARD_H__
diff --git a/src/vf/spp_port.c b/src/vf/spp_port.c
index 3c6a87c..3b96df7 100644
--- a/src/vf/spp_port.c
+++ b/src/vf/spp_port.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <rte_ether.h>
diff --git a/src/vf/spp_port.h b/src/vf/spp_port.h
index 85ba5f3..5c00233 100644
--- a/src/vf/spp_port.h
+++ b/src/vf/spp_port.h
@@ -1,35 +1,7 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
+
#ifndef __SPP_PORT_H__
#define __SPP_PORT_H__
diff --git a/src/vf/spp_vf.c b/src/vf/spp_vf.c
index fb45b83..fba9721 100644
--- a/src/vf/spp_vf.c
+++ b/src/vf/spp_vf.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <netinet/in.h>
diff --git a/src/vf/spp_vf.h b/src/vf/spp_vf.h
index fa01b85..adcfafe 100644
--- a/src/vf/spp_vf.h
+++ b/src/vf/spp_vf.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef __SPP_VF_H__
diff --git a/src/vf/string_buffer.c b/src/vf/string_buffer.c
index 605fdc5..3e1d9f5 100644
--- a/src/vf/string_buffer.c
+++ b/src/vf/string_buffer.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <stdlib.h>
diff --git a/src/vf/string_buffer.h b/src/vf/string_buffer.h
index 3f7444f..34ee6cb 100644
--- a/src/vf/string_buffer.h
+++ b/src/vf/string_buffer.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _STRING_BUFFER_H_
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 00/13] Update license to SPDX
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
` (6 preceding siblings ...)
2018-04-23 6:28 ` [spp] [PATCH 7/7] spp_vf: " ogawa.yasufumi
@ 2018-05-10 11:10 ` ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 01/13] license: add bsd-3-clause text ogawa.yasufumi
` (8 more replies)
2018-05-10 11:17 ` [spp] [PATCH v2 09/13] spp_vm: convert license to SPDX tag ogawa.yasufumi
` (4 subsequent siblings)
12 siblings, 9 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:10 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Hi Ferruh,
Thank you for your suggestion. I revised patches to separate for
changin to SPDX and adding NTT. In addition, SPP controller includes
files provided only by NTT and separated in three steps in this case
as following.
1. change to SPDX provided by only Intel
2. add SPDX license provided by only NTT
3. add NTT beside Intel for which provided by Intel and modified by NTT
It is cc'ed to Trishan and Jim.
Thanks,
Yasufumi
Yasufumi Ogawa (13):
license: add bsd-3-clause text
spp_primary: convert license to SPDX tag
spp_primary: add NTT to license description
spp_nfv: convert license to SPDX tag
spp_nfv: add NTT to license description
controller: convert license of Intel to SPDX tag
controller: add NTT SPDX tag
controller: add NTT to license description
spp_vm: convert license to SPDX tag
spp_vm: add NTT to license description
shared: convert license to SPDX tag
shared: add NTT to license description
spp_vf: convert license to SPDX tag
license/bsd-3-clause.txt | 9 +++++++++
src/controller/command/hello.py | 4 ++--
src/controller/conn_thread.py | 5 +++++
src/controller/shell.py | 5 +++++
src/controller/shell_lib/common.py | 4 ++++
src/controller/spp.py | 4 +++-
src/controller/spp_common.py | 5 +++++
src/controller/topo.py | 3 ++-
src/nfv/Makefile | 32 ++------------------------------
src/nfv/nfv.c | 34 +++-------------------------------
src/primary/Makefile | 32 ++------------------------------
src/primary/args.c | 34 +++-------------------------------
src/primary/args.h | 34 +++-------------------------------
src/primary/init.c | 34 +++-------------------------------
src/primary/init.h | 33 ++-------------------------------
src/primary/main.c | 34 +++-------------------------------
src/shared/common.c | 34 +++-------------------------------
src/shared/common.h | 34 +++-------------------------------
src/spp.py | 4 +++-
src/spp_vf.py | 5 +++--
src/vf/Makefile | 33 ++-------------------------------
src/vf/classifier_mac.c | 34 ++--------------------------------
src/vf/classifier_mac.h | 34 ++--------------------------------
src/vf/command_conn.c | 34 ++--------------------------------
src/vf/command_conn.h | 34 ++--------------------------------
src/vf/command_dec.c | 34 ++--------------------------------
src/vf/command_dec.h | 34 ++--------------------------------
src/vf/command_proc.c | 34 ++--------------------------------
src/vf/command_proc.h | 34 ++--------------------------------
src/vf/ringlatencystats.c | 34 ++--------------------------------
src/vf/ringlatencystats.h | 34 ++--------------------------------
src/vf/spp_forward.c | 34 ++--------------------------------
src/vf/spp_forward.h | 34 ++--------------------------------
src/vf/spp_port.c | 33 ++-------------------------------
src/vf/spp_port.h | 34 +++-------------------------------
src/vf/spp_vf.c | 34 ++--------------------------------
src/vf/spp_vf.h | 34 ++--------------------------------
src/vf/string_buffer.c | 34 ++--------------------------------
src/vf/string_buffer.h | 34 ++--------------------------------
src/vm/Makefile | 32 ++------------------------------
src/vm/args.c | 34 +++-------------------------------
src/vm/args.h | 34 +++-------------------------------
src/vm/init.c | 34 +++-------------------------------
src/vm/init.h | 33 ++-------------------------------
src/vm/main.c | 34 +++-------------------------------
45 files changed, 123 insertions(+), 1105 deletions(-)
create mode 100644 license/bsd-3-clause.txt
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 01/13] license: add bsd-3-clause text
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
@ 2018-05-10 11:10 ` ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 02/13] spp_primary: convert license to SPDX tag ogawa.yasufumi
` (7 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:10 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
license/bsd-3-clause.txt | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 license/bsd-3-clause.txt
diff --git a/license/bsd-3-clause.txt b/license/bsd-3-clause.txt
new file mode 100644
index 0000000..731a737
--- /dev/null
+++ b/license/bsd-3-clause.txt
@@ -0,0 +1,9 @@
+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.
+
+3. Neither the name of the copyright holder 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 HOLDER 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.
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 02/13] spp_primary: convert license to SPDX tag
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 01/13] license: add bsd-3-clause text ogawa.yasufumi
@ 2018-05-10 11:10 ` ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 03/13] spp_primary: add NTT to license description ogawa.yasufumi
` (6 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:10 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/primary/Makefile | 32 ++------------------------------
src/primary/args.c | 33 ++-------------------------------
src/primary/args.h | 33 ++-------------------------------
src/primary/init.c | 33 ++-------------------------------
src/primary/init.h | 33 ++-------------------------------
src/primary/main.c | 33 ++-------------------------------
6 files changed, 12 insertions(+), 185 deletions(-)
diff --git a/src/primary/Makefile b/src/primary/Makefile
index ec4d98b..e8a5d8d 100644
--- a/src/primary/Makefile
+++ b/src/primary/Makefile
@@ -1,33 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/primary/args.c b/src/primary/args.c
index ba7c69b..a601f85 100644
--- a/src/primary/args.c
+++ b/src/primary/args.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <getopt.h>
diff --git a/src/primary/args.h b/src/primary/args.h
index 020e848..972d0ef 100644
--- a/src/primary/args.h
+++ b/src/primary/args.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _ARGS_H_
diff --git a/src/primary/init.c b/src/primary/init.c
index 2630783..57dd909 100644
--- a/src/primary/init.c
+++ b/src/primary/init.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <limits.h>
diff --git a/src/primary/init.h b/src/primary/init.h
index 915552c..638a4e9 100644
--- a/src/primary/init.h
+++ b/src/primary/init.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _INIT_H_
diff --git a/src/primary/main.c b/src/primary/main.c
index d3feef7..7ad8f54 100644
--- a/src/primary/main.c
+++ b/src/primary/main.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <arpa/inet.h>
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 03/13] spp_primary: add NTT to license description
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 01/13] license: add bsd-3-clause text ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 02/13] spp_primary: convert license to SPDX tag ogawa.yasufumi
@ 2018-05-10 11:10 ` ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 04/13] spp_nfv: convert license to SPDX tag ogawa.yasufumi
` (5 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:10 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/primary/args.c | 1 +
src/primary/args.h | 1 +
src/primary/init.c | 1 +
src/primary/main.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/src/primary/args.c b/src/primary/args.c
index a601f85..d87fc3b 100644
--- a/src/primary/args.c
+++ b/src/primary/args.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <getopt.h>
diff --git a/src/primary/args.h b/src/primary/args.h
index 972d0ef..fbd3067 100644
--- a/src/primary/args.h
+++ b/src/primary/args.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _ARGS_H_
diff --git a/src/primary/init.c b/src/primary/init.c
index 57dd909..b0dda4e 100644
--- a/src/primary/init.c
+++ b/src/primary/init.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <limits.h>
diff --git a/src/primary/main.c b/src/primary/main.c
index 7ad8f54..1e8feb4 100644
--- a/src/primary/main.c
+++ b/src/primary/main.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <arpa/inet.h>
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 04/13] spp_nfv: convert license to SPDX tag
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
` (2 preceding siblings ...)
2018-05-10 11:10 ` [spp] [PATCH v2 03/13] spp_primary: add NTT to license description ogawa.yasufumi
@ 2018-05-10 11:10 ` ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 05/13] spp_nfv: add NTT to license description ogawa.yasufumi
` (4 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:10 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/nfv/Makefile | 32 ++------------------------------
src/nfv/nfv.c | 33 ++-------------------------------
2 files changed, 4 insertions(+), 61 deletions(-)
diff --git a/src/nfv/Makefile b/src/nfv/Makefile
index aab58a7..4d5eec6 100644
--- a/src/nfv/Makefile
+++ b/src/nfv/Makefile
@@ -1,33 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/nfv/nfv.c b/src/nfv/nfv.c
index f677691..c46afa0 100644
--- a/src/nfv/nfv.c
+++ b/src/nfv/nfv.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <arpa/inet.h>
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 05/13] spp_nfv: add NTT to license description
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
` (3 preceding siblings ...)
2018-05-10 11:10 ` [spp] [PATCH v2 04/13] spp_nfv: convert license to SPDX tag ogawa.yasufumi
@ 2018-05-10 11:10 ` ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 06/13] controller: convert license of Intel to SPDX tag ogawa.yasufumi
` (3 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:10 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/nfv/nfv.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/nfv/nfv.c b/src/nfv/nfv.c
index c46afa0..e4e98ee 100644
--- a/src/nfv/nfv.c
+++ b/src/nfv/nfv.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <arpa/inet.h>
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 06/13] controller: convert license of Intel to SPDX tag
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
` (4 preceding siblings ...)
2018-05-10 11:10 ` [spp] [PATCH v2 05/13] spp_nfv: add NTT to license description ogawa.yasufumi
@ 2018-05-10 11:10 ` ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 07/13] controller: add NTT " ogawa.yasufumi
` (2 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:10 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
To change license description of SPP controller, it must be considered
that it was originally just one file, but divided into several files
and changed to improve maintainalibity and easily extensible. In
addition, it is added some of helper methods and new classes which are
not included in the original SPP controller.
There are three cases for updating license of files.
(1) It includes only original code by Intel
(2) It include code by NTT and does not Intel's
(3) It include both of original code by Intel and added by NTT
Here is a list of all files of SPP controller and which of cases.
* src/controller/command/hello.py (2)
* src/controller/conn_thread.py (3)
* src/controller/shell.py (3)
* src/controller/shell_lib/common.py (2)
* src/controller/spp.py (3)
* src/controller/spp_common.py (3)
* src/controller/topo.py (2)
* src/spp.py (3)
Update license in three steps. First, change license to SPDX for (2)
and (3) without adding NTT. Second, add NTT to (2) and add to (3)
beside Intel finally. This is the first patch.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/controller/command/hello.py | 3 +--
src/controller/conn_thread.py | 4 ++++
src/controller/shell.py | 4 ++++
src/controller/shell_lib/common.py | 3 +++
src/controller/spp.py | 3 ++-
src/controller/spp_common.py | 4 ++++
src/controller/topo.py | 2 +-
src/spp.py | 3 ++-
8 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/controller/command/hello.py b/src/controller/command/hello.py
index e3d974b..266481b 100644
--- a/src/controller/command/hello.py
+++ b/src/controller/command/hello.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-# coding: utf-8
-
+# SPDX-License-Identifier: BSD-3-Clause
class Hello(object):
def __init__(self, name):
diff --git a/src/controller/conn_thread.py b/src/controller/conn_thread.py
index 039a3ad..e42b0e8 100644
--- a/src/controller/conn_thread.py
+++ b/src/controller/conn_thread.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+
from Queue import Queue
import select
import socket
diff --git a/src/controller/shell.py b/src/controller/shell.py
index 1cf712c..eac6aec 100644
--- a/src/controller/shell.py
+++ b/src/controller/shell.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+
import cmd
import json
import os
diff --git a/src/controller/shell_lib/common.py b/src/controller/shell_lib/common.py
index b4e8fb9..932d01c 100644
--- a/src/controller/shell_lib/common.py
+++ b/src/controller/shell_lib/common.py
@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+
import os
diff --git a/src/controller/spp.py b/src/controller/spp.py
index d5cbf46..9c13d59 100644
--- a/src/controller/spp.py
+++ b/src/controller/spp.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
-"""Soft Patch Panel"""
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
from __future__ import print_function
diff --git a/src/controller/spp_common.py b/src/controller/spp_common.py
index b1ab60f..d89461b 100644
--- a/src/controller/spp_common.py
+++ b/src/controller/spp_common.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+
import logging
import os
from Queue import Queue
diff --git a/src/controller/topo.py b/src/controller/topo.py
index ff1349c..49effca 100644
--- a/src/controller/topo.py
+++ b/src/controller/topo.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# coding: utf-8
+# SPDX-License-Identifier: BSD-3-Clause
import os
import re
diff --git a/src/spp.py b/src/spp.py
index c494327..5c63924 100755
--- a/src/spp.py
+++ b/src/spp.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
-# coding: utf-8
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
from controller import spp
import sys
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 07/13] controller: add NTT SPDX tag
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
` (5 preceding siblings ...)
2018-05-10 11:10 ` [spp] [PATCH v2 06/13] controller: convert license of Intel to SPDX tag ogawa.yasufumi
@ 2018-05-10 11:10 ` ogawa.yasufumi
2018-05-10 11:10 ` [spp] [PATCH v2 08/13] controller: add NTT to license description ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:10 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
This is the second patch for updating license of SPP controller. It is
for adding NTT's SPDX tag to files which are provided by NTT.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/controller/command/hello.py | 1 +
src/controller/shell_lib/common.py | 1 +
src/controller/topo.py | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/controller/command/hello.py b/src/controller/command/hello.py
index 266481b..905f476 100644
--- a/src/controller/command/hello.py
+++ b/src/controller/command/hello.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
class Hello(object):
def __init__(self, name):
diff --git a/src/controller/shell_lib/common.py b/src/controller/shell_lib/common.py
index 932d01c..360d601 100644
--- a/src/controller/shell_lib/common.py
+++ b/src/controller/shell_lib/common.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
import os
diff --git a/src/controller/topo.py b/src/controller/topo.py
index 49effca..a09a873 100644
--- a/src/controller/topo.py
+++ b/src/controller/topo.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
import os
import re
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 08/13] controller: add NTT to license description
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
` (6 preceding siblings ...)
2018-05-10 11:10 ` [spp] [PATCH v2 07/13] controller: add NTT " ogawa.yasufumi
@ 2018-05-10 11:10 ` ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:10 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
This is the final patch for updating license of SPP controller to add
NTT beside Intel.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/controller/conn_thread.py | 1 +
src/controller/shell.py | 1 +
src/controller/spp.py | 1 +
src/controller/spp_common.py | 1 +
src/spp.py | 1 +
5 files changed, 5 insertions(+)
diff --git a/src/controller/conn_thread.py b/src/controller/conn_thread.py
index e42b0e8..6325843 100644
--- a/src/controller/conn_thread.py
+++ b/src/controller/conn_thread.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
from Queue import Queue
import select
diff --git a/src/controller/shell.py b/src/controller/shell.py
index eac6aec..e0d13ca 100644
--- a/src/controller/shell.py
+++ b/src/controller/shell.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
import cmd
import json
diff --git a/src/controller/spp.py b/src/controller/spp.py
index 9c13d59..757a1d4 100644
--- a/src/controller/spp.py
+++ b/src/controller/spp.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
from __future__ import print_function
diff --git a/src/controller/spp_common.py b/src/controller/spp_common.py
index d89461b..c507d55 100644
--- a/src/controller/spp_common.py
+++ b/src/controller/spp_common.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
import logging
import os
diff --git a/src/spp.py b/src/spp.py
index 5c63924..f52e063 100755
--- a/src/spp.py
+++ b/src/spp.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2015-2016 Intel Corporation
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
from controller import spp
import sys
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v3 0/8] Update license to SPDX
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
` (7 preceding siblings ...)
2018-05-10 11:10 ` [spp] [PATCH v2 08/13] controller: add NTT to license description ogawa.yasufumi
@ 2018-05-23 20:05 ` ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 1/8] license: add bsd-3-clause text ogawa.yasufumi
` (8 more replies)
8 siblings, 9 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-23 20:05 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Hi,
It is version 3 of license update. This update is to not change
existing copylight holder.
> Thank you for your suggestion. I revised patches to separate for
> changin to SPDX and adding NTT. In addition, SPP controller includes
> files provided only by NTT and separated in three steps in this case
> as following.
>
> 1. change to SPDX provided by only Intel
> 2. add SPDX license provided by only NTT
> 3. add NTT beside Intel for which provided by Intel and modified by NTT
In this update, item 3 is removed from version 2.
Thanks,
Yasufumi
Yasufumi Ogawa (8):
license: add bsd-3-clause text
spp_primary: convert license to SPDX tag
spp_nfv: convert license to SPDX tag
controller: convert license of Intel to SPDX tag
controller: add NTT SPDX tag
spp_vm: convert license to SPDX tag
shared: convert license to SPDX tag
spp_vf: convert license to SPDX tag
license/bsd-3-clause.txt | 9 ++++++++
src/controller/command/hello.py | 4 ++--
src/controller/conn_thread.py | 4 ++++
src/controller/shell.py | 4 ++++
src/controller/shell_lib/common.py | 4 ++++
src/controller/spp.py | 3 ++-
src/controller/spp_common.py | 4 ++++
src/controller/topo.py | 3 ++-
src/nfv/Makefile | 32 ++--------------------------
src/nfv/nfv.c | 33 ++---------------------------
src/primary/Makefile | 32 ++--------------------------
src/primary/args.c | 33 ++---------------------------
src/primary/args.h | 33 ++---------------------------
src/primary/init.c | 33 ++---------------------------
src/primary/init.h | 33 ++---------------------------
src/primary/main.c | 33 ++---------------------------
src/shared/common.c | 33 ++---------------------------
src/shared/common.h | 33 ++---------------------------
src/spp.py | 3 ++-
src/spp_vf.py | 5 +++--
src/vf/Makefile | 33 ++---------------------------
src/vf/classifier_mac.c | 34 ++----------------------------
src/vf/classifier_mac.h | 34 ++----------------------------
src/vf/command_conn.c | 34 ++----------------------------
src/vf/command_conn.h | 34 ++----------------------------
src/vf/command_dec.c | 34 ++----------------------------
src/vf/command_dec.h | 34 ++----------------------------
src/vf/command_proc.c | 34 ++----------------------------
src/vf/command_proc.h | 34 ++----------------------------
src/vf/ringlatencystats.c | 34 ++----------------------------
src/vf/ringlatencystats.h | 34 ++----------------------------
src/vf/spp_forward.c | 34 ++----------------------------
src/vf/spp_forward.h | 34 ++----------------------------
src/vf/spp_port.c | 33 ++---------------------------
src/vf/spp_port.h | 34 +++---------------------------
src/vf/spp_vf.c | 34 ++----------------------------
src/vf/spp_vf.h | 34 ++----------------------------
src/vf/string_buffer.c | 34 ++----------------------------
src/vf/string_buffer.h | 34 ++----------------------------
src/vm/Makefile | 32 ++--------------------------
src/vm/args.c | 33 ++---------------------------
src/vm/args.h | 33 ++---------------------------
src/vm/init.c | 33 ++---------------------------
src/vm/init.h | 33 ++---------------------------
src/vm/main.c | 33 ++---------------------------
45 files changed, 107 insertions(+), 1105 deletions(-)
create mode 100644 license/bsd-3-clause.txt
--
2.17.0
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v3 1/8] license: add bsd-3-clause text
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
@ 2018-05-23 20:05 ` ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 2/8] spp_primary: convert license to SPDX tag ogawa.yasufumi
` (7 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-23 20:05 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
license/bsd-3-clause.txt | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 license/bsd-3-clause.txt
diff --git a/license/bsd-3-clause.txt b/license/bsd-3-clause.txt
new file mode 100644
index 0000000..731a737
--- /dev/null
+++ b/license/bsd-3-clause.txt
@@ -0,0 +1,9 @@
+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.
+
+3. Neither the name of the copyright holder 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 HOLDER 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.
--
2.17.0
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v3 2/8] spp_primary: convert license to SPDX tag
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 1/8] license: add bsd-3-clause text ogawa.yasufumi
@ 2018-05-23 20:05 ` ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 3/8] spp_nfv: " ogawa.yasufumi
` (6 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-23 20:05 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/primary/Makefile | 32 ++------------------------------
src/primary/args.c | 33 ++-------------------------------
src/primary/args.h | 33 ++-------------------------------
src/primary/init.c | 33 ++-------------------------------
src/primary/init.h | 33 ++-------------------------------
src/primary/main.c | 33 ++-------------------------------
6 files changed, 12 insertions(+), 185 deletions(-)
diff --git a/src/primary/Makefile b/src/primary/Makefile
index ec4d98b..e8a5d8d 100644
--- a/src/primary/Makefile
+++ b/src/primary/Makefile
@@ -1,33 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/primary/args.c b/src/primary/args.c
index ba7c69b..a601f85 100644
--- a/src/primary/args.c
+++ b/src/primary/args.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <getopt.h>
diff --git a/src/primary/args.h b/src/primary/args.h
index 020e848..972d0ef 100644
--- a/src/primary/args.h
+++ b/src/primary/args.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _ARGS_H_
diff --git a/src/primary/init.c b/src/primary/init.c
index 2630783..57dd909 100644
--- a/src/primary/init.c
+++ b/src/primary/init.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <limits.h>
diff --git a/src/primary/init.h b/src/primary/init.h
index 915552c..638a4e9 100644
--- a/src/primary/init.h
+++ b/src/primary/init.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _INIT_H_
diff --git a/src/primary/main.c b/src/primary/main.c
index d3feef7..7ad8f54 100644
--- a/src/primary/main.c
+++ b/src/primary/main.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <arpa/inet.h>
--
2.17.0
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v3 3/8] spp_nfv: convert license to SPDX tag
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 1/8] license: add bsd-3-clause text ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 2/8] spp_primary: convert license to SPDX tag ogawa.yasufumi
@ 2018-05-23 20:05 ` ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 4/8] controller: convert license of Intel " ogawa.yasufumi
` (5 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-23 20:05 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/nfv/Makefile | 32 ++------------------------------
src/nfv/nfv.c | 33 ++-------------------------------
2 files changed, 4 insertions(+), 61 deletions(-)
diff --git a/src/nfv/Makefile b/src/nfv/Makefile
index aab58a7..4d5eec6 100644
--- a/src/nfv/Makefile
+++ b/src/nfv/Makefile
@@ -1,33 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/nfv/nfv.c b/src/nfv/nfv.c
index f677691..c46afa0 100644
--- a/src/nfv/nfv.c
+++ b/src/nfv/nfv.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <arpa/inet.h>
--
2.17.0
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v3 4/8] controller: convert license of Intel to SPDX tag
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
` (2 preceding siblings ...)
2018-05-23 20:05 ` [spp] [PATCH v3 3/8] spp_nfv: " ogawa.yasufumi
@ 2018-05-23 20:05 ` ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 5/8] controller: add NTT " ogawa.yasufumi
` (4 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-23 20:05 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
To change license description of SPP controller, it must be considered
that it was originally just one file, but divided into several files
and changed to improve maintainalibity and easily extensible.
Here is a list of all files of SPP controller. (1) is provided by Intel
and (2) is NTT.
* src/controller/command/hello.py (2)
* src/controller/conn_thread.py (1)
* src/controller/shell.py (1)
* src/controller/shell_lib/common.py (2)
* src/controller/spp.py (1)
* src/controller/spp_common.py (1)
* src/controller/topo.py (2)
* src/spp.py (1)
Updating license is divided in two steps. First, update for Intel and
then NTT. This is the first patch.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/controller/command/hello.py | 3 +--
src/controller/conn_thread.py | 4 ++++
src/controller/shell.py | 4 ++++
src/controller/shell_lib/common.py | 3 +++
src/controller/spp.py | 3 ++-
src/controller/spp_common.py | 4 ++++
src/controller/topo.py | 2 +-
src/spp.py | 3 ++-
8 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/controller/command/hello.py b/src/controller/command/hello.py
index e3d974b..266481b 100644
--- a/src/controller/command/hello.py
+++ b/src/controller/command/hello.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-# coding: utf-8
-
+# SPDX-License-Identifier: BSD-3-Clause
class Hello(object):
def __init__(self, name):
diff --git a/src/controller/conn_thread.py b/src/controller/conn_thread.py
index 039a3ad..e42b0e8 100644
--- a/src/controller/conn_thread.py
+++ b/src/controller/conn_thread.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+
from Queue import Queue
import select
import socket
diff --git a/src/controller/shell.py b/src/controller/shell.py
index 1cf712c..eac6aec 100644
--- a/src/controller/shell.py
+++ b/src/controller/shell.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+
import cmd
import json
import os
diff --git a/src/controller/shell_lib/common.py b/src/controller/shell_lib/common.py
index b4e8fb9..932d01c 100644
--- a/src/controller/shell_lib/common.py
+++ b/src/controller/shell_lib/common.py
@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+
import os
diff --git a/src/controller/spp.py b/src/controller/spp.py
index d5cbf46..9c13d59 100644
--- a/src/controller/spp.py
+++ b/src/controller/spp.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
-"""Soft Patch Panel"""
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
from __future__ import print_function
diff --git a/src/controller/spp_common.py b/src/controller/spp_common.py
index b1ab60f..d89461b 100644
--- a/src/controller/spp_common.py
+++ b/src/controller/spp_common.py
@@ -1,3 +1,7 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
+
import logging
import os
from Queue import Queue
diff --git a/src/controller/topo.py b/src/controller/topo.py
index ff1349c..49effca 100644
--- a/src/controller/topo.py
+++ b/src/controller/topo.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# coding: utf-8
+# SPDX-License-Identifier: BSD-3-Clause
import os
import re
diff --git a/src/spp.py b/src/spp.py
index c494327..5c63924 100755
--- a/src/spp.py
+++ b/src/spp.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
-# coding: utf-8
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2015-2016 Intel Corporation
from controller import spp
import sys
--
2.17.0
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v3 5/8] controller: add NTT SPDX tag
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
` (3 preceding siblings ...)
2018-05-23 20:05 ` [spp] [PATCH v3 4/8] controller: convert license of Intel " ogawa.yasufumi
@ 2018-05-23 20:05 ` ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 6/8] spp_vm: convert license to " ogawa.yasufumi
` (3 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-23 20:05 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
This is the second patch for updating license of SPP controller. It is
for adding NTT's SPDX tag to files which are provided by NTT.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/controller/command/hello.py | 1 +
src/controller/shell_lib/common.py | 1 +
src/controller/topo.py | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/controller/command/hello.py b/src/controller/command/hello.py
index 266481b..905f476 100644
--- a/src/controller/command/hello.py
+++ b/src/controller/command/hello.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
class Hello(object):
def __init__(self, name):
diff --git a/src/controller/shell_lib/common.py b/src/controller/shell_lib/common.py
index 932d01c..360d601 100644
--- a/src/controller/shell_lib/common.py
+++ b/src/controller/shell_lib/common.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
import os
diff --git a/src/controller/topo.py b/src/controller/topo.py
index 49effca..a09a873 100644
--- a/src/controller/topo.py
+++ b/src/controller/topo.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
import os
import re
--
2.17.0
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v3 6/8] spp_vm: convert license to SPDX tag
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
` (4 preceding siblings ...)
2018-05-23 20:05 ` [spp] [PATCH v3 5/8] controller: add NTT " ogawa.yasufumi
@ 2018-05-23 20:05 ` ogawa.yasufumi
2018-05-23 20:05 ` [spp] [PATCH v3 7/8] shared: " ogawa.yasufumi
` (2 subsequent siblings)
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-23 20:05 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/vm/Makefile | 32 ++------------------------------
src/vm/args.c | 33 ++-------------------------------
src/vm/args.h | 33 ++-------------------------------
src/vm/init.c | 33 ++-------------------------------
src/vm/init.h | 33 ++-------------------------------
src/vm/main.c | 33 ++-------------------------------
6 files changed, 12 insertions(+), 185 deletions(-)
diff --git a/src/vm/Makefile b/src/vm/Makefile
index 8996d84..e096012 100644
--- a/src/vm/Makefile
+++ b/src/vm/Makefile
@@ -1,33 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/vm/args.c b/src/vm/args.c
index f4bf856..4ae0e33 100644
--- a/src/vm/args.c
+++ b/src/vm/args.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <getopt.h>
diff --git a/src/vm/args.h b/src/vm/args.h
index 15243e5..d675ba5 100644
--- a/src/vm/args.h
+++ b/src/vm/args.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _ARGS_H_
diff --git a/src/vm/init.c b/src/vm/init.c
index fb9b7ec..60d0097 100644
--- a/src/vm/init.c
+++ b/src/vm/init.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <limits.h>
diff --git a/src/vm/init.h b/src/vm/init.h
index 91f54df..6837873 100644
--- a/src/vm/init.h
+++ b/src/vm/init.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _INIT_H_
diff --git a/src/vm/main.c b/src/vm/main.c
index 94ba8d1..d105167 100644
--- a/src/vm/main.c
+++ b/src/vm/main.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <arpa/inet.h>
--
2.17.0
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v3 7/8] shared: convert license to SPDX tag
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
` (5 preceding siblings ...)
2018-05-23 20:05 ` [spp] [PATCH v3 6/8] spp_vm: convert license to " ogawa.yasufumi
@ 2018-05-23 20:05 ` ogawa.yasufumi
2018-05-23 20:06 ` [spp] [PATCH v3 8/8] spp_vf: " ogawa.yasufumi
2018-05-24 12:37 ` [spp] [PATCH v3 0/8] Update license to SPDX Ferruh Yigit
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-23 20:05 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/shared/common.c | 33 ++-------------------------------
src/shared/common.h | 33 ++-------------------------------
2 files changed, 4 insertions(+), 62 deletions(-)
diff --git a/src/shared/common.c b/src/shared/common.c
index b11cb6d..ad99d82 100644
--- a/src/shared/common.c
+++ b/src/shared/common.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <rte_cycles.h>
diff --git a/src/shared/common.h b/src/shared/common.h
index 2dc31c9..7212b17 100644
--- a/src/shared/common.h
+++ b/src/shared/common.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _COMMON_H_
--
2.17.0
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v3 8/8] spp_vf: convert license to SPDX tag
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
` (6 preceding siblings ...)
2018-05-23 20:05 ` [spp] [PATCH v3 7/8] shared: " ogawa.yasufumi
@ 2018-05-23 20:06 ` ogawa.yasufumi
2018-05-24 12:37 ` [spp] [PATCH v3 0/8] Update license to SPDX Ferruh Yigit
8 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-23 20:06 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/spp_vf.py | 5 +++--
src/vf/Makefile | 33 ++-------------------------------
src/vf/classifier_mac.c | 34 ++--------------------------------
src/vf/classifier_mac.h | 34 ++--------------------------------
src/vf/command_conn.c | 34 ++--------------------------------
src/vf/command_conn.h | 34 ++--------------------------------
src/vf/command_dec.c | 34 ++--------------------------------
src/vf/command_dec.h | 34 ++--------------------------------
src/vf/command_proc.c | 34 ++--------------------------------
src/vf/command_proc.h | 34 ++--------------------------------
src/vf/ringlatencystats.c | 34 ++--------------------------------
src/vf/ringlatencystats.h | 34 ++--------------------------------
src/vf/spp_forward.c | 34 ++--------------------------------
src/vf/spp_forward.h | 34 ++--------------------------------
src/vf/spp_port.c | 33 ++-------------------------------
src/vf/spp_port.h | 34 +++-------------------------------
src/vf/spp_vf.c | 34 ++--------------------------------
src/vf/spp_vf.h | 34 ++--------------------------------
src/vf/string_buffer.c | 34 ++--------------------------------
src/vf/string_buffer.h | 34 ++--------------------------------
20 files changed, 42 insertions(+), 607 deletions(-)
diff --git a/src/spp_vf.py b/src/spp_vf.py
index 8c2c002..124c714 100755
--- a/src/spp_vf.py
+++ b/src/spp_vf.py
@@ -1,5 +1,6 @@
-#!/usr/bin/python
-"""Soft Patch Panel"""
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
from __future__ import print_function
from Queue import Queue
diff --git a/src/vf/Makefile b/src/vf/Makefile
index f1a1325..43d3db0 100644
--- a/src/vf/Makefile
+++ b/src/vf/Makefile
@@ -1,34 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
-# 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/vf/classifier_mac.c b/src/vf/classifier_mac.c
index d07870d..1ca788d 100644
--- a/src/vf/classifier_mac.c
+++ b/src/vf/classifier_mac.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/classifier_mac.h b/src/vf/classifier_mac.h
index af1f212..2a97dc5 100644
--- a/src/vf/classifier_mac.h
+++ b/src/vf/classifier_mac.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _CLASSIFIER_MAC_H_
diff --git a/src/vf/command_conn.c b/src/vf/command_conn.c
index d964ade..e81eda9 100644
--- a/src/vf/command_conn.c
+++ b/src/vf/command_conn.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/command_conn.h b/src/vf/command_conn.h
index 22e616e..09b19c4 100644
--- a/src/vf/command_conn.h
+++ b/src/vf/command_conn.h
@@ -1,35 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMAND_CONN_H_
diff --git a/src/vf/command_dec.c b/src/vf/command_dec.c
index 35d421a..2c7debc 100644
--- a/src/vf/command_dec.c
+++ b/src/vf/command_dec.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/command_dec.h b/src/vf/command_dec.h
index f9d2120..e7cbc8b 100644
--- a/src/vf/command_dec.h
+++ b/src/vf/command_dec.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMAND_DEC_H_
diff --git a/src/vf/command_proc.c b/src/vf/command_proc.c
index 11c7cc3..e13ae2c 100644
--- a/src/vf/command_proc.c
+++ b/src/vf/command_proc.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/command_proc.h b/src/vf/command_proc.h
index d0e5672..3a8d0cd 100644
--- a/src/vf/command_proc.h
+++ b/src/vf/command_proc.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMAND_PROC_H_
diff --git a/src/vf/ringlatencystats.c b/src/vf/ringlatencystats.c
index f7af5d6..4ad469d 100644
--- a/src/vf/ringlatencystats.c
+++ b/src/vf/ringlatencystats.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/ringlatencystats.h b/src/vf/ringlatencystats.h
index 3cb3c67..0daa7c4 100644
--- a/src/vf/ringlatencystats.h
+++ b/src/vf/ringlatencystats.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _RINGLATENCYSTATS_H_
diff --git a/src/vf/spp_forward.c b/src/vf/spp_forward.c
index bad965e..f8bd1d1 100644
--- a/src/vf/spp_forward.c
+++ b/src/vf/spp_forward.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <rte_cycles.h>
diff --git a/src/vf/spp_forward.h b/src/vf/spp_forward.h
index 4f8b5d2..526ffcb 100644
--- a/src/vf/spp_forward.h
+++ b/src/vf/spp_forward.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef __SPP_FORWARD_H__
diff --git a/src/vf/spp_port.c b/src/vf/spp_port.c
index 3c6a87c..3b96df7 100644
--- a/src/vf/spp_port.c
+++ b/src/vf/spp_port.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <rte_ether.h>
diff --git a/src/vf/spp_port.h b/src/vf/spp_port.h
index 85ba5f3..5c00233 100644
--- a/src/vf/spp_port.h
+++ b/src/vf/spp_port.h
@@ -1,35 +1,7 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
+
#ifndef __SPP_PORT_H__
#define __SPP_PORT_H__
diff --git a/src/vf/spp_vf.c b/src/vf/spp_vf.c
index fb45b83..fba9721 100644
--- a/src/vf/spp_vf.c
+++ b/src/vf/spp_vf.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <netinet/in.h>
diff --git a/src/vf/spp_vf.h b/src/vf/spp_vf.h
index fa01b85..adcfafe 100644
--- a/src/vf/spp_vf.h
+++ b/src/vf/spp_vf.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef __SPP_VF_H__
diff --git a/src/vf/string_buffer.c b/src/vf/string_buffer.c
index 605fdc5..3e1d9f5 100644
--- a/src/vf/string_buffer.c
+++ b/src/vf/string_buffer.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <stdlib.h>
diff --git a/src/vf/string_buffer.h b/src/vf/string_buffer.h
index 3f7444f..34ee6cb 100644
--- a/src/vf/string_buffer.h
+++ b/src/vf/string_buffer.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _STRING_BUFFER_H_
--
2.17.0
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [spp] [PATCH v3 0/8] Update license to SPDX
2018-05-23 20:05 ` [spp] [PATCH v3 0/8] Update license to SPDX ogawa.yasufumi
` (7 preceding siblings ...)
2018-05-23 20:06 ` [spp] [PATCH v3 8/8] spp_vf: " ogawa.yasufumi
@ 2018-05-24 12:37 ` Ferruh Yigit
2018-05-24 12:42 ` Ferruh Yigit
8 siblings, 1 reply; 42+ messages in thread
From: Ferruh Yigit @ 2018-05-24 12:37 UTC (permalink / raw)
To: ogawa.yasufumi; +Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger
On 5/23/2018 9:05 PM, ogawa.yasufumi@lab.ntt.co.jp wrote:
> From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
>
> Hi,
>
> It is version 3 of license update. This update is to not change
> existing copylight holder.
>
>> Thank you for your suggestion. I revised patches to separate for
>> changin to SPDX and adding NTT. In addition, SPP controller includes
>> files provided only by NTT and separated in three steps in this case
>> as following.
>>
>> 1. change to SPDX provided by only Intel
>> 2. add SPDX license provided by only NTT
>> 3. add NTT beside Intel for which provided by Intel and modified by NTT
> In this update, item 3 is removed from version 2.
>
> Thanks,
> Yasufumi
>
> Yasufumi Ogawa (8):
> license: add bsd-3-clause text
> spp_primary: convert license to SPDX tag
> spp_nfv: convert license to SPDX tag
> controller: convert license of Intel to SPDX tag
> controller: add NTT SPDX tag
> spp_vm: convert license to SPDX tag
> shared: convert license to SPDX tag
> spp_vf: convert license to SPDX tag
For series, Intel related parts,
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
^ permalink raw reply [flat|nested] 42+ messages in thread
* [spp] [PATCH v2 09/13] spp_vm: convert license to SPDX tag
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
` (7 preceding siblings ...)
2018-05-10 11:10 ` [spp] [PATCH v2 00/13] Update license to SPDX ogawa.yasufumi
@ 2018-05-10 11:17 ` ogawa.yasufumi
2018-05-10 11:17 ` [spp] [PATCH v2 10/13] spp_vm: add NTT to license description ogawa.yasufumi
` (3 subsequent siblings)
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:17 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/vm/Makefile | 32 ++------------------------------
src/vm/args.c | 33 ++-------------------------------
src/vm/args.h | 33 ++-------------------------------
src/vm/init.c | 33 ++-------------------------------
src/vm/init.h | 33 ++-------------------------------
src/vm/main.c | 33 ++-------------------------------
6 files changed, 12 insertions(+), 185 deletions(-)
diff --git a/src/vm/Makefile b/src/vm/Makefile
index 8996d84..e096012 100644
--- a/src/vm/Makefile
+++ b/src/vm/Makefile
@@ -1,33 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/vm/args.c b/src/vm/args.c
index f4bf856..4ae0e33 100644
--- a/src/vm/args.c
+++ b/src/vm/args.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <getopt.h>
diff --git a/src/vm/args.h b/src/vm/args.h
index 15243e5..d675ba5 100644
--- a/src/vm/args.h
+++ b/src/vm/args.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _ARGS_H_
diff --git a/src/vm/init.c b/src/vm/init.c
index fb9b7ec..60d0097 100644
--- a/src/vm/init.c
+++ b/src/vm/init.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <limits.h>
diff --git a/src/vm/init.h b/src/vm/init.h
index 91f54df..6837873 100644
--- a/src/vm/init.h
+++ b/src/vm/init.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _INIT_H_
diff --git a/src/vm/main.c b/src/vm/main.c
index 94ba8d1..d105167 100644
--- a/src/vm/main.c
+++ b/src/vm/main.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <arpa/inet.h>
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 10/13] spp_vm: add NTT to license description
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
` (8 preceding siblings ...)
2018-05-10 11:17 ` [spp] [PATCH v2 09/13] spp_vm: convert license to SPDX tag ogawa.yasufumi
@ 2018-05-10 11:17 ` ogawa.yasufumi
2018-05-10 11:18 ` [spp] [PATCH v2 11/13] shared: convert license to SPDX tag ogawa.yasufumi
` (2 subsequent siblings)
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:17 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/vm/args.c | 1 +
src/vm/args.h | 1 +
src/vm/init.c | 1 +
src/vm/main.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/src/vm/args.c b/src/vm/args.c
index 4ae0e33..a90f18b 100644
--- a/src/vm/args.c
+++ b/src/vm/args.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <getopt.h>
diff --git a/src/vm/args.h b/src/vm/args.h
index d675ba5..eaffd36 100644
--- a/src/vm/args.h
+++ b/src/vm/args.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _ARGS_H_
diff --git a/src/vm/init.c b/src/vm/init.c
index 60d0097..7e036eb 100644
--- a/src/vm/init.c
+++ b/src/vm/init.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <limits.h>
diff --git a/src/vm/main.c b/src/vm/main.c
index d105167..503a03e 100644
--- a/src/vm/main.c
+++ b/src/vm/main.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <arpa/inet.h>
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 11/13] shared: convert license to SPDX tag
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
` (9 preceding siblings ...)
2018-05-10 11:17 ` [spp] [PATCH v2 10/13] spp_vm: add NTT to license description ogawa.yasufumi
@ 2018-05-10 11:18 ` ogawa.yasufumi
2018-05-10 11:18 ` [spp] [PATCH v2 12/13] shared: add NTT to license description ogawa.yasufumi
2018-05-10 11:19 ` [spp] [PATCH v2 13/13] spp_vf: convert license to SPDX tag ogawa.yasufumi
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:18 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/shared/common.c | 33 ++-------------------------------
src/shared/common.h | 33 ++-------------------------------
2 files changed, 4 insertions(+), 62 deletions(-)
diff --git a/src/shared/common.c b/src/shared/common.c
index b11cb6d..ad99d82 100644
--- a/src/shared/common.c
+++ b/src/shared/common.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#include <rte_cycles.h>
diff --git a/src/shared/common.h b/src/shared/common.h
index 2dc31c9..7212b17 100644
--- a/src/shared/common.h
+++ b/src/shared/common.h
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2015-2016 Intel Corporation
*/
#ifndef _COMMON_H_
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 12/13] shared: add NTT to license description
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
` (10 preceding siblings ...)
2018-05-10 11:18 ` [spp] [PATCH v2 11/13] shared: convert license to SPDX tag ogawa.yasufumi
@ 2018-05-10 11:18 ` ogawa.yasufumi
2018-05-10 11:19 ` [spp] [PATCH v2 13/13] spp_vf: convert license to SPDX tag ogawa.yasufumi
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:18 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/shared/common.c | 1 +
src/shared/common.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/shared/common.c b/src/shared/common.c
index ad99d82..d159770 100644
--- a/src/shared/common.c
+++ b/src/shared/common.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <rte_cycles.h>
diff --git a/src/shared/common.h b/src/shared/common.h
index 7212b17..cad88fe 100644
--- a/src/shared/common.h
+++ b/src/shared/common.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015-2016 Intel Corporation
+ * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMON_H_
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread* [spp] [PATCH v2 13/13] spp_vf: convert license to SPDX tag
2018-04-23 6:28 [spp] [PATCH 0/7] Update licence to SPDX ogawa.yasufumi
` (11 preceding siblings ...)
2018-05-10 11:18 ` [spp] [PATCH v2 12/13] shared: add NTT to license description ogawa.yasufumi
@ 2018-05-10 11:19 ` ogawa.yasufumi
12 siblings, 0 replies; 42+ messages in thread
From: ogawa.yasufumi @ 2018-05-10 11:19 UTC (permalink / raw)
To: ferruh.yigit
Cc: spp, tdelanerolle, tim.odriscoll, jim.st.leger, Yasufumi Ogawa
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/spp_vf.py | 5 +++--
src/vf/Makefile | 33 ++-------------------------------
src/vf/classifier_mac.c | 34 ++--------------------------------
src/vf/classifier_mac.h | 34 ++--------------------------------
src/vf/command_conn.c | 34 ++--------------------------------
src/vf/command_conn.h | 34 ++--------------------------------
src/vf/command_dec.c | 34 ++--------------------------------
src/vf/command_dec.h | 34 ++--------------------------------
src/vf/command_proc.c | 34 ++--------------------------------
src/vf/command_proc.h | 34 ++--------------------------------
src/vf/ringlatencystats.c | 34 ++--------------------------------
src/vf/ringlatencystats.h | 34 ++--------------------------------
src/vf/spp_forward.c | 34 ++--------------------------------
src/vf/spp_forward.h | 34 ++--------------------------------
src/vf/spp_port.c | 33 ++-------------------------------
src/vf/spp_port.h | 34 +++-------------------------------
src/vf/spp_vf.c | 34 ++--------------------------------
src/vf/spp_vf.h | 34 ++--------------------------------
src/vf/string_buffer.c | 34 ++--------------------------------
src/vf/string_buffer.h | 34 ++--------------------------------
20 files changed, 42 insertions(+), 607 deletions(-)
diff --git a/src/spp_vf.py b/src/spp_vf.py
index 8c2c002..124c714 100755
--- a/src/spp_vf.py
+++ b/src/spp_vf.py
@@ -1,5 +1,6 @@
-#!/usr/bin/python
-"""Soft Patch Panel"""
+#!/usr/bin/env python
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation
from __future__ import print_function
from Queue import Queue
diff --git a/src/vf/Makefile b/src/vf/Makefile
index f1a1325..43d3db0 100644
--- a/src/vf/Makefile
+++ b/src/vf/Makefile
@@ -1,34 +1,5 @@
-# BSD LICENSE
-#
-# Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
-# 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
diff --git a/src/vf/classifier_mac.c b/src/vf/classifier_mac.c
index d07870d..1ca788d 100644
--- a/src/vf/classifier_mac.c
+++ b/src/vf/classifier_mac.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/classifier_mac.h b/src/vf/classifier_mac.h
index af1f212..2a97dc5 100644
--- a/src/vf/classifier_mac.h
+++ b/src/vf/classifier_mac.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _CLASSIFIER_MAC_H_
diff --git a/src/vf/command_conn.c b/src/vf/command_conn.c
index d964ade..e81eda9 100644
--- a/src/vf/command_conn.c
+++ b/src/vf/command_conn.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/command_conn.h b/src/vf/command_conn.h
index 22e616e..09b19c4 100644
--- a/src/vf/command_conn.h
+++ b/src/vf/command_conn.h
@@ -1,35 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMAND_CONN_H_
diff --git a/src/vf/command_dec.c b/src/vf/command_dec.c
index 35d421a..2c7debc 100644
--- a/src/vf/command_dec.c
+++ b/src/vf/command_dec.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/command_dec.h b/src/vf/command_dec.h
index f9d2120..e7cbc8b 100644
--- a/src/vf/command_dec.h
+++ b/src/vf/command_dec.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMAND_DEC_H_
diff --git a/src/vf/command_proc.c b/src/vf/command_proc.c
index 11c7cc3..e13ae2c 100644
--- a/src/vf/command_proc.c
+++ b/src/vf/command_proc.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/command_proc.h b/src/vf/command_proc.h
index d0e5672..3a8d0cd 100644
--- a/src/vf/command_proc.h
+++ b/src/vf/command_proc.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _COMMAND_PROC_H_
diff --git a/src/vf/ringlatencystats.c b/src/vf/ringlatencystats.c
index f7af5d6..4ad469d 100644
--- a/src/vf/ringlatencystats.c
+++ b/src/vf/ringlatencystats.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <unistd.h>
diff --git a/src/vf/ringlatencystats.h b/src/vf/ringlatencystats.h
index 3cb3c67..0daa7c4 100644
--- a/src/vf/ringlatencystats.h
+++ b/src/vf/ringlatencystats.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _RINGLATENCYSTATS_H_
diff --git a/src/vf/spp_forward.c b/src/vf/spp_forward.c
index bad965e..f8bd1d1 100644
--- a/src/vf/spp_forward.c
+++ b/src/vf/spp_forward.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <rte_cycles.h>
diff --git a/src/vf/spp_forward.h b/src/vf/spp_forward.h
index 4f8b5d2..526ffcb 100644
--- a/src/vf/spp_forward.h
+++ b/src/vf/spp_forward.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef __SPP_FORWARD_H__
diff --git a/src/vf/spp_port.c b/src/vf/spp_port.c
index 3c6a87c..3b96df7 100644
--- a/src/vf/spp_port.c
+++ b/src/vf/spp_port.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <rte_ether.h>
diff --git a/src/vf/spp_port.h b/src/vf/spp_port.h
index 85ba5f3..5c00233 100644
--- a/src/vf/spp_port.h
+++ b/src/vf/spp_port.h
@@ -1,35 +1,7 @@
-/*-
- * BSD LICENSE
- *
- * Copyright(c) 2015-2016 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
+
#ifndef __SPP_PORT_H__
#define __SPP_PORT_H__
diff --git a/src/vf/spp_vf.c b/src/vf/spp_vf.c
index fb45b83..fba9721 100644
--- a/src/vf/spp_vf.c
+++ b/src/vf/spp_vf.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <netinet/in.h>
diff --git a/src/vf/spp_vf.h b/src/vf/spp_vf.h
index fa01b85..adcfafe 100644
--- a/src/vf/spp_vf.h
+++ b/src/vf/spp_vf.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef __SPP_VF_H__
diff --git a/src/vf/string_buffer.c b/src/vf/string_buffer.c
index 605fdc5..3e1d9f5 100644
--- a/src/vf/string_buffer.c
+++ b/src/vf/string_buffer.c
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#include <stdlib.h>
diff --git a/src/vf/string_buffer.h b/src/vf/string_buffer.h
index 3f7444f..34ee6cb 100644
--- a/src/vf/string_buffer.h
+++ b/src/vf/string_buffer.h
@@ -1,35 +1,5 @@
-/*
- * BSD LICENSE
- *
- * Copyright(c) 2017 Nippon Telegraph and Telephone Corporation
- * 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 Nippon Telegraph and Telephone 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) 2017-2018 Nippon Telegraph and Telephone Corporation
*/
#ifndef _STRING_BUFFER_H_
--
2.13.1
^ permalink raw reply [flat|nested] 42+ messages in thread