1. Patchew
  2. QEMU
  3. [PATCH 0/5] license: Fix typos and update deprecated SPDX tags
  4. View patch

[PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only

Philippe Mathieu-Daudé posted 5 patches 2 months, 2 weeks ago
[PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only
Posted by Philippe Mathieu-Daudé 2 months, 2 weeks ago 
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
Re: [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only
Posted by Philippe Mathieu-Daudé 2 months, 2 weeks ago 
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(-)
Re: [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only
Posted by Thomas Huth 2 months, 2 weeks ago 
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>
Re: [PATCH 5/5] license: Update deprecated SPDX tag GPL-2.0 to GPL-2.0-only
Posted by Thomas Huth 2 months, 2 weeks ago 
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>

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.