Re: [OSS-Tools] [PATCH dt-utils 1/4] treewide: add SPDX identifiers to files with GPL-2.0-or-later license

[Roland Hieber <rhi@pengutronix.de>]

Uwe, could I get a Reviewed-by from you for these four patches? :-)

 - Roland

On Fri, Mar 26, 2021 at 10:06:44PM +0100, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  sizes.h                             | 12 +-----------
>  src/barebox-state/state.c           | 11 +----------
>  src/barebox-state/state_variables.c | 11 +----------
>  src/base64.c                        |  3 +--
>  src/crypto/sha1.c                   |  7 +------
>  src/crypto/sha2.c                   |  7 +------
>  6 files changed, 6 insertions(+), 45 deletions(-)
> 
> diff --git a/sizes.h b/sizes.h
> index 6f91e9b4bd23..a73bb87e4b5b 100644
> --- a/sizes.h
> +++ b/sizes.h
> @@ -1,14 +1,4 @@
> -/*
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
> - * GNU General Public License for more details.
> - */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*  Size defintions
>   *  Copyright (C) ARM Limited 1998. All rights reserved.
>   */
> diff --git a/src/barebox-state/state.c b/src/barebox-state/state.c
> index f528b3e19f21..e3825d6aeab2 100644
> --- a/src/barebox-state/state.c
> +++ b/src/barebox-state/state.c
> @@ -1,17 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * Copyright (C) 2012-2014 Pengutronix, Jan Luebbe <j.luebbe@pengutronix.de>
>   * Copyright (C) 2013-2014 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
>   * Copyright (C) 2015 Pengutronix, Marc Kleine-Budde <mkl@pengutronix.de>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
>   */
>  
>  #include <asm-generic/ioctl.h>
> diff --git a/src/barebox-state/state_variables.c b/src/barebox-state/state_variables.c
> index 16f630f57f9f..429f1f0a3479 100644
> --- a/src/barebox-state/state_variables.c
> +++ b/src/barebox-state/state_variables.c
> @@ -1,17 +1,8 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * Copyright (C) 2012-2014 Pengutronix, Jan Luebbe <j.luebbe@pengutronix.de>
>   * Copyright (C) 2013-2014 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
>   * Copyright (C) 2015 Pengutronix, Marc Kleine-Budde <mkl@pengutronix.de>
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> - * GNU General Public License for more details.
>   */
>  
>  #include <linux/err.h>
> diff --git a/src/base64.c b/src/base64.c
> index 6c02174d6377..5c7f9e884965 100644
> --- a/src/base64.c
> +++ b/src/base64.c
> @@ -1,11 +1,10 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * Code based on busybox-1.23.2
>   *
>   * Copyright 2003, Glenn McGrath
>   * Copyright 2006, Rob Landley <rob@landley.net>
>   * Copyright 2010, Denys Vlasenko
> - *
> - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
>   */
>  
>  #include <common.h>
> diff --git a/src/crypto/sha1.c b/src/crypto/sha1.c
> index cbde4d28e475..a66f4f2505d2 100644
> --- a/src/crypto/sha1.c
> +++ b/src/crypto/sha1.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * Cryptographic API.
>   *
> @@ -9,12 +10,6 @@
>   * Copyright (c) Alan Smithee.
>   * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
>   * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU General Public License as published by the Free
> - * Software Foundation; either version 2 of the License, or (at your option)
> - * any later version.
> - *
>   */
>  
>  #include <common.h>
> diff --git a/src/crypto/sha2.c b/src/crypto/sha2.c
> index cb0f11c77ea0..4b3da0c9d230 100644
> --- a/src/crypto/sha2.c
> +++ b/src/crypto/sha2.c
> @@ -1,3 +1,4 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
>  /*
>   * Cryptographic API.
>   *
> @@ -10,12 +11,6 @@
>   * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
>   * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
>   * SHA224 Support Copyright 2007 Intel Corporation <jonathan.lynch@intel.com>
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU General Public License as published by the Free
> - * Software Foundation; either version 2 of the License, or (at your option)
> - * any later version.
> - *
>   */
>  
>  #include <common.h>
> -- 
> 2.29.2
> 
> 

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de