From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mogw0216.ocn.ad.jp (mogw0216.ocn.ad.jp [114.147.58.22]) by dpdk.org (Postfix) with ESMTP id D822D200 for ; Thu, 10 May 2018 13:11:50 +0200 (CEST) Received: from mf-smf-ucb024c2 (mf-smf-ucb024c2.ocn.ad.jp [153.153.66.161]) by mogw0216.ocn.ad.jp (Postfix) with ESMTP id 5F76DDC28D; Thu, 10 May 2018 20:11:49 +0900 (JST) Received: from ntt.pod01.mv-mta-ucb025 ([153.149.142.99]) by mf-smf-ucb024c2 with ESMTP id GjUCfF6jnQNRUGjUDf0gTw; Thu, 10 May 2018 20:11:49 +0900 Received: from smtp.ocn.ne.jp ([153.149.227.134]) by ntt.pod01.mv-mta-ucb025 with id kbBo1x00Q2ud8JZ01bBoCq; Thu, 10 May 2018 11:11:49 +0000 Received: from localhost.localdomain (sp1-66-97-253.msc.spmode.ne.jp [1.66.97.253]) by smtp.ocn.ne.jp (Postfix) with ESMTPA; Thu, 10 May 2018 20:11:45 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: ferruh.yigit@intel.com Cc: spp@dpdk.org, tdelanerolle@linuxfoundation.org, tim.odriscoll@intel.com, jim.st.leger@intel.com, Yasufumi Ogawa Date: Thu, 10 May 2018 20:10:21 +0900 Message-Id: <20180510111028.33837-7-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180510111028.33837-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20180423055414.7049-1-ogawa.yasufumi@lab.ntt.co.jp> <20180510111028.33837-1-ogawa.yasufumi@lab.ntt.co.jp> Subject: [spp] [PATCH v2 06/13] controller: convert license of Intel to SPDX tag X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 May 2018 11:11:51 -0000 From: Yasufumi Ogawa 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 --- 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