[dpdk-dev] [PATCH] use SPDX license tag in Mellanox copyrighted files

Shahaf Shuler shahafs at mellanox.com
Wed May 2 14:37:49 CEST 2018


Tuesday, May 1, 2018 11:07 PM, Thomas Monjalon:
> Subject: [PATCH] use SPDX license tag in Mellanox copyrighted files
> 
> Some files were left with full license and wrong copyright format.
> They are switched to this format:
> 	SPDX-License-Identifier: BSD-3-Clause
> 	Copyright 2017 Mellanox Technologies, Ltd
> 
> Fixes: 5feecc57d90b ("align SPDX Mellanox copyrights")
> 
> Signed-off-by: Thomas Monjalon <thomas at monjalon.net>

Thanks, looks like a missed few.

Acked-by: Shahaf Shuler <shahafs at mellanox.com>

> ---
>  devtools/check-dup-includes.sh              | 23 ++------------------
>  doc/guides/howto/rte_flow.rst               | 32 ++--------------------------
>  doc/guides/prog_guide/rte_flow.rst          | 30 ++------------------------
>  doc/guides/sample_app_ug/flow_filtering.rst | 32 ++--------------------------
>  drivers/net/failsafe/Makefile               | 33 +++--------------------------
>  examples/flow_filtering/Makefile            | 33 ++---------------------------
>  examples/flow_filtering/flow_blocks.c       | 32 ++--------------------------
>  examples/flow_filtering/main.c              | 32 ++--------------------------
>  8 files changed, 17 insertions(+), 230 deletions(-)
> 
> diff --git a/devtools/check-dup-includes.sh b/devtools/check-dup-
> includes.sh index 10365e4a1..e4c2748c6 100755
> --- a/devtools/check-dup-includes.sh
> +++ b/devtools/check-dup-includes.sh
> @@ -1,25 +1,6 @@
>  #! /bin/sh -e
> -
> -# Copyright 2017 Mellanox Technologies, Ltd. 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.
> -#
> -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> NONINFRINGEMENT.
> -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
> ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
> CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
> CONNECTION WITH THE -# SOFTWARE OR THE USE OR OTHER DEALINGS IN
> THE  SOFTWARE.
> +# SPDX-License-Identifier: BSD-3-Clause # Copyright 2017 Mellanox
> +Technologies, Ltd
> 
>  # Check C files in git repository for duplicated includes.
>  # Usage: devtools/check-dup-includes.sh [directory] diff --git
> a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst index
> 4a27c995d..4cc8edc10 100644
> --- a/doc/guides/howto/rte_flow.rst
> +++ b/doc/guides/howto/rte_flow.rst
> @@ -1,33 +1,5 @@
> -..  BSD LICENSE
> -    Copyright(c) 2017 Mellanox 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 Mellanox 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 2017 Mellanox Technologies, Ltd
> 
>  Generic flow API - examples
>  ===========================
> diff --git a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> index 7af132ebf..b305a72a5 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -1,32 +1,6 @@
> -..  BSD LICENSE
> +..  SPDX-License-Identifier: BSD-3-Clause
>      Copyright 2016 6WIND S.A.
> -    Copyright 2016 Mellanox.
> -
> -    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 2016 Mellanox Technologies, Ltd
> 
>  .. _Generic_flow_API:
> 
> diff --git a/doc/guides/sample_app_ug/flow_filtering.rst
> b/doc/guides/sample_app_ug/flow_filtering.rst
> index 06230c07e..bbf8af0e6 100644
> --- a/doc/guides/sample_app_ug/flow_filtering.rst
> +++ b/doc/guides/sample_app_ug/flow_filtering.rst
> @@ -1,33 +1,5 @@
> -..  BSD LICENSE
> -    Copyright(c) 2017 Mellanox 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 Mellanox 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 2017 Mellanox Technologies, Ltd
> 
>  Basic RTE Flow Filtering Sample Application
> ===========================================
> diff --git a/drivers/net/failsafe/Makefile b/drivers/net/failsafe/Makefile
> index bd2f01986..81802d092 100644
> --- a/drivers/net/failsafe/Makefile
> +++ b/drivers/net/failsafe/Makefile
> @@ -1,33 +1,6 @@
> -#   BSD LICENSE
> -#
> -#   Copyright 2017 6WIND S.A.
> -#   Copyright 2017 Mellanox.
> -#
> -#   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.
> +# SPDX-License-Identifier: BSD-3-Clause # Copyright 2017 6WIND S.A.
> +# Copyright 2017 Mellanox Technologies, Ltd
> 
>  include $(RTE_SDK)/mk/rte.vars.mk
> 
> diff --git a/examples/flow_filtering/Makefile
> b/examples/flow_filtering/Makefile
> index 01bb4cd81..8f86b7b24 100644
> --- a/examples/flow_filtering/Makefile
> +++ b/examples/flow_filtering/Makefile
> @@ -1,34 +1,5 @@
> -#
> -#   BSD LICENSE
> -#
> -#   Copyright 2017 Mellanox.
> -#
> -#   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 Mellanox 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 2017 Mellanox
> +Technologies, Ltd
> 
>  APP = flow
> 
> diff --git a/examples/flow_filtering/flow_blocks.c
> b/examples/flow_filtering/flow_blocks.c
> index 61b045af3..4da459285 100644
> --- a/examples/flow_filtering/flow_blocks.c
> +++ b/examples/flow_filtering/flow_blocks.c
> @@ -1,33 +1,5 @@
> -/*-
> - *   BSD LICENSE
> - *
> - *   Copyright 2017 Mellanox.
> - *
> - *   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 Mellanox 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 2017 Mellanox Technologies, Ltd
>   */
> 
>  #define MAX_PATTERN_NUM		4
> diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
> index db03c9c3a..e0ee51679 100644
> --- a/examples/flow_filtering/main.c
> +++ b/examples/flow_filtering/main.c
> @@ -1,33 +1,5 @@
> -/*-
> - *   BSD LICENSE
> - *
> - *   Copyright 2017 Mellanox.
> - *
> - *   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 Mellanox. 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 2017 Mellanox Technologies, Ltd
>   */
> 
>  #include <stdio.h>
> --
> 2.16.2



More information about the dev mailing list