m68k/powerpc: Kill references to non-existent README.legal
Subsystems (5)
Geert Uytterhoeven
maintainercover m68k/powerpc: Kill references to non-existent README.legal
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.
Thanks for your comments!
Geert Uytterhoeven (2):
m68k: Replace GPL 2.0+ README.legal boilerplate by SPDX
powerpc: Replace GPL 2.0+ README.legal boilerplate by 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(-)
Signature · 12 lines
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 TorvaldsGeert Uytterhoeven
maintainerPATCH 1/2 m68k: Replace GPL 2.0+ README.legal boilerplate by SPDX
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-existant files by replacing the boilerplate with SPDX license identifiers.
--- 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(-)
arch/m68k/68000/entry.S +2 -5
@@ -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 */
arch/m68k/bvme6000/config.c +1 -4
@@ -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>
arch/m68k/coldfire/entry.S +2 -5
@@ -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
arch/m68k/ifpsp060/Makefile +2 -4
@@ -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
arch/m68k/kernel/entry.S +2 -5
@@ -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
arch/m68k/kernel/head.S +2 -6
@@ -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. -** */ /*
arch/m68k/mvme147/config.c +1 -4
@@ -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>
arch/m68k/mvme16x/config.c +1 -4
@@ -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>
arch/m68k/q40/config.c +1 -4
@@ -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>
Signature · 1 line
2.34.1
Re: [PATCH 1/2] m68k: Replace GPL 2.0+ README.legal boilerplate by SPDX
Hi Geert,
Quoted 9 lines · Geert Uytterhoeven
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-existant files by replacing the boilerplate with SPDX license identifiers.
Signed-off-by Geert Uytterhoeven <[email protected]>
Quoted 11 lines
--- 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(-)
Thank you for taking care of the ColdFire and 68000 ones as well!
Regards
Greg
Quoted 178 lines
arch/m68k/68000/entry.S +2
-5@@ -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 */arch/m68k/bvme6000/config.c +1
-4@@ -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> arch/m68k/coldfire/entry.S +2
-5@@ -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 Skovarch/m68k/ifpsp060/Makefile +2
-4@@ -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.oarch/m68k/kernel/entry.S +2
-5@@ -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 Skovarch/m68k/kernel/head.S +2
-6@@ -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. -** */ /*arch/m68k/mvme147/config.c +1
-4@@ -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> arch/m68k/mvme16x/config.c +1
-4@@ -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> arch/m68k/q40/config.c +1
-4@@ -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>
Geert Uytterhoeven
maintainerPATCH 2/2 powerpc: Replace GPL 2.0+ README.legal boilerplate by SPDX
In reply to Geert UytterhoevenUpstream 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-existant files by replacing the boilerplate with SPDX license identifiers.
--- 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(-)
arch/powerpc/kernel/ptrace/ptrace.c +1 -4
@@ -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>
arch/powerpc/kernel/signal.c +1 -4
@@ -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>
arch/powerpc/kernel/signal.h +2 -5
@@ -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
Signature · 1 line
2.34.1
Le 07/09/2023 à 16:21, Geert Uytterhoeven a écrit :
Quoted 28 lines
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---
Quoted 8 lines
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.
Thanks for your comments!
As far as I know this kind of patch has to be copied to [email protected]
Christophe
Quoted 21 lines
Geert Uytterhoeven (2):
m68k: Replace GPL 2.0+ README.legal boilerplate by SPDX
powerpc: Replace GPL 2.0+ README.legal boilerplate by SPDXarch/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(-)
Geert Uytterhoeven
maintainerHi Christophe,
Quoted 31 lines · Christophe Leroy
Quoted 30 lines · Geert Uytterhoeven
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.
Quoted 7 lines
Quoted 4 lines
This patch series gets rid of the references to README.legal by replacing the boilerplate with SPDX license identifiers.
Thanks for your comments!
As far as I know this kind of patch has to be copied to [email protected]
Thanks, added to CC.
Quoted 6 lines
Quoted 6 lines
Geert Uytterhoeven (2):
m68k: Replace GPL 2.0+ README.legal boilerplate by SPDX
powerpc: Replace GPL 2.0+ README.legal boilerplate by SPDX
Quoted 13 lines
Quoted 5 lines
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 ++-----Quoted 8 lines
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(-)
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
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