Replacing full license text with SPDX tag. Signed-off-by: Allain Legacy <allain.legacy@windriver.com> --- app/test/test_cfgfile.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/app/test/test_cfgfile.c b/app/test/test_cfgfile.c index 37435b395..01905920e 100644 --- a/app/test/test_cfgfile.c +++ b/app/test/test_cfgfile.c @@ -1,33 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2017 Wind River Systems Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2017 Wind River Systems Inc. All rights reserved. */ #include <stdio.h> -- 2.12.1
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> -----Original Message-----
> From: Legacy, Allain
> Sent: Tuesday, August 13, 2019 8:20 AM
> To: hemant.agrawal@nxp.com
> Cc: dev@dpdk.org; john.mcnamara@intel.com; marko.kovacevic@intel.com;
> cristian.dumitrescu@intel.com; Peters, Matt
> Subject: [PATCH 1/2] test: replace license text with SPDX tag
>
> Replacing full license text with SPDX tag.
>
> Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
> ---
Acked-by: Matt Peters <matt.peters@windriver.com>
On Tue, Aug 13, 2019 at 2:20 PM Allain Legacy
<allain.legacy@windriver.com> wrote:
>
> Replacing full license text with SPDX tag.
>
> Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
> ---
> app/test/test_cfgfile.c | 32 ++------------------------------
> 1 file changed, 2 insertions(+), 30 deletions(-)
>
> diff --git a/app/test/test_cfgfile.c b/app/test/test_cfgfile.c
> index 37435b395..01905920e 100644
> --- a/app/test/test_cfgfile.c
> +++ b/app/test/test_cfgfile.c
> @@ -1,33 +1,5 @@
> -/*-
> - * BSD LICENSE
> - *
> - * Copyright(c) 2017 Wind River Systems Inc. All rights reserved.
> - *
> - * Redistribution and use in source and binary forms, with or without
> - * modification, are permitted provided that the following conditions
> - * are met:
> - *
> - * * Redistributions of source code must retain the above copyright
> - * notice, this list of conditions and the following disclaimer.
> - * * Redistributions in binary form must reproduce the above copyright
> - * notice, this list of conditions and the following disclaimer in
> - * the documentation and/or other materials provided with the
> - * distribution.
> - * * Neither the name of Intel Corporation nor the names of its
> - * contributors may be used to endorse or promote products derived
> - * from this software without specific prior written permission.
> - *
> - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(c) 2017 Wind River Systems Inc. All rights reserved.
Once applied the two patches of this series, we end up with 3 kind of
copyright lines:
$ git grep -h Copyright.*Wind.River app/
* Copyright(c) 2017 Wind River Systems Inc. All rights reserved.
$ git grep -h Copyright.*Wind.River doc/
Copyright(c) 2017 Wind River Systems, Inc. rights reserved.
$ git grep -h Copyright.*Wind.River drivers/
# Copyright(c) 2013-2017, Wind River Systems, Inc.
* Copyright(c) 2013-2017 Wind River Systems, Inc.
* Copyright(c) 2013-2017 Wind River Systems, Inc.
* Copyright(c) 2014-2017 Wind River Systems, Inc.
* Copyright(c) 2013-2017 Wind River Systems, Inc.
Should I still apply them as is? or do you want to send a v2?
Thanks.
--
David Marchand
Replacing full license text with SPDX tag. Signed-off-by: Allain Legacy <allain.legacy@windriver.com> --- app/test/test_cfgfile.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/app/test/test_cfgfile.c b/app/test/test_cfgfile.c index 37435b395..2f596affe 100644 --- a/app/test/test_cfgfile.c +++ b/app/test/test_cfgfile.c @@ -1,33 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2017 Wind River Systems Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2017 Wind River Systems, Inc. */ #include <stdio.h> -- 2.12.1
Aligning the Wind River copyright notices to be consistent with the other files which bare the Wind River copyright notice. Fixes: 32113d352d3b ("doc: replace license text with SPDX tag in AVP guide") Signed-off-by: Allain Legacy <allain.legacy@windriver.com> --- doc/guides/nics/avp.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/nics/avp.rst b/doc/guides/nics/avp.rst index b724d97dd..1a194fc23 100644 --- a/doc/guides/nics/avp.rst +++ b/doc/guides/nics/avp.rst @@ -1,5 +1,5 @@ .. SPDX-License-Identifier: BSD-3-Clause - Copyright(c) 2017 Wind River Systems, Inc. rights reserved. + Copyright(c) 2017 Wind River Systems, Inc. All rights reserved. AVP Poll Mode Driver -- 2.12.1
On Thu, 7 Nov 2019 14:37:43 -0600
Allain Legacy <allain.legacy@windriver.com> wrote:
> Replacing full license text with SPDX tag.
>
> Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
Thanks
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
08/11/2019 05:00, Stephen Hemminger:
> On Thu, 7 Nov 2019 14:37:43 -0600
> Allain Legacy <allain.legacy@windriver.com> wrote:
>
> > Replacing full license text with SPDX tag.
> >
> > Signed-off-by: Allain Legacy <allain.legacy@windriver.com>
>
> Thanks
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Applied, thanks