* [dpdk-dev] [PATCH] net: update licence for network headers @ 2017-12-08 10:28 Olivier Matz 2017-12-08 17:29 ` Ferruh Yigit 2017-12-22 15:59 ` [dpdk-dev] [PATCH v2] " Olivier Matz 0 siblings, 2 replies; 15+ messages in thread From: Olivier Matz @ 2017-12-08 10:28 UTC (permalink / raw) To: dev To be compliant with the DPDK licensing guidelines, switch to BSD-3-Clause. It can be done safely since the BSD headers from which these files derive also exist as a BSD-3-Clause license in FreeBSD. Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip_icmp.h Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip.h Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/sctp.h Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/tcp.h Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/udp.h Signed-off-by: Olivier Matz <olivier.matz@6wind.com> --- lib/librte_net/rte_icmp.h | 67 ++++--------------------------------------- lib/librte_net/rte_ip.h | 72 ++++------------------------------------------- lib/librte_net/rte_sctp.h | 70 ++++----------------------------------------- lib/librte_net/rte_tcp.h | 70 ++++----------------------------------------- lib/librte_net/rte_udp.h | 70 ++++----------------------------------------- 5 files changed, 26 insertions(+), 323 deletions(-) diff --git a/lib/librte_net/rte_icmp.h b/lib/librte_net/rte_icmp.h index 8b287f6d0..16f2eccc0 100644 --- a/lib/librte_net/rte_icmp.h +++ b/lib/librte_net/rte_icmp.h @@ -1,67 +1,10 @@ -/* BSD LICENSE - * - * Copyright(c) 2013 6WIND. - * - * 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 6WIND S.A. 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. - */ /* - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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 * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ + * Copyright(c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright(c) 2013 6WIND S.A. + * All rights reserved. */ #ifndef _RTE_ICMP_H_ diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index 73ec398fc..18a5d07de 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -1,71 +1,11 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright 2014 6WIND S.A. - * 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. - */ - /* - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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 * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ + * Copyright(c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright(c) 2010-2014 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. + * All rights reserved. */ #ifndef _RTE_IP_H_ diff --git a/lib/librte_net/rte_sctp.h b/lib/librte_net/rte_sctp.h index 688e126fa..4aa3c907c 100644 --- a/lib/librte_net/rte_sctp.h +++ b/lib/librte_net/rte_sctp.h @@ -1,70 +1,10 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - /* - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * SPDX-License-Identifier: BSD-3-Clause * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. - * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ + * Copyright (c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright (c) 2010-2014 Intel Corporation. + * All rights reserved. */ /** diff --git a/lib/librte_net/rte_tcp.h b/lib/librte_net/rte_tcp.h index 28b61e6d4..550e10a13 100644 --- a/lib/librte_net/rte_tcp.h +++ b/lib/librte_net/rte_tcp.h @@ -1,70 +1,10 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - /* - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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 * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ + * Copyright(c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright(c) 2010-2014 Intel Corporation. + * All rights reserved. */ #ifndef _RTE_TCP_H_ diff --git a/lib/librte_net/rte_udp.h b/lib/librte_net/rte_udp.h index bc5be4af5..b315a5131 100644 --- a/lib/librte_net/rte_udp.h +++ b/lib/librte_net/rte_udp.h @@ -1,70 +1,10 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - /* - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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 * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ + * Copyright(c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright(c) 2010-2014 Intel Corporation. + * All rights reserved. */ #ifndef _RTE_UDP_H_ -- 2.11.0 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-08 10:28 [dpdk-dev] [PATCH] net: update licence for network headers Olivier Matz @ 2017-12-08 17:29 ` Ferruh Yigit 2017-12-08 18:04 ` Stephen Hemminger 2017-12-08 18:22 ` Andrew Rybchenko 2017-12-22 15:59 ` [dpdk-dev] [PATCH v2] " Olivier Matz 1 sibling, 2 replies; 15+ messages in thread From: Ferruh Yigit @ 2017-12-08 17:29 UTC (permalink / raw) To: Olivier Matz, dev, Hemant Agrawal; +Cc: Thomas Monjalon On 12/8/2017 2:28 AM, Olivier Matz wrote: > To be compliant with the DPDK licensing guidelines, switch to > BSD-3-Clause. It can be done safely since the BSD headers from which > these files derive also exist as a BSD-3-Clause license in FreeBSD. > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip_icmp.h > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip.h > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/sctp.h > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/tcp.h > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/udp.h > Signed-off-by: Olivier Matz <olivier.matz@6wind.com> <...> > + * SPDX-License-Identifier: BSD-3-Clause > * > - * @(#)in.h 8.3 (Berkeley) 1/3/94 > - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ > + * Copyright(c) 1982, 1986, 1990, 1993 > + * The Regents of the University of California. > + * Copyright(c) 2013 6WIND S.A. > + * All rights reserved. > */ Not sure how much it matters but in the document Hemant put, order is different, it starts with Copyright line instead of SPDX line: " Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER SPDX-License-Identifier: BSD-3-Clause " So I assume for multiple Copyright holder: " Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 SPDX-License-Identifier: BSD-3-Clause " And do we still need "All rights reserved." ? I am for following same syntax in all files (whichever is chosen), this may helps us in the future for scripting licensing checks. <...> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-08 17:29 ` Ferruh Yigit @ 2017-12-08 18:04 ` Stephen Hemminger 2017-12-08 18:22 ` Andrew Rybchenko 1 sibling, 0 replies; 15+ messages in thread From: Stephen Hemminger @ 2017-12-08 18:04 UTC (permalink / raw) To: Ferruh Yigit; +Cc: Olivier Matz, dev, Hemant Agrawal, Thomas Monjalon On Fri, 8 Dec 2017 09:29:57 -0800 Ferruh Yigit <ferruh.yigit@intel.com> wrote: > On 12/8/2017 2:28 AM, Olivier Matz wrote: > > To be compliant with the DPDK licensing guidelines, switch to > > BSD-3-Clause. It can be done safely since the BSD headers from which > > these files derive also exist as a BSD-3-Clause license in FreeBSD. > > > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip_icmp.h > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip.h > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/sctp.h > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/tcp.h > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/udp.h > > Signed-off-by: Olivier Matz <olivier.matz@6wind.com> > > <...> > > > + * SPDX-License-Identifier: BSD-3-Clause > > * > > - * @(#)in.h 8.3 (Berkeley) 1/3/94 > > - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ > > + * Copyright(c) 1982, 1986, 1990, 1993 > > + * The Regents of the University of California. > > + * Copyright(c) 2013 6WIND S.A. > > + * All rights reserved. > > */ > > Not sure how much it matters but in the document Hemant put, order is different, > it starts with Copyright line instead of SPDX line: > > " > Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER > SPDX-License-Identifier: BSD-3-Clause > " > > So I assume for multiple Copyright holder: > > " > Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER > Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 > Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 > SPDX-License-Identifier: BSD-3-Clause > " > > And do we still need "All rights reserved." ? > > > I am for following same syntax in all files (whichever is chosen), this may > helps us in the future for scripting licensing checks. > > <...> Let's follow kernel policy where SPDX-License MUST be first line in the file. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-08 17:29 ` Ferruh Yigit 2017-12-08 18:04 ` Stephen Hemminger @ 2017-12-08 18:22 ` Andrew Rybchenko 2017-12-11 5:27 ` Hemant Agrawal 1 sibling, 1 reply; 15+ messages in thread From: Andrew Rybchenko @ 2017-12-08 18:22 UTC (permalink / raw) To: Ferruh Yigit, Olivier Matz, dev, Hemant Agrawal; +Cc: Thomas Monjalon On 12/08/2017 08:29 PM, Ferruh Yigit wrote: > On 12/8/2017 2:28 AM, Olivier Matz wrote: >> To be compliant with the DPDK licensing guidelines, switch to >> BSD-3-Clause. It can be done safely since the BSD headers from which >> these files derive also exist as a BSD-3-Clause license in FreeBSD. >> >> Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip_icmp.h >> Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip.h >> Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/sctp.h >> Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/tcp.h >> Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/udp.h >> Signed-off-by: Olivier Matz <olivier.matz@6wind.com> > <...> > >> + * SPDX-License-Identifier: BSD-3-Clause >> * >> - * @(#)in.h 8.3 (Berkeley) 1/3/94 >> - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ >> + * Copyright(c) 1982, 1986, 1990, 1993 >> + * The Regents of the University of California. >> + * Copyright(c) 2013 6WIND S.A. >> + * All rights reserved. >> */ > Not sure how much it matters but in the document Hemant put, order is different, > it starts with Copyright line instead of SPDX line: > > " > Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER > SPDX-License-Identifier: BSD-3-Clause > " > > So I assume for multiple Copyright holder: > > " > Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER > Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 > Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 > SPDX-License-Identifier: BSD-3-Clause > " > > And do we still need "All rights reserved." ? > > > I am for following same syntax in all files (whichever is chosen), this may > helps us in the future for scripting licensing checks. > > <...> License text example in [1] starts from Copyright and has All rights reserved. I agree that template should be clearly specified from the very beginning. [1] https://spdx.org/licenses/BSD-3-Clause#licenseText ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-08 18:22 ` Andrew Rybchenko @ 2017-12-11 5:27 ` Hemant Agrawal 2017-12-11 8:58 ` Olivier MATZ 2017-12-11 17:56 ` Ferruh Yigit 0 siblings, 2 replies; 15+ messages in thread From: Hemant Agrawal @ 2017-12-11 5:27 UTC (permalink / raw) To: Andrew Rybchenko, Ferruh Yigit, Olivier Matz, dev; +Cc: Thomas Monjalon On 12/8/2017 11:52 PM, Andrew Rybchenko wrote: > On 12/08/2017 08:29 PM, Ferruh Yigit wrote: >> On 12/8/2017 2:28 AM, Olivier Matz wrote: >>> To be compliant with the DPDK licensing guidelines, switch to >>> BSD-3-Clause. It can be done safely since the BSD headers from which >>> these files derive also exist as a BSD-3-Clause license in FreeBSD. >>> >>> Link: >>> https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip_icmp.h >>> >>> Link: >>> https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip.h >>> >>> Link: >>> https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/sctp.h >>> >>> Link: >>> https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/tcp.h >>> >>> Link: >>> https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/udp.h >>> >>> Signed-off-by: Olivier Matz <olivier.matz@6wind.com> >> <...> >> >>> + * SPDX-License-Identifier: BSD-3-Clause >>> * >>> - * @(#)in.h 8.3 (Berkeley) 1/3/94 >>> - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ >>> + * Copyright(c) 1982, 1986, 1990, 1993 >>> + * The Regents of the University of California. >>> + * Copyright(c) 2013 6WIND S.A. >>> + * All rights reserved. >>> */ >> Not sure how much it matters but in the document Hemant put, order is >> different, >> it starts with Copyright line instead of SPDX line: >> >> " >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER >> SPDX-License-Identifier: BSD-3-Clause >> " >> >> So I assume for multiple Copyright holder: >> >> " >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 >> SPDX-License-Identifier: BSD-3-Clause >> " >> >> And do we still need "All rights reserved." ? >> >> >> I am for following same syntax in all files (whichever is chosen), >> this may >> helps us in the future for scripting licensing checks. >> >> <...> > > License text example in [1] starts from Copyright and has All rights > reserved. > I agree that template should be clearly specified from the very beginning. > > [1] https://spdx.org/licenses/BSD-3-Clause#licenseText > Hi all, Most templates are showing copyright first and SPDX later i.e. the typical way for writing the license. However some projects has followed it other way around to make it easy for tools i.e. the TOP line. I agree with Ferruh that we shall follow single convention. I will prefer to do it in following way to make it consistent. (I will also fix my change patches). >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 >> SPDX-License-Identifier: BSD-3-Clause Regards, Hemant ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-11 5:27 ` Hemant Agrawal @ 2017-12-11 8:58 ` Olivier MATZ 2017-12-11 17:56 ` Ferruh Yigit 1 sibling, 0 replies; 15+ messages in thread From: Olivier MATZ @ 2017-12-11 8:58 UTC (permalink / raw) To: Hemant Agrawal; +Cc: Andrew Rybchenko, Ferruh Yigit, dev, Thomas Monjalon On Mon, Dec 11, 2017 at 10:57:41AM +0530, Hemant Agrawal wrote: [...] > > License text example in [1] starts from Copyright and has All rights > > reserved. > > I agree that template should be clearly specified from the very beginning. > > > > [1] https://spdx.org/licenses/BSD-3-Clause#licenseText > > > Hi all, > Most templates are showing copyright first and SPDX later i.e. the typical > way for writing the license. > > However some projects has followed it other way around to make it easy for > tools i.e. the TOP line. > > I agree with Ferruh that we shall follow single convention. I will prefer > to do it in following way to make it consistent. (I will also fix my change > patches). > > >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER > >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 > >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 > >> SPDX-License-Identifier: BSD-3-Clause OK for me, I'll send a v2. Olivier ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-11 5:27 ` Hemant Agrawal 2017-12-11 8:58 ` Olivier MATZ @ 2017-12-11 17:56 ` Ferruh Yigit 2017-12-12 16:57 ` Olivier MATZ 1 sibling, 1 reply; 15+ messages in thread From: Ferruh Yigit @ 2017-12-11 17:56 UTC (permalink / raw) To: Hemant Agrawal, Andrew Rybchenko, Olivier Matz, dev Cc: Thomas Monjalon, Stephen Hemminger On 12/10/2017 9:27 PM, Hemant Agrawal wrote: > On 12/8/2017 11:52 PM, Andrew Rybchenko wrote: >> On 12/08/2017 08:29 PM, Ferruh Yigit wrote: >>> On 12/8/2017 2:28 AM, Olivier Matz wrote: >>>> To be compliant with the DPDK licensing guidelines, switch to >>>> BSD-3-Clause. It can be done safely since the BSD headers from which >>>> these files derive also exist as a BSD-3-Clause license in FreeBSD. >>>> >>>> Link: >>>> https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip_icmp.h >>>> >>>> Link: >>>> https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip.h >>>> >>>> Link: >>>> https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/sctp.h >>>> >>>> Link: >>>> https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/tcp.h >>>> >>>> Link: >>>> https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/udp.h >>>> >>>> Signed-off-by: Olivier Matz <olivier.matz@6wind.com> >>> <...> >>> >>>> + * SPDX-License-Identifier: BSD-3-Clause >>>> * >>>> - * @(#)in.h 8.3 (Berkeley) 1/3/94 >>>> - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ >>>> + * Copyright(c) 1982, 1986, 1990, 1993 >>>> + * The Regents of the University of California. >>>> + * Copyright(c) 2013 6WIND S.A. >>>> + * All rights reserved. >>>> */ >>> Not sure how much it matters but in the document Hemant put, order is >>> different, >>> it starts with Copyright line instead of SPDX line: >>> >>> " >>> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER >>> SPDX-License-Identifier: BSD-3-Clause >>> " >>> >>> So I assume for multiple Copyright holder: >>> >>> " >>> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER >>> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 >>> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 >>> SPDX-License-Identifier: BSD-3-Clause >>> " >>> >>> And do we still need "All rights reserved." ? >>> >>> >>> I am for following same syntax in all files (whichever is chosen), >>> this may >>> helps us in the future for scripting licensing checks. >>> >>> <...> >> >> License text example in [1] starts from Copyright and has All rights >> reserved. >> I agree that template should be clearly specified from the very beginning. >> >> [1] https://spdx.org/licenses/BSD-3-Clause#licenseText >> > Hi all, > Most templates are showing copyright first and SPDX later i.e. the > typical way for writing the license. > > However some projects has followed it other way around to make it easy > for tools i.e. the TOP line. > > I agree with Ferruh that we shall follow single convention. I will > prefer to do it in following way to make it consistent. (I will also fix > my change patches). > > >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER > >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 > >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 > >> SPDX-License-Identifier: BSD-3-Clause Stephen mentioned Linux already has a defined syntax for this, unless there is a good reason to change I think we can follow same syntax, what do you think? > > > Regards, > Hemant > > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-11 17:56 ` Ferruh Yigit @ 2017-12-12 16:57 ` Olivier MATZ 2017-12-13 5:13 ` Hemant Agrawal 0 siblings, 1 reply; 15+ messages in thread From: Olivier MATZ @ 2017-12-12 16:57 UTC (permalink / raw) To: Ferruh Yigit Cc: Hemant Agrawal, Andrew Rybchenko, dev, Thomas Monjalon, Stephen Hemminger On Mon, Dec 11, 2017 at 09:56:40AM -0800, Ferruh Yigit wrote: > On 12/10/2017 9:27 PM, Hemant Agrawal wrote: > > Hi all, > > Most templates are showing copyright first and SPDX later i.e. the > > typical way for writing the license. > > > > However some projects has followed it other way around to make it easy > > for tools i.e. the TOP line. > > > > I agree with Ferruh that we shall follow single convention. I will > > prefer to do it in following way to make it consistent. (I will also fix > > my change patches). > > > > >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER > > >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 > > >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 > > >> SPDX-License-Identifier: BSD-3-Clause > > Stephen mentioned Linux already has a defined syntax for this, unless there is a > good reason to change I think we can follow same syntax, what do you think? As far as I can see, it's not yet integrated in Linux. The latest documentation I can find as of today is: https://patchwork.kernel.org/patch/10091607/ About the first line: """ The SPDX license identifier in kernel files shall be added at the first possible line in a file which can contain a comment. For the majority """ Some recomandations look a bit inconsistent to me, but I didn't follow all the history: """ C source: // SPDX-License-Identifier: <SPDX License Expression> C header: /* SPDX-License-Identifier: <SPDX License Expression> */ """ Olivier ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-12 16:57 ` Olivier MATZ @ 2017-12-13 5:13 ` Hemant Agrawal 2017-12-14 11:33 ` Hemant Agrawal 0 siblings, 1 reply; 15+ messages in thread From: Hemant Agrawal @ 2017-12-13 5:13 UTC (permalink / raw) To: Olivier MATZ, Ferruh Yigit Cc: Andrew Rybchenko, dev, Thomas Monjalon, Stephen Hemminger On 12/12/2017 10:27 PM, Olivier MATZ wrote: > On Mon, Dec 11, 2017 at 09:56:40AM -0800, Ferruh Yigit wrote: >> On 12/10/2017 9:27 PM, Hemant Agrawal wrote: >>> Hi all, >>> Most templates are showing copyright first and SPDX later i.e. the >>> typical way for writing the license. >>> >>> However some projects has followed it other way around to make it easy >>> for tools i.e. the TOP line. >>> >>> I agree with Ferruh that we shall follow single convention. I will >>> prefer to do it in following way to make it consistent. (I will also fix >>> my change patches). >>> >>> >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER >>> >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 >>> >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 >>> >> SPDX-License-Identifier: BSD-3-Clause >> >> Stephen mentioned Linux already has a defined syntax for this, unless there is a >> good reason to change I think we can follow same syntax, what do you think? > > As far as I can see, it's not yet integrated in Linux. The latest > documentation I can find as of today is: > https://patchwork.kernel.org/patch/10091607/ > > About the first line: > > """ > The SPDX license identifier in kernel files shall be added at the first > possible line in a file which can contain a comment. For the majority > """ > > Some recomandations look a bit inconsistent to me, but I didn't follow > all the history: > > """ > C source: // SPDX-License-Identifier: <SPDX License Expression> > C header: /* SPDX-License-Identifier: <SPDX License Expression> */ > """ > > I tried to study the other repositories using the SPDX tagging e.g. uboot (http://git.denx.de/?p=u-boot.git;a=tree) and odp etc. They followed the syntax of copyright followed by SPDX. Also, typically all dpdk files starts with "/*-", I am not sure about the purpose of the "-"? > Olivier > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-13 5:13 ` Hemant Agrawal @ 2017-12-14 11:33 ` Hemant Agrawal 2017-12-14 12:58 ` Thomas Monjalon 0 siblings, 1 reply; 15+ messages in thread From: Hemant Agrawal @ 2017-12-14 11:33 UTC (permalink / raw) To: Olivier MATZ, Ferruh Yigit, Thomas Monjalon Cc: Andrew Rybchenko, dev, Stephen Hemminger On 12/13/2017 10:43 AM, Hemant Agrawal wrote: > On 12/12/2017 10:27 PM, Olivier MATZ wrote: >> On Mon, Dec 11, 2017 at 09:56:40AM -0800, Ferruh Yigit wrote: >>> On 12/10/2017 9:27 PM, Hemant Agrawal wrote: >>>> Hi all, >>>> Most templates are showing copyright first and SPDX later i.e. the >>>> typical way for writing the license. >>>> >>>> However some projects has followed it other way around to make it easy >>>> for tools i.e. the TOP line. >>>> >>>> I agree with Ferruh that we shall follow single convention. I will >>>> prefer to do it in following way to make it consistent. (I will also >>>> fix >>>> my change patches). >>>> >>>> >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER >>>> >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-2 >>>> >> Copyright (C) [YEAR] NAME-OF-COPYRIGHT-HOLDER-3 >>>> >> SPDX-License-Identifier: BSD-3-Clause >>> >>> Stephen mentioned Linux already has a defined syntax for this, unless >>> there is a >>> good reason to change I think we can follow same syntax, what do you >>> think? >> >> As far as I can see, it's not yet integrated in Linux. The latest >> documentation I can find as of today is: >> https://patchwork.kernel.org/patch/10091607/ >> >> About the first line: >> >> """ >> The SPDX license identifier in kernel files shall be added at the >> first >> possible line in a file which can contain a comment. For the majority >> """ >> >> Some recomandations look a bit inconsistent to me, but I didn't follow >> all the history: >> >> """ >> C source: // SPDX-License-Identifier: <SPDX License Expression> >> C header: /* SPDX-License-Identifier: <SPDX License >> Expression> */ >> """ >> >> > > I tried to study the other repositories using the SPDX tagging e.g. > uboot (http://git.denx.de/?p=u-boot.git;a=tree) and odp etc. They > followed the syntax of copyright followed by SPDX. Thomas, Before I rework, What is your opinion w.r.t tooling in DPDK w.r.t SPDX. I saw a patch for checkpatch in Linux, which will also check for SPDX presence for any new file, however this patch only checked first two line for SPDX presence. (currently it is nak for other reasons) https://patchwork.kernel.org/patch/10053699/ If it makes easy for us, we can use the SPDX as first/second line convention. regards, Hemant > > Also, typically all dpdk files starts with "/*-", I am not sure about > the purpose of the "-"? > > > >> Olivier >> > > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-14 11:33 ` Hemant Agrawal @ 2017-12-14 12:58 ` Thomas Monjalon 2017-12-15 10:54 ` Hemant Agrawal 0 siblings, 1 reply; 15+ messages in thread From: Thomas Monjalon @ 2017-12-14 12:58 UTC (permalink / raw) To: Hemant Agrawal Cc: Olivier MATZ, Ferruh Yigit, Andrew Rybchenko, dev, Stephen Hemminger, Trishan de Lanerolle 14/12/2017 12:33, Hemant Agrawal: > Thomas, > Before I rework, > What is your opinion w.r.t tooling in DPDK w.r.t SPDX. > > I saw a patch for checkpatch in Linux, which will also check for SPDX > presence for any new file, however this patch only checked first two > line for SPDX presence. (currently it is nak for other reasons) > > https://patchwork.kernel.org/patch/10053699/ > > If it makes easy for us, we can use the SPDX as first/second line > convention. I agree we should follow the convention chosen in Linux, because we may use the same tools. Is it already decided for Linux? Can we influence the decision for Linux? ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH] net: update licence for network headers 2017-12-14 12:58 ` Thomas Monjalon @ 2017-12-15 10:54 ` Hemant Agrawal 0 siblings, 0 replies; 15+ messages in thread From: Hemant Agrawal @ 2017-12-15 10:54 UTC (permalink / raw) To: Thomas Monjalon Cc: Olivier MATZ, Ferruh Yigit, Andrew Rybchenko, dev, Stephen Hemminger, Trishan de Lanerolle On 12/14/2017 6:28 PM, Thomas Monjalon wrote: > 14/12/2017 12:33, Hemant Agrawal: >> Thomas, >> Before I rework, >> What is your opinion w.r.t tooling in DPDK w.r.t SPDX. >> >> I saw a patch for checkpatch in Linux, which will also check for SPDX >> presence for any new file, however this patch only checked first two >> line for SPDX presence. (currently it is nak for other reasons) >> >> https://patchwork.kernel.org/patch/10053699/ >> >> If it makes easy for us, we can use the SPDX as first/second line >> convention. > > I agree we should follow the convention chosen in Linux, > because we may use the same tools. > Is it already decided for Linux? Can we influence the decision for Linux? > I have posted my comments on other thread. Linux have good reasons to do it. If we have to use linux tool and common code, we shall adapt to same. ^ permalink raw reply [flat|nested] 15+ messages in thread
* [dpdk-dev] [PATCH v2] net: update licence for network headers 2017-12-08 10:28 [dpdk-dev] [PATCH] net: update licence for network headers Olivier Matz 2017-12-08 17:29 ` Ferruh Yigit @ 2017-12-22 15:59 ` Olivier Matz 2017-12-28 11:42 ` Hemant Agrawal 1 sibling, 1 reply; 15+ messages in thread From: Olivier Matz @ 2017-12-22 15:59 UTC (permalink / raw) To: dev Cc: Thomas Monjalon, Ferruh Yigit, Andrew Rybchenko, Stephen Hemminger, Trishan de Lanerolle To be compliant with the DPDK licensing guidelines, switch to BSD-3-Clause. It can be done safely since the BSD headers from which these files derive also exist as a BSD-3-Clause license in FreeBSD. Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip_icmp.h Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip.h Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/sctp.h Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/tcp.h Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/udp.h Signed-off-by: Olivier Matz <olivier.matz@6wind.com> --- lib/librte_net/rte_icmp.h | 69 ++++--------------------------------------- lib/librte_net/rte_ip.h | 74 ++++------------------------------------------- lib/librte_net/rte_sctp.h | 72 ++++----------------------------------------- lib/librte_net/rte_tcp.h | 72 ++++----------------------------------------- lib/librte_net/rte_udp.h | 72 ++++----------------------------------------- 5 files changed, 26 insertions(+), 333 deletions(-) diff --git a/lib/librte_net/rte_icmp.h b/lib/librte_net/rte_icmp.h index 8b287f6d0..053b5f6a4 100644 --- a/lib/librte_net/rte_icmp.h +++ b/lib/librte_net/rte_icmp.h @@ -1,67 +1,8 @@ -/* BSD LICENSE - * - * Copyright(c) 2013 6WIND. - * - * 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 6WIND S.A. 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. - */ -/* - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. - * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright(c) 2013 6WIND S.A. + * All rights reserved. */ #ifndef _RTE_ICMP_H_ diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index 73ec398fc..9a62ff667 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -1,71 +1,9 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * Copyright 2014 6WIND S.A. - * 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. - */ - -/* - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. - * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright(c) 2010-2014 Intel Corporation. + * Copyright(c) 2014 6WIND S.A. + * All rights reserved. */ #ifndef _RTE_IP_H_ diff --git a/lib/librte_net/rte_sctp.h b/lib/librte_net/rte_sctp.h index 688e126fa..bfb7165a6 100644 --- a/lib/librte_net/rte_sctp.h +++ b/lib/librte_net/rte_sctp.h @@ -1,70 +1,8 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. - * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright(c) 2010-2014 Intel Corporation. + * All rights reserved. */ /** diff --git a/lib/librte_net/rte_tcp.h b/lib/librte_net/rte_tcp.h index 28b61e6d4..91f58987b 100644 --- a/lib/librte_net/rte_tcp.h +++ b/lib/librte_net/rte_tcp.h @@ -1,70 +1,8 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. - * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright(c) 2010-2014 Intel Corporation. + * All rights reserved. */ #ifndef _RTE_TCP_H_ diff --git a/lib/librte_net/rte_udp.h b/lib/librte_net/rte_udp.h index bc5be4af5..ba033955c 100644 --- a/lib/librte_net/rte_udp.h +++ b/lib/librte_net/rte_udp.h @@ -1,70 +1,8 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Copyright (c) 1982, 1986, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. - * - * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.82 2003/10/25 09:37:10 ume Exp $ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 1982, 1986, 1990, 1993 + * The Regents of the University of California. + * Copyright(c) 2010-2014 Intel Corporation. + * All rights reserved. */ #ifndef _RTE_UDP_H_ -- 2.11.0 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH v2] net: update licence for network headers 2017-12-22 15:59 ` [dpdk-dev] [PATCH v2] " Olivier Matz @ 2017-12-28 11:42 ` Hemant Agrawal 2018-01-05 10:32 ` Thomas Monjalon 0 siblings, 1 reply; 15+ messages in thread From: Hemant Agrawal @ 2017-12-28 11:42 UTC (permalink / raw) To: Olivier Matz, dev Cc: Thomas Monjalon, Ferruh Yigit, Andrew Rybchenko, Stephen Hemminger, Trishan de Lanerolle On 12/22/2017 9:29 PM, Olivier Matz wrote: > To be compliant with the DPDK licensing guidelines, switch to > BSD-3-Clause. It can be done safely since the BSD headers from which > these files derive also exist as a BSD-3-Clause license in FreeBSD. > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip_icmp.h > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip.h > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/sctp.h > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/tcp.h > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/udp.h > Signed-off-by: Olivier Matz <olivier.matz@6wind.com> > --- > lib/librte_net/rte_icmp.h | 69 ++++--------------------------------------- > lib/librte_net/rte_ip.h | 74 ++++------------------------------------------- > lib/librte_net/rte_sctp.h | 72 ++++----------------------------------------- > lib/librte_net/rte_tcp.h | 72 ++++----------------------------------------- > lib/librte_net/rte_udp.h | 72 ++++----------------------------------------- > 5 files changed, 26 insertions(+), 333 deletions(-) Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com> <snip>.. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [dpdk-dev] [PATCH v2] net: update licence for network headers 2017-12-28 11:42 ` Hemant Agrawal @ 2018-01-05 10:32 ` Thomas Monjalon 0 siblings, 0 replies; 15+ messages in thread From: Thomas Monjalon @ 2018-01-05 10:32 UTC (permalink / raw) To: Olivier Matz Cc: dev, Hemant Agrawal, Ferruh Yigit, Andrew Rybchenko, Stephen Hemminger, Trishan de Lanerolle 28/12/2017 12:42, Hemant Agrawal: > On 12/22/2017 9:29 PM, Olivier Matz wrote: > > To be compliant with the DPDK licensing guidelines, switch to > > BSD-3-Clause. It can be done safely since the BSD headers from which > > these files derive also exist as a BSD-3-Clause license in FreeBSD. > > > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip_icmp.h > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/ip.h > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/sctp.h > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/tcp.h > > Link: https://raw.githubusercontent.com/freebsd/freebsd/78a6b0861813af31e1354fa407c5701e8764b4d6/sys/netinet/udp.h > > Signed-off-by: Olivier Matz <olivier.matz@6wind.com> > > --- > > lib/librte_net/rte_icmp.h | 69 ++++--------------------------------------- > > lib/librte_net/rte_ip.h | 74 ++++------------------------------------------- > > lib/librte_net/rte_sctp.h | 72 ++++----------------------------------------- > > lib/librte_net/rte_tcp.h | 72 ++++----------------------------------------- > > lib/librte_net/rte_udp.h | 72 ++++----------------------------------------- > > 5 files changed, 26 insertions(+), 333 deletions(-) > > Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com> Applied, thanks ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2018-01-05 10:32 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-12-08 10:28 [dpdk-dev] [PATCH] net: update licence for network headers Olivier Matz 2017-12-08 17:29 ` Ferruh Yigit 2017-12-08 18:04 ` Stephen Hemminger 2017-12-08 18:22 ` Andrew Rybchenko 2017-12-11 5:27 ` Hemant Agrawal 2017-12-11 8:58 ` Olivier MATZ 2017-12-11 17:56 ` Ferruh Yigit 2017-12-12 16:57 ` Olivier MATZ 2017-12-13 5:13 ` Hemant Agrawal 2017-12-14 11:33 ` Hemant Agrawal 2017-12-14 12:58 ` Thomas Monjalon 2017-12-15 10:54 ` Hemant Agrawal 2017-12-22 15:59 ` [dpdk-dev] [PATCH v2] " Olivier Matz 2017-12-28 11:42 ` Hemant Agrawal 2018-01-05 10:32 ` Thomas Monjalon
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).