From: Kefu Chai Date: Thu, 29 Mar 2018 11:33:44 +0000 (+0800) Subject: msg/async/dpdk: remove xsky copyright and LGPL copying X-Git-Tag: wip-pdonnell-testing-20180329.205607~3^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3f4984db0453174c35dfcdd7b1ef57821155366f;p=ceph-ci.git msg/async/dpdk: remove xsky copyright and LGPL copying it's not legitimate to relicense source code without original author's permission. some of the source files are copied from seastar project with minor changes. so xsky cannot claim the copyright of them. Signed-off-by: Kefu Chai --- diff --git a/src/msg/async/dpdk/ARP.cc b/src/msg/async/dpdk/ARP.cc index 73958cfb83b..dedc9e3c7aa 100644 --- a/src/msg/async/dpdk/ARP.cc +++ b/src/msg/async/dpdk/ARP.cc @@ -19,19 +19,6 @@ /* * Copyright (C) 2014 Cloudius Systems, Ltd. */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #include "ARP.h" diff --git a/src/msg/async/dpdk/ARP.h b/src/msg/async/dpdk/ARP.h index ecfa7b891b8..5456956480a 100644 --- a/src/msg/async/dpdk/ARP.h +++ b/src/msg/async/dpdk/ARP.h @@ -20,19 +20,6 @@ * Copyright (C) 2014 Cloudius Systems, Ltd. * */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #ifndef CEPH_MSG_ARP_H_ #define CEPH_MSG_ARP_H_ diff --git a/src/msg/async/dpdk/DPDK.cc b/src/msg/async/dpdk/DPDK.cc index 43e553aa914..0b8fb5db65c 100644 --- a/src/msg/async/dpdk/DPDK.cc +++ b/src/msg/async/dpdk/DPDK.cc @@ -19,19 +19,6 @@ /* * Copyright (C) 2014 Cloudius Systems, Ltd. */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #include #include diff --git a/src/msg/async/dpdk/DPDK.h b/src/msg/async/dpdk/DPDK.h index bf87c7be7e3..a57fcd7cdd8 100644 --- a/src/msg/async/dpdk/DPDK.h +++ b/src/msg/async/dpdk/DPDK.h @@ -19,19 +19,6 @@ /* * Copyright (C) 2014 Cloudius Systems, Ltd. */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #ifndef CEPH_DPDK_DEV_H #define CEPH_DPDK_DEV_H diff --git a/src/msg/async/dpdk/IP.h b/src/msg/async/dpdk/IP.h index d5a4d305481..3769c65b816 100644 --- a/src/msg/async/dpdk/IP.h +++ b/src/msg/async/dpdk/IP.h @@ -20,19 +20,6 @@ * Copyright (C) 2014 Cloudius Systems, Ltd. * */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #ifndef CEPH_MSG_IP_H_ #define CEPH_MSG_IP_H_ diff --git a/src/msg/async/dpdk/IPChecksum.cc b/src/msg/async/dpdk/IPChecksum.cc index 5048a6902b2..7a3253c1e9b 100644 --- a/src/msg/async/dpdk/IPChecksum.cc +++ b/src/msg/async/dpdk/IPChecksum.cc @@ -19,19 +19,6 @@ /* * Copyright (C) 2014 Cloudius Systems, Ltd. */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #include #include "net.h" diff --git a/src/msg/async/dpdk/IPChecksum.h b/src/msg/async/dpdk/IPChecksum.h index a1826dfdfe7..9af4a86b9c2 100644 --- a/src/msg/async/dpdk/IPChecksum.h +++ b/src/msg/async/dpdk/IPChecksum.h @@ -19,19 +19,6 @@ /* * Copyright (C) 2014 Cloudius Systems, Ltd. */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #ifndef CEPH_MSG_CHECKSUM_H_ #define CEPH_MSG_CHECKSUM_H_ diff --git a/src/msg/async/dpdk/Packet.h b/src/msg/async/dpdk/Packet.h index 000329b4cfd..3daab3172d0 100644 --- a/src/msg/async/dpdk/Packet.h +++ b/src/msg/async/dpdk/Packet.h @@ -19,20 +19,6 @@ /* * Copyright (C) 2014 Cloudius Systems, Ltd. */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ - #ifndef CEPH_MSG_PACKET_H_ #define CEPH_MSG_PACKET_H_ diff --git a/src/msg/async/dpdk/PacketUtil.h b/src/msg/async/dpdk/PacketUtil.h index 36f72e515d1..af834307f81 100644 --- a/src/msg/async/dpdk/PacketUtil.h +++ b/src/msg/async/dpdk/PacketUtil.h @@ -19,19 +19,6 @@ /* * Copyright (C) 2014 Cloudius Systems, Ltd. */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #ifndef CEPH_MSG_PACKET_UTIL_H_ #define CEPH_MSG_PACKET_UTIL_H_ diff --git a/src/msg/async/dpdk/byteorder.h b/src/msg/async/dpdk/byteorder.h index 2c198a2b675..a996ec0778e 100644 --- a/src/msg/async/dpdk/byteorder.h +++ b/src/msg/async/dpdk/byteorder.h @@ -19,19 +19,6 @@ /* * Copyright (C) 2014 Cloudius Systems, Ltd. */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #ifndef CEPH_MSG_BYTEORDER_H_ #define CEPH_MSG_BYTEORDER_H_ diff --git a/src/msg/async/dpdk/const.h b/src/msg/async/dpdk/const.h index 42af94a391e..ea5dc49e5b5 100644 --- a/src/msg/async/dpdk/const.h +++ b/src/msg/async/dpdk/const.h @@ -19,19 +19,6 @@ /* * Copyright (C) 2014 Cloudius Systems, Ltd. */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #ifndef CEPH_MSG_CONST_H_ #define CEPH_MSG_CONST_H_ diff --git a/src/msg/async/dpdk/net.cc b/src/msg/async/dpdk/net.cc index 1799315ef35..3ef69446822 100644 --- a/src/msg/async/dpdk/net.cc +++ b/src/msg/async/dpdk/net.cc @@ -26,11 +26,6 @@ * * Author: Haomai Wang * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * */ #include "net.h" diff --git a/src/msg/async/dpdk/net.h b/src/msg/async/dpdk/net.h index b744422fdad..c48815b8d33 100644 --- a/src/msg/async/dpdk/net.h +++ b/src/msg/async/dpdk/net.h @@ -1,17 +1,24 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- /* - * Ceph - scalable distributed file system + * This file is open source software, licensed to you under the terms + * of the Apache License, Version 2.0 (the "License"). See the NOTICE file + * distributed with this work for additional information regarding copyright + * ownership. You may not use this file except in compliance with the License. * - * Copyright (C) 2015 XSky + * You may obtain a copy of the License at * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +/* + * Copyright (C) 2014 Cloudius Systems, Ltd. */ + #ifndef CEPH_MSG_DPDK_NET_H #define CEPH_MSG_DPDK_NET_H diff --git a/src/msg/async/dpdk/stream.h b/src/msg/async/dpdk/stream.h index 426bc64f5e0..a120bd17fc8 100644 --- a/src/msg/async/dpdk/stream.h +++ b/src/msg/async/dpdk/stream.h @@ -19,19 +19,6 @@ /* * Copyright (C) 2014 Cloudius Systems, Ltd. */ -/* - * Ceph - scalable distributed file system - * - * Copyright (C) 2015 XSky - * - * Author: Haomai Wang - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ #ifndef CEPH_MSG_STREAM_H_ #define CEPH_MSG_STREAM_H_