Hi all,
Several source files contain license boilerplate that refers to the file
"README.legal", which never existed in upstream Linux. This is a relic
from the early port of Linux to the m68k processor family, before it was
merged in v1.3.94. Later, copies of this boilerplate ended up in the
PowerPC port.
The "README.legal" file (from e.g. [1]) read:
---8<-----------------------------------------------------------------
Legal information about the Linux/68k software package
All files contained in this archive are copyrighted by one or more
person. They are not in the public domain.
Most of the files are copyrighted by Linus Torvalds, the original
writer of Linux for IBM PC clone systems. Some parts are copyrighted
by other IBM PC linux developers. Other parts are copyrighted by
Linux/68k developers.
This package is subject to the terms and conditions of the GNU General
Public License. A copy of this license may be found in the file named
"COPYING" which should be in the same directory as this file. If the
file has been omitted, you may obtain it by writing to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
----------------------------------------------------------------->8---
Note that the "COPYING" file at that time corresponded to the version
from upstream Linux v0.99.11 until v2.1.104, and thus predated the
addition of the "only valid GPL version is v2" clause in v2.4.0-test8.
This patch series gets rid of the references to README.legal by
replacing the boilerplate with SPDX license identifiers.
Changes compared to v1[2]:
- Add Acked-by,
- s/existant/existent/.
Thanks for your comments!
[1] https://www.ibiblio.org/pub/historic-linux/ftp-archives/tsx-11.mit.edu/Oct-07-1996/680x0/v0.9/linux-0.9.tar.gz
[2] "[PATCH 0/2] m68k/powerpc: Kill references to non-existent README.legal
https://lore.kernel.org/r/[email protected]
Geert Uytterhoeven (2):
m68k: Replace GPL 2.0+ README.legal boilerplate with SPDX
powerpc: Replace GPL 2.0+ README.legal boilerplate with SPDX
arch/m68k/68000/entry.S | 7 ++-----
arch/m68k/bvme6000/config.c | 5 +----
arch/m68k/coldfire/entry.S | 7 ++-----
arch/m68k/ifpsp060/Makefile | 6 ++----
arch/m68k/kernel/entry.S | 7 ++-----
arch/m68k/kernel/head.S | 8 ++------
arch/m68k/mvme147/config.c | 5 +----
arch/m68k/mvme16x/config.c | 5 +----
arch/m68k/q40/config.c | 5 +----
arch/powerpc/kernel/ptrace/ptrace.c | 5 +----
arch/powerpc/kernel/signal.c | 5 +----
arch/powerpc/kernel/signal.h | 7 ++-----
12 files changed, 18 insertions(+), 54 deletions(-)
--
2.34.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Upstream Linux never had a "README.legal" file, but it was present
in early source releases of Linux/m68k. It contained a simple copyright
notice and a link to a version of the "COPYING" file that predated the
addition of the "only valid GPL version is v2" clause.
Get rid of the references to non-existent files by replacing the
boilerplate with SPDX license identifiers.
Signed-off-by: Geert Uytterhoeven <[email protected]>
Acked-by: Greg Ungerer <[email protected]>
---
v2:
- Add Acked-by,
- s/existant/existent/.
---
arch/m68k/68000/entry.S | 7 ++-----
arch/m68k/bvme6000/config.c | 5 +----
arch/m68k/coldfire/entry.S | 7 ++-----
arch/m68k/ifpsp060/Makefile | 6 ++----
arch/m68k/kernel/entry.S | 7 ++-----
arch/m68k/kernel/head.S | 8 ++------
arch/m68k/mvme147/config.c | 5 +----
arch/m68k/mvme16x/config.c | 5 +----
arch/m68k/q40/config.c | 5 +----
9 files changed, 14 insertions(+), 41 deletions(-)
diff --git a/arch/m68k/68000/entry.S b/arch/m68k/68000/entry.S
index 7d63e2f1555a03dc..72e95663b62ffd54 100644
--- a/arch/m68k/68000/entry.S
+++ b/arch/m68k/68000/entry.S
@@ -1,12 +1,9 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ *
* entry.S -- non-mmu 68000 interrupt and exception entry points
*
* Copyright (C) 1991, 1992 Linus Torvalds
*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file README.legal in the main directory of this archive
- * for more details.
- *
* Linux/m68k support by Hamish Macdonald
*/
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index e604fe6602461334..8a2ee69a09f6659c 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* arch/m68k/bvme6000/config.c
*
@@ -8,10 +9,6 @@
* linux/amiga/config.c
*
* Copyright (C) 1993 Hamish Macdonald
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file README.legal in the main directory of this archive
- * for more details.
*/
#include <linux/types.h>
diff --git a/arch/m68k/coldfire/entry.S b/arch/m68k/coldfire/entry.S
index 35104c5417ff4d07..4ea08336e2fb0aae 100644
--- a/arch/m68k/coldfire/entry.S
+++ b/arch/m68k/coldfire/entry.S
@@ -1,4 +1,5 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ *
* entry.S -- interrupt and exception processing for ColdFire
*
* Copyright (C) 1999-2007, Greg Ungerer ([email protected])
@@ -13,10 +14,6 @@
*
* Copyright (C) 1991, 1992 Linus Torvalds
*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file README.legal in the main directory of this archive
- * for more details.
- *
* Linux/m68k support by Hamish Macdonald
*
* 68060 fixes by Jesper Skov
diff --git a/arch/m68k/ifpsp060/Makefile b/arch/m68k/ifpsp060/Makefile
index 56b530a96c2f33b5..00d0621f547ccb93 100644
--- a/arch/m68k/ifpsp060/Makefile
+++ b/arch/m68k/ifpsp060/Makefile
@@ -1,7 +1,5 @@
-# Makefile for 680x0 Linux 68060 integer/floating point support package
+# SPDX-License-Identifier: GPL-2.0-or-later
#
-# This file is subject to the terms and conditions of the GNU General Public
-# License. See the file "README.legal" in the main directory of this archive
-# for more details.
+# Makefile for 680x0 Linux 68060 integer/floating point support package
obj-y := fskeleton.o iskeleton.o os.o
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index 4dd2fd7acba9ea07..3bcdd32a6b36613d 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -1,13 +1,10 @@
-/* -*- mode: asm -*-
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * -*- mode: asm -*-
*
* linux/arch/m68k/kernel/entry.S
*
* Copyright (C) 1991, 1992 Linus Torvalds
*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file README.legal in the main directory of this archive
- * for more details.
- *
* Linux/m68k support by Hamish Macdonald
*
* 68060 fixes by Jesper Skov
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index 9e812d8606be8301..852255cf60dec132 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -1,4 +1,5 @@
-/* -*- mode: asm -*-
+/* SPDX-License-Identifier: GPL-2.0-or-later
+** -*- mode: asm -*-
**
** head.S -- This file contains the initial boot code for the
** Linux/68k kernel.
@@ -25,11 +26,6 @@
** for linux-2.1.115
** 1999/02/11 Richard Zidlicky: added Q40 support (initial version 99/01/01)
** 2004/05/13 Kars de Jong: Finalised HP300 support
-**
-** This file is subject to the terms and conditions of the GNU General Public
-** License. See the file README.legal in the main directory of this archive
-** for more details.
-**
*/
/*
diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c
index 7dfacd0b207a9750..8b5dc07f0811f2fc 100644
--- a/arch/m68k/mvme147/config.c
+++ b/arch/m68k/mvme147/config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* arch/m68k/mvme147/config.c
*
@@ -7,10 +8,6 @@
* Based on:
*
* Copyright (C) 1993 Hamish Macdonald
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file README.legal in the main directory of this archive
- * for more details.
*/
#include <linux/types.h>
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index 9bb9a33e43c246c4..d1fbd1704d65822f 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* arch/m68k/mvme16x/config.c
*
@@ -8,10 +9,6 @@
* linux/amiga/config.c
*
* Copyright (C) 1993 Hamish Macdonald
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file README.legal in the main directory of this archive
- * for more details.
*/
#include <linux/types.h>
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index 2c51c2b4a4fbbf79..de7870ad2a30620d 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* arch/m68k/q40/config.c
*
@@ -6,10 +7,6 @@
* originally based on:
*
* linux/bvme/config.c
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file README.legal in the main directory of this archive
- * for more details.
*/
#include <linux/errno.h>
--
2.34.1
Upstream Linux never had a "README.legal" file, but it was present
in early source releases of Linux/m68k. It contained a simple copyright
notice and a link to a version of the "COPYING" file that predated the
addition of the "only valid GPL version is v2" clause.
Get rid of the references to non-existent files by replacing the
boilerplate with SPDX license identifiers.
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
v2:
- s/existant/existent/.
---
arch/powerpc/kernel/ptrace/ptrace.c | 5 +----
arch/powerpc/kernel/signal.c | 5 +----
arch/powerpc/kernel/signal.h | 7 ++-----
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/arch/powerpc/kernel/ptrace/ptrace.c b/arch/powerpc/kernel/ptrace/ptrace.c
index 5d7a72b41ae71158..727ed4a145451356 100644
--- a/arch/powerpc/kernel/ptrace/ptrace.c
+++ b/arch/powerpc/kernel/ptrace/ptrace.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* PowerPC version
* Copyright (C) 1995-1996 Gary Thomas ([email protected])
@@ -9,10 +10,6 @@
*
* Modified by Cort Dougan ([email protected])
* and Paul Mackerras ([email protected]).
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file README.legal in the main directory of
- * this archive for more details.
*/
#include <linux/regset.h>
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 68a91e553e14cea2..aa17e62f37547a79 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Common signal handling code for both 32 and 64 bits
*
* Copyright (c) 2007 Benjamin Herrenschmidt, IBM Corporation
* Extracted from signal_32.c and signal_64.c
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file README.legal in the main directory of
- * this archive for more details.
*/
#include <linux/resume_user_mode.h>
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h
index a429c57ed4331805..58ecea1cdc27ae80 100644
--- a/arch/powerpc/kernel/signal.h
+++ b/arch/powerpc/kernel/signal.h
@@ -1,10 +1,7 @@
-/*
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Copyright (c) 2007 Benjamin Herrenschmidt, IBM Corporation
* Extracted from signal_32.c and signal_64.c
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file README.legal in the main directory of
- * this archive for more details.
*/
#ifndef _POWERPC_ARCH_SIGNAL_H
--
2.34.1
Hi Michael,
On Tue, Sep 19, 2023 at 4:13 AM Michael Ellerman <[email protected]> wrote:
> Geert Uytterhoeven <[email protected]> writes:
> > Upstream Linux never had a "README.legal" file, but it was present
> > in early source releases of Linux/m68k. It contained a simple copyright
> > notice and a link to a version of the "COPYING" file that predated the
> > addition of the "only valid GPL version is v2" clause.
> >
> > Get rid of the references to non-existent files by replacing the
> > boilerplate with SPDX license identifiers.
> >
> > Signed-off-by: Geert Uytterhoeven <[email protected]>
>
> LGTM.
>
> Acked-by: Michael Ellerman <[email protected]> (powerpc)
Can you please take it through the PPC tree?
Thanks!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Geert Uytterhoeven <[email protected]> writes:
> Upstream Linux never had a "README.legal" file, but it was present
> in early source releases of Linux/m68k. It contained a simple copyright
> notice and a link to a version of the "COPYING" file that predated the
> addition of the "only valid GPL version is v2" clause.
>
> Get rid of the references to non-existent files by replacing the
> boilerplate with SPDX license identifiers.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
LGTM.
Acked-by: Michael Ellerman <[email protected]> (powerpc)
cheers
Geert Uytterhoeven <[email protected]> writes:
> Hi Michael,
>
> On Tue, Sep 19, 2023 at 4:13 AM Michael Ellerman <[email protected]> wrote:
>> Geert Uytterhoeven <[email protected]> writes:
>> > Upstream Linux never had a "README.legal" file, but it was present
>> > in early source releases of Linux/m68k. It contained a simple copyright
>> > notice and a link to a version of the "COPYING" file that predated the
>> > addition of the "only valid GPL version is v2" clause.
>> >
>> > Get rid of the references to non-existent files by replacing the
>> > boilerplate with SPDX license identifiers.
>> >
>> > Signed-off-by: Geert Uytterhoeven <[email protected]>
>>
>> LGTM.
>>
>> Acked-by: Michael Ellerman <[email protected]> (powerpc)
>
> Can you please take it through the PPC tree?
Sure thing.
cheers
On Mon, 18 Sep 2023 12:14:42 +0200, Geert Uytterhoeven wrote:
> Note that the "COPYING" file at that time corresponded to the version
> from upstream Linux v0.99.11 until v2.1.104, and thus predated the
> addition of the "only valid GPL version is v2" clause in v2.4.0-test8.
>
> This patch series gets rid of the references to README.legal by
> replacing the boilerplate with SPDX license identifiers.
>
> [...]
Applied to powerpc/next.
[2/2] powerpc: Replace GPL 2.0+ README.legal boilerplate with SPDX
https://git.kernel.org/powerpc/c/6fcb13972bc2b41211e1dddb02f5e73199addc75
cheers