* [PATCH 1/5] NSIS: Simplify license description
2024-09-10 11:51 [PATCH 0/5] license: Fix typos and update deprecated SPDX tags Philippe Mathieu-Daudé
@ 2024-09-10 11:51 ` Philippe Mathieu-Daudé
2024-09-10 12:00 ` Thomas Huth
2024-09-10 11:51 ` [PATCH 2/5] tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag Philippe Mathieu-Daudé
` (4 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-09-10 11:51 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Stefan Weil, Thomas Huth, Alex Bennée,
Paolo Bonzini, Peter Maydell, Daniel P . Berrangé,
qemu-trivial, Philippe Mathieu-Daudé
Since the "2 | 3+" expression can be simplified as "2+",
it is pointless to mention the GPLv3 license.
Add the corresponding SPDX identifier to remove all doubt.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
qemu.nsi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/qemu.nsi b/qemu.nsi
index 564d617d11..b186f223e1 100644
--- a/qemu.nsi
+++ b/qemu.nsi
@@ -7,7 +7,7 @@
; 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) version 3 or any later version.
+; (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
@@ -16,6 +16,8 @@
;
; You should have received a copy of the GNU General Public License
; along with this program. If not, see <http://www.gnu.org/licenses/>.
+;
+; SPDX-License-Identifier: GPL-2.0-or-later
; NSIS_WIN32_MAKENSIS
--
2.45.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 1/5] NSIS: Simplify license description
2024-09-10 11:51 ` [PATCH 1/5] NSIS: Simplify license description Philippe Mathieu-Daudé
@ 2024-09-10 12:00 ` Thomas Huth
0 siblings, 0 replies; 14+ messages in thread
From: Thomas Huth @ 2024-09-10 12:00 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Richard Henderson, Stefan Weil, Alex Bennée, Paolo Bonzini,
Peter Maydell, Daniel P . Berrangé, qemu-trivial
On 10/09/2024 13.51, Philippe Mathieu-Daudé wrote:
> Since the "2 | 3+" expression can be simplified as "2+",
> it is pointless to mention the GPLv3 license.
>
> Add the corresponding SPDX identifier to remove all doubt.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> qemu.nsi | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/5] tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag
2024-09-10 11:51 [PATCH 0/5] license: Fix typos and update deprecated SPDX tags Philippe Mathieu-Daudé
2024-09-10 11:51 ` [PATCH 1/5] NSIS: Simplify license description Philippe Mathieu-Daudé
@ 2024-09-10 11:51 ` Philippe Mathieu-Daudé
2024-09-10 11:55 ` Thomas Huth
2024-09-10 11:51 ` [PATCH 3/5] license: Update deprecated SPDX tag LGPL-2.0+ to LGPL-2.0-or-later Philippe Mathieu-Daudé
` (3 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-09-10 11:51 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Stefan Weil, Thomas Huth, Alex Bennée,
Paolo Bonzini, Peter Maydell, Daniel P . Berrangé,
qemu-trivial, Philippe Mathieu-Daudé
Cc: Alex Bennée <alex.bennee@linaro.org>
Fixes: 9f95111474 ("tests/avocado: re-factor igb test to avoid timeouts")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/functional/test_netdev_ethtool.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/functional/test_netdev_ethtool.py b/tests/functional/test_netdev_ethtool.py
index d5b911c918..ee1a397bd2 100755
--- a/tests/functional/test_netdev_ethtool.py
+++ b/tests/functional/test_netdev_ethtool.py
@@ -5,7 +5,7 @@
# This test leverages ethtool's --test sequence to validate network
# device behaviour.
#
-# SPDX-License-Identifier: GPL-2.0-or-late
+# SPDX-License-Identifier: GPL-2.0-or-later
from unittest import skip
from qemu_test import QemuSystemTest, Asset
--
2.45.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 2/5] tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag
2024-09-10 11:51 ` [PATCH 2/5] tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag Philippe Mathieu-Daudé
@ 2024-09-10 11:55 ` Thomas Huth
0 siblings, 0 replies; 14+ messages in thread
From: Thomas Huth @ 2024-09-10 11:55 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Richard Henderson, Stefan Weil, Alex Bennée, Paolo Bonzini,
Peter Maydell, Daniel P . Berrangé, qemu-trivial
On 10/09/2024 13.51, Philippe Mathieu-Daudé wrote:
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Fixes: 9f95111474 ("tests/avocado: re-factor igb test to avoid timeouts")
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> tests/functional/test_netdev_ethtool.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/functional/test_netdev_ethtool.py b/tests/functional/test_netdev_ethtool.py
> index d5b911c918..ee1a397bd2 100755
> --- a/tests/functional/test_netdev_ethtool.py
> +++ b/tests/functional/test_netdev_ethtool.py
> @@ -5,7 +5,7 @@
> # This test leverages ethtool's --test sequence to validate network
> # device behaviour.
> #
> -# SPDX-License-Identifier: GPL-2.0-or-late
> +# SPDX-License-Identifier: GPL-2.0-or-later
>
> from unittest import skip
> from qemu_test import QemuSystemTest, Asset
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 3/5] license: Update deprecated SPDX tag LGPL-2.0+ to LGPL-2.0-or-later
2024-09-10 11:51 [PATCH 0/5] license: Fix typos and update deprecated SPDX tags Philippe Mathieu-Daudé
2024-09-10 11:51 ` [PATCH 1/5] NSIS: Simplify license description Philippe Mathieu-Daudé
2024-09-10 11:51 ` [PATCH 2/5] tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag Philippe Mathieu-Daudé
@ 2024-09-10 11:51 ` Philippe Mathieu-Daudé
2024-09-10 12:02 ` Thomas Huth
2024-09-10 11:51 ` [PATCH 4/5] license: Update deprecated SPDX tag GPL-2.0+ to GPL-2.0-or-later Philippe Mathieu-Daudé
` (2 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-09-10 11:51 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Stefan Weil, Thomas Huth, Alex Bennée,
Paolo Bonzini, Peter Maydell, Daniel P . Berrangé,
qemu-trivial, Philippe Mathieu-Daudé
The 'LGPL-2.0+' license identifier has been deprecated since license
list version 2.0rc2 [1] and replaced by the 'LGPL-2.0-or-later' [2]
tag.
[1] https://spdx.org/licenses/LGPL-2.0+.html
[2] https://spdx.org/licenses/LGPL-2.0-or-later.html
Mechanical patch running:
$ sed -i -e s/LGPL-2.0+/LGPL-2.0-or-later/ \
$(git grep -l 'SPDX-License-Identifier: LGPL-2.0+$')
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/gdbstub/syscalls.h | 2 +-
include/gdbstub/user.h | 2 +-
target/alpha/cpu-param.h | 2 +-
target/arm/cpu-param.h | 2 +-
target/cris/cpu-param.h | 2 +-
target/hppa/cpu-param.h | 2 +-
target/i386/cpu-param.h | 2 +-
target/m68k/cpu-param.h | 2 +-
target/microblaze/cpu-param.h | 2 +-
target/mips/cpu-param.h | 2 +-
target/openrisc/cpu-param.h | 2 +-
target/ppc/cpu-param.h | 2 +-
target/sh4/cpu-param.h | 2 +-
target/sparc/cpu-param.h | 2 +-
target/sparc/insns.decode | 2 +-
gdbstub/gdbstub.c | 2 +-
gdbstub/syscalls.c | 2 +-
gdbstub/system.c | 2 +-
gdbstub/user-target.c | 2 +-
gdbstub/user.c | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/include/gdbstub/syscalls.h b/include/gdbstub/syscalls.h
index 54ff7245a1..d63228e96b 100644
--- a/include/gdbstub/syscalls.h
+++ b/include/gdbstub/syscalls.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 2023 Linaro Ltd
*
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef _SYSCALLS_H_
diff --git a/include/gdbstub/user.h b/include/gdbstub/user.h
index 3b8358e3da..654986d483 100644
--- a/include/gdbstub/user.h
+++ b/include/gdbstub/user.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 2022 Linaro Ltd
*
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef GDBSTUB_USER_H
diff --git a/target/alpha/cpu-param.h b/target/alpha/cpu-param.h
index 5ce213a9a1..c21ddf1afd 100644
--- a/target/alpha/cpu-param.h
+++ b/target/alpha/cpu-param.h
@@ -2,7 +2,7 @@
* Alpha cpu parameters for qemu.
*
* Copyright (c) 2007 Jocelyn Mayer
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef ALPHA_CPU_PARAM_H
diff --git a/target/arm/cpu-param.h b/target/arm/cpu-param.h
index fa6cae0e3a..bed29613c8 100644
--- a/target/arm/cpu-param.h
+++ b/target/arm/cpu-param.h
@@ -2,7 +2,7 @@
* ARM cpu parameters for qemu.
*
* Copyright (c) 2003 Fabrice Bellard
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef ARM_CPU_PARAM_H
diff --git a/target/cris/cpu-param.h b/target/cris/cpu-param.h
index b31b742c0d..4960e89d24 100644
--- a/target/cris/cpu-param.h
+++ b/target/cris/cpu-param.h
@@ -2,7 +2,7 @@
* CRIS cpu parameters for qemu.
*
* Copyright (c) 2007 AXIS Communications AB
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef CRIS_CPU_PARAM_H
diff --git a/target/hppa/cpu-param.h b/target/hppa/cpu-param.h
index 473d489f01..ef3200f0f3 100644
--- a/target/hppa/cpu-param.h
+++ b/target/hppa/cpu-param.h
@@ -2,7 +2,7 @@
* PA-RISC cpu parameters for qemu.
*
* Copyright (c) 2016 Richard Henderson <rth@twiddle.net>
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef HPPA_CPU_PARAM_H
diff --git a/target/i386/cpu-param.h b/target/i386/cpu-param.h
index 5e15335203..8c75abe141 100644
--- a/target/i386/cpu-param.h
+++ b/target/i386/cpu-param.h
@@ -2,7 +2,7 @@
* i386 cpu parameters for qemu.
*
* Copyright (c) 2003 Fabrice Bellard
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef I386_CPU_PARAM_H
diff --git a/target/m68k/cpu-param.h b/target/m68k/cpu-param.h
index 39dcbcece8..5bbe623ba7 100644
--- a/target/m68k/cpu-param.h
+++ b/target/m68k/cpu-param.h
@@ -2,7 +2,7 @@
* m68k cpu parameters for qemu.
*
* Copyright (c) 2005-2007 CodeSourcery
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef M68K_CPU_PARAM_H
diff --git a/target/microblaze/cpu-param.h b/target/microblaze/cpu-param.h
index e530fead1c..00efb509e3 100644
--- a/target/microblaze/cpu-param.h
+++ b/target/microblaze/cpu-param.h
@@ -2,7 +2,7 @@
* MicroBlaze cpu parameters for qemu.
*
* Copyright (c) 2009 Edgar E. Iglesias
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef MICROBLAZE_CPU_PARAM_H
diff --git a/target/mips/cpu-param.h b/target/mips/cpu-param.h
index 6f6ac1688f..f3a37e2dbe 100644
--- a/target/mips/cpu-param.h
+++ b/target/mips/cpu-param.h
@@ -1,7 +1,7 @@
/*
* MIPS cpu parameters for qemu.
*
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef MIPS_CPU_PARAM_H
diff --git a/target/openrisc/cpu-param.h b/target/openrisc/cpu-param.h
index fbfc0f568b..6169ed9f55 100644
--- a/target/openrisc/cpu-param.h
+++ b/target/openrisc/cpu-param.h
@@ -2,7 +2,7 @@
* OpenRISC cpu parameters for qemu.
*
* Copyright (c) 2011-2012 Jia Liu <proljc@gmail.com>
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef OPENRISC_CPU_PARAM_H
diff --git a/target/ppc/cpu-param.h b/target/ppc/cpu-param.h
index 77c5ed9a67..9c481b9f6c 100644
--- a/target/ppc/cpu-param.h
+++ b/target/ppc/cpu-param.h
@@ -2,7 +2,7 @@
* PowerPC cpu parameters for qemu.
*
* Copyright (c) 2007 Jocelyn Mayer
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef PPC_CPU_PARAM_H
diff --git a/target/sh4/cpu-param.h b/target/sh4/cpu-param.h
index a7cdb7edb6..a30ba992b3 100644
--- a/target/sh4/cpu-param.h
+++ b/target/sh4/cpu-param.h
@@ -2,7 +2,7 @@
* SH4 cpu parameters for qemu.
*
* Copyright (c) 2005 Samuel Tardieu
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef SH4_CPU_PARAM_H
diff --git a/target/sparc/cpu-param.h b/target/sparc/cpu-param.h
index 82293fb844..14105dc18b 100644
--- a/target/sparc/cpu-param.h
+++ b/target/sparc/cpu-param.h
@@ -1,7 +1,7 @@
/*
* Sparc cpu parameters for qemu.
*
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#ifndef SPARC_CPU_PARAM_H
diff --git a/target/sparc/insns.decode b/target/sparc/insns.decode
index 5fd478191a..d434a30106 100644
--- a/target/sparc/insns.decode
+++ b/target/sparc/insns.decode
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.0+
+# SPDX-License-Identifier: LGPL-2.0-or-later
#
# Sparc instruction decode definitions.
# Copyright (c) 2023 Richard Henderson <rth@twiddle.net>
diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
index d08568cea0..b1def7e71d 100644
--- a/gdbstub/gdbstub.c
+++ b/gdbstub/gdbstub.c
@@ -20,7 +20,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "qemu/osdep.h"
diff --git a/gdbstub/syscalls.c b/gdbstub/syscalls.c
index 4e1295b782..4ddd5cae06 100644
--- a/gdbstub/syscalls.c
+++ b/gdbstub/syscalls.c
@@ -7,7 +7,7 @@
* Copyright (c) 2003-2005 Fabrice Bellard
* Copyright (c) 2023 Linaro Ltd
*
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "qemu/osdep.h"
diff --git a/gdbstub/system.c b/gdbstub/system.c
index 1ad87fe7fd..c9f236e94f 100644
--- a/gdbstub/system.c
+++ b/gdbstub/system.c
@@ -7,7 +7,7 @@
* Copyright (c) 2003-2005 Fabrice Bellard
* Copyright (c) 2022 Linaro Ltd
*
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "qemu/osdep.h"
diff --git a/gdbstub/user-target.c b/gdbstub/user-target.c
index b5e01fd8b0..22bf4008c0 100644
--- a/gdbstub/user-target.c
+++ b/gdbstub/user-target.c
@@ -4,7 +4,7 @@
* Copyright (c) 2003-2005 Fabrice Bellard
* Copyright (c) 2022 Linaro Ltd
*
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "qemu/osdep.h"
diff --git a/gdbstub/user.c b/gdbstub/user.c
index b36033bc7a..0b4bfa9c48 100644
--- a/gdbstub/user.c
+++ b/gdbstub/user.c
@@ -6,7 +6,7 @@
* Copyright (c) 2003-2005 Fabrice Bellard
* Copyright (c) 2022 Linaro Ltd
*
- * SPDX-License-Identifier: LGPL-2.0+
+ * SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "qemu/osdep.h"
--
2.45.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 4/5] license: Update deprecated SPDX tag GPL-2.0+ to GPL-2.0-or-later
2024-09-10 11:51 [PATCH 0/5] license: Fix typos and update deprecated SPDX tags Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2024-09-10 11:51 ` [PATCH 3/5] license: Update deprecated SPDX tag LGPL-2.0+ to LGPL-2.0-or-later Philippe Mathieu-Daudé
@ 2024-09-10 11:51 ` Philippe Mathieu-Daudé
2024-09-10 12:03 ` Thomas Huth
2024-09-10 11:51 ` [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only Philippe Mathieu-Daudé
2024-09-10 18:25 ` [PATCH 0/5] license: Fix typos and update deprecated SPDX tags Richard Henderson
5 siblings, 1 reply; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-09-10 11:51 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Stefan Weil, Thomas Huth, Alex Bennée,
Paolo Bonzini, Peter Maydell, Daniel P . Berrangé,
qemu-trivial, Philippe Mathieu-Daudé
The 'GPL-2.0+' license identifier has been deprecated since license
list version 2.0rc2 [1] and replaced by the 'GPL-2.0-or-later' [2]
tag.
[1] https://spdx.org/licenses/GPL-2.0+.html
[2] https://spdx.org/licenses/GPL-2.0-or-later.html
Mechanical patch running:
$ sed -i -e s/GPL-2.0+/GPL-2.0-or-later/ \
$(git grep -l 'SPDX-License-Identifier: GPL-2.0+$')
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/riscv/cpu-param.h | 2 +-
target/s390x/cpu-param.h | 2 +-
hw/nvram/fw_cfg-acpi.c | 2 +-
hw/virtio/virtio-acpi.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/target/riscv/cpu-param.h b/target/riscv/cpu-param.h
index 1fbd64939d..25686192c0 100644
--- a/target/riscv/cpu-param.h
+++ b/target/riscv/cpu-param.h
@@ -2,7 +2,7 @@
* RISC-V cpu parameters for qemu.
*
* Copyright (c) 2017-2018 SiFive, Inc.
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef RISCV_CPU_PARAM_H
diff --git a/target/s390x/cpu-param.h b/target/s390x/cpu-param.h
index 11d23b600d..a05ffcf78d 100644
--- a/target/s390x/cpu-param.h
+++ b/target/s390x/cpu-param.h
@@ -2,7 +2,7 @@
* S/390 cpu parameters for qemu.
*
* Copyright (c) 2009 Ulrich Hecht
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#ifndef S390_CPU_PARAM_H
diff --git a/hw/nvram/fw_cfg-acpi.c b/hw/nvram/fw_cfg-acpi.c
index 58cdcd3121..2e6ef89b98 100644
--- a/hw/nvram/fw_cfg-acpi.c
+++ b/hw/nvram/fw_cfg-acpi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Add fw_cfg device in DSDT
*
diff --git a/hw/virtio/virtio-acpi.c b/hw/virtio/virtio-acpi.c
index 230a669500..85becef03c 100644
--- a/hw/virtio/virtio-acpi.c
+++ b/hw/virtio/virtio-acpi.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* virtio ACPI Support
*
--
2.45.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only
2024-09-10 11:51 [PATCH 0/5] license: Fix typos and update deprecated SPDX tags Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2024-09-10 11:51 ` [PATCH 4/5] license: Update deprecated SPDX tag GPL-2.0+ to GPL-2.0-or-later Philippe Mathieu-Daudé
@ 2024-09-10 11:51 ` Philippe Mathieu-Daudé
2024-09-10 12:04 ` Philippe Mathieu-Daudé
2024-09-10 12:04 ` Thomas Huth
2024-09-10 18:25 ` [PATCH 0/5] license: Fix typos and update deprecated SPDX tags Richard Henderson
5 siblings, 2 replies; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-09-10 11:51 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Stefan Weil, Thomas Huth, Alex Bennée,
Paolo Bonzini, Peter Maydell, Daniel P . Berrangé,
qemu-trivial, Philippe Mathieu-Daudé
The 'GPL-2.0' license identifier has been deprecated since license
list version 3.0 [1] and replaced by the 'GPL-2.0-only' tag [2].
[1] https://spdx.org/licenses/GPL-2.0.html
[2] https://spdx.org/licenses/GPL-2.0-only.html
Mechanical patch running:
$ sed -i -e s/GPL-2.0/GPL-2.0-only/ \
$(git grep -l 'SPDX-License-Identifier: GPL-2.0$')
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/qemu/crc-ccitt.h | 2 +-
linux-user/alpha/syscallhdr.sh | 2 +-
linux-user/arm/syscallhdr.sh | 2 +-
linux-user/hppa/syscallhdr.sh | 2 +-
linux-user/i386/syscallhdr.sh | 2 +-
linux-user/m68k/syscallhdr.sh | 2 +-
linux-user/microblaze/syscallhdr.sh | 2 +-
linux-user/mips/syscallhdr.sh | 2 +-
linux-user/mips64/syscallhdr.sh | 2 +-
linux-user/ppc/syscallhdr.sh | 2 +-
linux-user/s390x/syscallhdr.sh | 2 +-
linux-user/sh4/syscallhdr.sh | 2 +-
linux-user/sparc/syscallhdr.sh | 2 +-
linux-user/x86_64/syscallhdr.sh | 2 +-
linux-user/xtensa/syscallhdr.sh | 2 +-
scripts/kernel-doc | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/include/qemu/crc-ccitt.h b/include/qemu/crc-ccitt.h
index 8918dafe07..ce28e29720 100644
--- a/include/qemu/crc-ccitt.h
+++ b/include/qemu/crc-ccitt.h
@@ -8,7 +8,7 @@
*
* From Linux kernel v5.10 include/linux/crc-ccitt.h
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/
#ifndef CRC_CCITT_H
diff --git a/linux-user/alpha/syscallhdr.sh b/linux-user/alpha/syscallhdr.sh
index 55cafe6abf..6da0c957e2 100644
--- a/linux-user/alpha/syscallhdr.sh
+++ b/linux-user/alpha/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/arm/syscallhdr.sh b/linux-user/arm/syscallhdr.sh
index 4c952b2cfb..692fd6a76e 100644
--- a/linux-user/arm/syscallhdr.sh
+++ b/linux-user/arm/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/hppa/syscallhdr.sh b/linux-user/hppa/syscallhdr.sh
index ac91a95762..bf1c1d4f30 100644
--- a/linux-user/hppa/syscallhdr.sh
+++ b/linux-user/hppa/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/i386/syscallhdr.sh b/linux-user/i386/syscallhdr.sh
index b2eca96db7..938a793d2a 100644
--- a/linux-user/i386/syscallhdr.sh
+++ b/linux-user/i386/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/m68k/syscallhdr.sh b/linux-user/m68k/syscallhdr.sh
index eeb4d01d34..39b11dd05e 100644
--- a/linux-user/m68k/syscallhdr.sh
+++ b/linux-user/m68k/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/microblaze/syscallhdr.sh b/linux-user/microblaze/syscallhdr.sh
index f55dce8a62..b42b669154 100644
--- a/linux-user/microblaze/syscallhdr.sh
+++ b/linux-user/microblaze/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/mips/syscallhdr.sh b/linux-user/mips/syscallhdr.sh
index 761e3e47dd..cd7043ef5a 100644
--- a/linux-user/mips/syscallhdr.sh
+++ b/linux-user/mips/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/mips64/syscallhdr.sh b/linux-user/mips64/syscallhdr.sh
index ed5a45165a..a4339b2041 100644
--- a/linux-user/mips64/syscallhdr.sh
+++ b/linux-user/mips64/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/ppc/syscallhdr.sh b/linux-user/ppc/syscallhdr.sh
index 6c44e0eaad..6e8b93d673 100644
--- a/linux-user/ppc/syscallhdr.sh
+++ b/linux-user/ppc/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/s390x/syscallhdr.sh b/linux-user/s390x/syscallhdr.sh
index 85a99c48de..ac22d422b0 100755
--- a/linux-user/s390x/syscallhdr.sh
+++ b/linux-user/s390x/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/sh4/syscallhdr.sh b/linux-user/sh4/syscallhdr.sh
index 080790556a..cb3a5de711 100644
--- a/linux-user/sh4/syscallhdr.sh
+++ b/linux-user/sh4/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/sparc/syscallhdr.sh b/linux-user/sparc/syscallhdr.sh
index 34a99dc832..938a02bb48 100644
--- a/linux-user/sparc/syscallhdr.sh
+++ b/linux-user/sparc/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/x86_64/syscallhdr.sh b/linux-user/x86_64/syscallhdr.sh
index 182be52a74..988256b6c6 100644
--- a/linux-user/x86_64/syscallhdr.sh
+++ b/linux-user/x86_64/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/linux-user/xtensa/syscallhdr.sh b/linux-user/xtensa/syscallhdr.sh
index eef0644c94..dc787fbbfe 100644
--- a/linux-user/xtensa/syscallhdr.sh
+++ b/linux-user/xtensa/syscallhdr.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
in="$1"
out="$2"
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 240923d509..fec83f53ed 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
use warnings;
use strict;
--
2.45.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only
2024-09-10 11:51 ` [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only Philippe Mathieu-Daudé
@ 2024-09-10 12:04 ` Philippe Mathieu-Daudé
2024-09-10 12:09 ` Thomas Huth
2024-09-10 12:04 ` Thomas Huth
1 sibling, 1 reply; 14+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-09-10 12:04 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Stefan Weil, Thomas Huth, Alex Bennée,
Paolo Bonzini, Peter Maydell, Daniel P . Berrangé,
qemu-trivial
On 10/9/24 13:51, Philippe Mathieu-Daudé wrote:
> The 'GPL-2.0' license identifier has been deprecated since license
> list version 3.0 [1] and replaced by the 'GPL-2.0-only' tag [2].
>
> [1] https://spdx.org/licenses/GPL-2.0.html
> [2] https://spdx.org/licenses/GPL-2.0-only.html
>
> Mechanical patch running:
>
> $ sed -i -e s/GPL-2.0/GPL-2.0-only/ \
> $(git grep -l 'SPDX-License-Identifier: GPL-2.0$')
This didn't catch the full list, this command does:
$ sed -i -e s/GPL-2.0/GPL-2.0-only/ \
$(git grep -lE 'SPDX-License-Identifier: GPL-2.0( \*|$)' \
| egrep -v '^linux-headers|^include/standard-headers')
Thus squashing:
-- >8 --
diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h
index e5a47eab64..4dc4c31da2 100644
--- a/hw/net/igb_regs.h
+++ b/hw/net/igb_regs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* This is copied + edited from kernel header files in
* drivers/net/ethernet/intel/igb
diff --git a/tests/tcg/loongarch64/system/regdef.h
b/tests/tcg/loongarch64/system/regdef.h
index faa09b2377..b586b4e86d 100644
--- a/tests/tcg/loongarch64/system/regdef.h
+++ b/tests/tcg/loongarch64/system/regdef.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2021 Loongson Technology Corporation Limited
*/
---
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> include/qemu/crc-ccitt.h | 2 +-
> linux-user/alpha/syscallhdr.sh | 2 +-
> linux-user/arm/syscallhdr.sh | 2 +-
> linux-user/hppa/syscallhdr.sh | 2 +-
> linux-user/i386/syscallhdr.sh | 2 +-
> linux-user/m68k/syscallhdr.sh | 2 +-
> linux-user/microblaze/syscallhdr.sh | 2 +-
> linux-user/mips/syscallhdr.sh | 2 +-
> linux-user/mips64/syscallhdr.sh | 2 +-
> linux-user/ppc/syscallhdr.sh | 2 +-
> linux-user/s390x/syscallhdr.sh | 2 +-
> linux-user/sh4/syscallhdr.sh | 2 +-
> linux-user/sparc/syscallhdr.sh | 2 +-
> linux-user/x86_64/syscallhdr.sh | 2 +-
> linux-user/xtensa/syscallhdr.sh | 2 +-
> scripts/kernel-doc | 2 +-
> 16 files changed, 16 insertions(+), 16 deletions(-)
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only
2024-09-10 12:04 ` Philippe Mathieu-Daudé
@ 2024-09-10 12:09 ` Thomas Huth
0 siblings, 0 replies; 14+ messages in thread
From: Thomas Huth @ 2024-09-10 12:09 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Richard Henderson, Stefan Weil, Alex Bennée, Paolo Bonzini,
Peter Maydell, Daniel P . Berrangé, qemu-trivial
On 10/09/2024 14.04, Philippe Mathieu-Daudé wrote:
> On 10/9/24 13:51, Philippe Mathieu-Daudé wrote:
>> The 'GPL-2.0' license identifier has been deprecated since license
>> list version 3.0 [1] and replaced by the 'GPL-2.0-only' tag [2].
>>
>> [1] https://spdx.org/licenses/GPL-2.0.html
>> [2] https://spdx.org/licenses/GPL-2.0-only.html
>>
>> Mechanical patch running:
>>
>> $ sed -i -e s/GPL-2.0/GPL-2.0-only/ \
>> $(git grep -l 'SPDX-License-Identifier: GPL-2.0$')
>
> This didn't catch the full list, this command does:
>
> $ sed -i -e s/GPL-2.0/GPL-2.0-only/ \
> $(git grep -lE 'SPDX-License-Identifier: GPL-2.0( \*|$)' \
> | egrep -v '^linux-headers|^include/standard-headers')
>
> Thus squashing:
>
> -- >8 --
> diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h
> index e5a47eab64..4dc4c31da2 100644
> --- a/hw/net/igb_regs.h
> +++ b/hw/net/igb_regs.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * This is copied + edited from kernel header files in
> * drivers/net/ethernet/intel/igb
> diff --git a/tests/tcg/loongarch64/system/regdef.h
> b/tests/tcg/loongarch64/system/regdef.h
> index faa09b2377..b586b4e86d 100644
> --- a/tests/tcg/loongarch64/system/regdef.h
> +++ b/tests/tcg/loongarch64/system/regdef.h
> @@ -1,4 +1,4 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-only */
> /*
> * Copyright (c) 2021 Loongson Technology Corporation Limited
> */
Looks good, you can keep:
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only
2024-09-10 11:51 ` [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only Philippe Mathieu-Daudé
2024-09-10 12:04 ` Philippe Mathieu-Daudé
@ 2024-09-10 12:04 ` Thomas Huth
1 sibling, 0 replies; 14+ messages in thread
From: Thomas Huth @ 2024-09-10 12:04 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Richard Henderson, Stefan Weil, Alex Bennée, Paolo Bonzini,
Peter Maydell, Daniel P . Berrangé, qemu-trivial
On 10/09/2024 13.51, Philippe Mathieu-Daudé wrote:
> The 'GPL-2.0' license identifier has been deprecated since license
> list version 3.0 [1] and replaced by the 'GPL-2.0-only' tag [2].
>
> [1] https://spdx.org/licenses/GPL-2.0.html
> [2] https://spdx.org/licenses/GPL-2.0-only.html
>
> Mechanical patch running:
>
> $ sed -i -e s/GPL-2.0/GPL-2.0-only/ \
> $(git grep -l 'SPDX-License-Identifier: GPL-2.0$')
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/5] license: Fix typos and update deprecated SPDX tags
2024-09-10 11:51 [PATCH 0/5] license: Fix typos and update deprecated SPDX tags Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2024-09-10 11:51 ` [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only Philippe Mathieu-Daudé
@ 2024-09-10 18:25 ` Richard Henderson
5 siblings, 0 replies; 14+ messages in thread
From: Richard Henderson @ 2024-09-10 18:25 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Stefan Weil, Thomas Huth, Alex Bennée, Paolo Bonzini,
Peter Maydell, Daniel P . Berrangé, qemu-trivial
On 9/10/24 04:51, Philippe Mathieu-Daudé wrote:
> Philippe Mathieu-Daudé (5):
> NSIS: Simplify license description
> tests/functional: Correct typo in test_netdev_ethtool.py SPDX tag
> license: Update deprecated SPDX tag LGPL-2.0+ to LGPL-2.0-or-later
> license: Update deprecated SPDX tag GPL-2.0+ to GPL-2.0-or-later
> license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 14+ messages in thread