[PATCH] net: Replace license and copyright boilerplate by SPDX identfiers

Uwe Kleine-König u.kleine-koenig at pengutronix.de
Thu Oct 29 17:14:04 EDT 2020


Converts the files that licensecheck can determine to be licensed under
GPL-2.0-only or GPL-2.0-or-later and also convert the copyright statements
to SPDX.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
---
 net/eth.c        | 17 ++---------------
 net/ifup.c       | 20 +++++---------------
 net/lib.c        | 24 +++++++-----------------
 net/net.c        | 24 +++++++-----------------
 net/netconsole.c | 19 ++++---------------
 net/nfs.h        | 10 ++--------
 net/rarp.h       | 18 ++----------------
 net/sntp.c       | 11 +----------
 8 files changed, 30 insertions(+), 113 deletions(-)

diff --git a/net/eth.c b/net/eth.c
index 85110ef69585..626b35d5cc65 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -1,18 +1,5 @@
-/*
- * (C) Copyright 2001-2004
- * Wolfgang Denk, DENX Software Engineering, wd at denx.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.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: 2001-2004 Wolfgang Denk <wd at denx.de>, DENX Software Engineering
 
 #include <common.h>
 #include <command.h>
diff --git a/net/ifup.c b/net/ifup.c
index 4b69777c164d..a74037939b8a 100644
--- a/net/ifup.c
+++ b/net/ifup.c
@@ -1,18 +1,8 @@
-/*
- * ifup.c - bring up network interfaces
- *
- * Copyright (c) 2014 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * 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 detaiifup.
- *
- */
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: 2014 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
+
+/* ifup.c - bring up network interfaces */
+
 #define pr_fmt(fmt)  "ifup: " fmt
 
 #include <environment.h>
diff --git a/net/lib.c b/net/lib.c
index 8dc35c1e52a6..d4536441bd71 100644
--- a/net/lib.c
+++ b/net/lib.c
@@ -1,24 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: 2015 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
+// SPDX-FileCopyrightText: 1994-2000 Neil Russell
+// SPDX-FileCopyrightText: 2000 Roland Borde
+// SPDX-FileCopyrightText: 2000 Paolo Scaffardi
+// SPDX-FileCopyrightText: 2000-2002 Wolfgang Denk <wd at denx.de>
+
 /*
  * net.c - barebox networking support
  *
- * Copyright (c) 2015 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
- *
  * based on U-Boot (LiMon) code
- *
- * Copyright 1994 - 2000 Neil Russell.
- * Copyright 2000 Roland Borde
- * Copyright 2000 Paolo Scaffardi
- * Copyright 2000-2002 Wolfgang Denk, wd at denx.de
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * 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 <common.h>
diff --git a/net/net.c b/net/net.c
index e6ac4c68faee..4dffc1bd523a 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1,24 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: 2010 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
+// SPDX-FileCopyrightText: 1994-2000 Neil Russell
+// SPDX-FileCopyrightText: 2000 Roland Borde
+// SPDX-FileCopyrightText: 2000 Paolo Scaffardi
+// SPDX-FileCopyrightText: 2000-2002 Wolfgang Denk <wd at denx.de>
+
 /*
  * net.c - barebox networking support
  *
- * Copyright (c) 2010 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
- *
  * based on U-Boot (LiMon) code
- *
- * Copyright 1994 - 2000 Neil Russell.
- * Copyright 2000 Roland Borde
- * Copyright 2000 Paolo Scaffardi
- * Copyright 2000-2002 Wolfgang Denk, wd at denx.de
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * 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.
- *
  */
 
 #define pr_fmt(fmt) "net: " fmt
diff --git a/net/netconsole.c b/net/netconsole.c
index 0fece65a2379..43f78997b81c 100644
--- a/net/netconsole.c
+++ b/net/netconsole.c
@@ -1,18 +1,7 @@
-/*
- * netconsole.c - network console support
- *
- * Copyright (c) 2010 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * 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-only
+// SPDX-FileCopyrightText: 2010 Sascha Hauer <s.hauer at pengutronix.de>, Pengutronix
+
+/* netconsole.c - network console support */
 
 #define pr_fmt(fmt) "netconsole: " fmt
 
diff --git a/net/nfs.h b/net/nfs.h
index 7c7a648e46b1..e9ac5f299af0 100644
--- a/net/nfs.h
+++ b/net/nfs.h
@@ -1,11 +1,5 @@
-/*
- * (C) Masami Komiya <mkomiya at sonare.it> 2004
- *
- * 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, or (at
- * your option) any later version.
- */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-FileCopyrightText: 2004 Masami Komiya <mkomiya at sonare.it> */
 
 #ifndef __NFS_H__
 #define __NFS_H__
diff --git a/net/rarp.h b/net/rarp.h
index 24659fde2141..0986b02513fb 100644
--- a/net/rarp.h
+++ b/net/rarp.h
@@ -1,19 +1,5 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.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.
- *
- */
-
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-FileCopyrightText: 2000 Wolfgang Denk <wd at denx.de>, DENX Software Engineering */
 
 #ifndef __RARP_H__
 #define __RARP_H__
diff --git a/net/sntp.c b/net/sntp.c
index b4e6d6439c37..45449fd95b1e 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -1,13 +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; version 2.
- *
- * 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-only
 
 #include <common.h>
 #include <asm/byteorder.h>
-- 
2.28.0




More information about the barebox mailing list