| Message ID | 20241023085852.1061031-37-mark.cave-ayland@ilande.co.uk (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | next-cube: more tidy-ups and improvements | expand |
On Wed, Oct 23, 2024 at 09:58:52AM +0100, Mark Cave-Ayland wrote: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/m68k/next-cube.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c > index eefb372dca..c961d5fef6 100644 > --- a/hw/m68k/next-cube.c > +++ b/hw/m68k/next-cube.c > @@ -4,10 +4,7 @@ > * Copyright (c) 2011 Bryce Lanham > * Copyright (c) 2024 Mark Cave-Ayland > * > - * This code 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. > + * SPDX-License-Identifier: GPL-2.0-or-later Although the Kernel folks did such replacements, IMHO we should be wary about removing existing license boilerplate text, as it is potentially in conflict with the requirements in clause 1 of the license to keep all existing notices intact, depending on your interpretation. With regards, Daniel
On 23/10/2024 10:30, Daniel P. Berrangé wrote: > On Wed, Oct 23, 2024 at 09:58:52AM +0100, Mark Cave-Ayland wrote: >> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> >> --- >> hw/m68k/next-cube.c | 5 +---- >> 1 file changed, 1 insertion(+), 4 deletions(-) >> >> diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c >> index eefb372dca..c961d5fef6 100644 >> --- a/hw/m68k/next-cube.c >> +++ b/hw/m68k/next-cube.c >> @@ -4,10 +4,7 @@ >> * Copyright (c) 2011 Bryce Lanham >> * Copyright (c) 2024 Mark Cave-Ayland >> * >> - * This code 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. >> + * SPDX-License-Identifier: GPL-2.0-or-later > > Although the Kernel folks did such replacements, IMHO we should be > wary about removing existing license boilerplate text, as it is > potentially in conflict with the requirements in clause 1 of the > license to keep all existing notices intact, depending on your > interpretation. Hmmm. Do we have a specific list of criteria where this may or may not be appropriate? FWIW the NeXTCube machine was written as part of GSoC back in 2011 (https://wiki.qemu.org/Google_Summer_of_Code_2011#NeXT_machines_system_emulation) so I'm confident that the code was written with the intention of being upstreamed and covered by the standard GPL-v2.0 or later license used by QEMU. ATB, Mark.
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index eefb372dca..c961d5fef6 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -4,10 +4,7 @@ * Copyright (c) 2011 Bryce Lanham * Copyright (c) 2024 Mark Cave-Ayland * - * This code 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. + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h"
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/m68k/next-cube.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)