[PATCH] Avoid deprecated SPDX license Identifier "GPL-2.0"

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

This had the semantic of current Identifier "GPL-2.0-only", so switch to
that.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
.editorconfig | 2 +-
.github/workflows/coverity.yaml | 2 +-
.github/workflows/main.yaml | 2 +-
Makefile.am | 2 +-
bootguard.c | 2 +-
completion/bg_printenv/cli.py | 2 +-
completion/bg_setenv/cli.py | 2 +-
completion/common.py | 2 +-
configure.ac | 2 +-
drivers/utils/simatic.c | 2 +-
drivers/utils/smbios.c | 2 +-
drivers/watchdog/amdfch_wdt.c | 2 +-
drivers/watchdog/atom-quark.c | 2 +-
drivers/watchdog/eiois200_wdt.c | 2 +-
drivers/watchdog/hpwdt.c | 2 +-
drivers/watchdog/i6300esb.c | 2 +-
drivers/watchdog/ipc4x7e_wdt.c | 2 +-
drivers/watchdog/ipmi_wdt.c | 2 +-
drivers/watchdog/itco.c | 2 +-
drivers/watchdog/w83627hf_wdt.c | 2 +-
drivers/watchdog/wdat.c | 2 +-
drivers/watchdog/wdfuncs_end.c | 2 +-
drivers/watchdog/wdfuncs_start.c | 2 +-
env/env_api.c | 2 +-
env/env_api_crc32.c | 2 +-
env/env_api_fat.c | 2 +-
env/env_config_file.c | 2 +-
env/env_config_partitions.c | 2 +-
env/env_disk_utils.c | 2 +-
env/fatvars.c | 2 +-
env/syspart.c | 2 +-
env/uservars.c | 2 +-
gen_version_h | 2 +-
include/bootguard.h | 2 +-
include/configuration.h | 2 +-
include/ebgenv.h | 2 +-
include/ebgpart.h | 2 +-
include/env_api.h | 2 +-
include/env_config_file.h | 2 +-
include/env_config_partitions.h | 2 +-
include/env_disk_utils.h | 2 +-
include/envdata.h | 2 +-
include/loader_interface.h | 2 +-
include/mmio.h | 2 +-
include/simatic.h | 2 +-
include/smbios.h | 2 +-
include/syspart.h | 2 +-
include/test-interface.h | 2 +-
include/uservars.h | 2 +-
include/utils.h | 2 +-
kernel-stub/fdt.c | 2 +-
kernel-stub/initrd.c | 2 +-
kernel-stub/kernel-stub.h | 2 +-
kernel-stub/main.c | 2 +-
libebgenv.pc.in | 2 +-
loader_interface.c | 2 +-
main.c | 2 +-
scripts/cppcheck.sh | 2 +-
scripts/make_release | 2 +-
tests/bg_setenv.bats | 2 +-
tools/bg_envtools.c | 2 +-
tools/bg_envtools.h | 2 +-
tools/bg_gen_unified_kernel | 2 +-
tools/bg_printenv.c | 2 +-
tools/bg_printenv.h | 2 +-
tools/bg_setenv.c | 2 +-
tools/bg_setenv.h | 2 +-
tools/ebgpart.c | 2 +-
tools/fat.c | 2 +-
tools/fat.h | 2 +-
tools/linux_util.h | 2 +-
tools/main.c | 2 +-
tools/tests/Makefile.am | 2 +-
tools/tests/fake_devices.c | 2 +-
tools/tests/fake_devices.h | 2 +-
tools/tests/test_bgenv_init_retval.c | 2 +-
tools/tests/test_ebgenv_api.c | 2 +-
tools/tests/test_ebgenv_api_internal.c | 2 +-
tools/tests/test_fat.c | 2 +-
tools/tests/test_main.c | 2 +-
tools/tests/test_probe_config_file.c | 2 +-
tools/tests/test_probe_config_partitions.c | 2 +-
tools/tests/test_uservars.c | 2 +-
utils.c | 2 +-
84 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 35b4038..2ab7d0e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,7 +5,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only

# This file is meant to set up your editor, see https://editorconfig.org.
root = true
diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml
index 2478e87..1de3a6e 100644
--- a/.github/workflows/coverity.yaml
+++ b/.github/workflows/coverity.yaml
@@ -10,7 +10,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
#

name: Coverity Scan
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 49d887a..faa5492 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -10,7 +10,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
#

name: CI
diff --git a/Makefile.am b/Makefile.am
index 34a7ee7..ab72c4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
#
# Based on Makefile.am of gummiboot,
# Copyright (C) 2013 Karel Zak <kz...@redhat.com>
diff --git a/bootguard.c b/bootguard.c
index 55811dd..c9c5328 100644
--- a/bootguard.c
+++ b/bootguard.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include "bootguard.h"
diff --git a/completion/bg_printenv/cli.py b/completion/bg_printenv/cli.py
index a50bc43..4bcfff9 100644
--- a/completion/bg_printenv/cli.py
+++ b/completion/bg_printenv/cli.py
@@ -7,7 +7,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only

import argparse

diff --git a/completion/bg_setenv/cli.py b/completion/bg_setenv/cli.py
index 9698882..362b2f9 100644
--- a/completion/bg_setenv/cli.py
+++ b/completion/bg_setenv/cli.py
@@ -7,7 +7,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only

import argparse

diff --git a/completion/common.py b/completion/common.py
index 42d789a..622d654 100644
--- a/completion/common.py
+++ b/completion/common.py
@@ -7,7 +7,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only

import shtab

diff --git a/configure.ac b/configure.ac
index e58065f..36fc8d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
#
# Based on configure.ac of gummiboot,
# Copyright (C) 2013 Karel Zak <kz...@redhat.com>
diff --git a/drivers/utils/simatic.c b/drivers/utils/simatic.c
index 376dc42..777fc1a 100644
--- a/drivers/utils/simatic.c
+++ b/drivers/utils/simatic.c
@@ -11,7 +11,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/utils/smbios.c b/drivers/utils/smbios.c
index a765288..8b75132 100644
--- a/drivers/utils/smbios.c
+++ b/drivers/utils/smbios.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <smbios.h>
diff --git a/drivers/watchdog/amdfch_wdt.c b/drivers/watchdog/amdfch_wdt.c
index a071d85..2b4db04 100644
--- a/drivers/watchdog/amdfch_wdt.c
+++ b/drivers/watchdog/amdfch_wdt.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/atom-quark.c b/drivers/watchdog/atom-quark.c
index 66c2a06..1191231 100644
--- a/drivers/watchdog/atom-quark.c
+++ b/drivers/watchdog/atom-quark.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/eiois200_wdt.c b/drivers/watchdog/eiois200_wdt.c
index db7b3ed..780a18c 100644
--- a/drivers/watchdog/eiois200_wdt.c
+++ b/drivers/watchdog/eiois200_wdt.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 9b31c40..8987558 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index 69a64e0..50540ea 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/ipc4x7e_wdt.c b/drivers/watchdog/ipc4x7e_wdt.c
index 13ef89f..af478ff 100644
--- a/drivers/watchdog/ipc4x7e_wdt.c
+++ b/drivers/watchdog/ipc4x7e_wdt.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/ipmi_wdt.c b/drivers/watchdog/ipmi_wdt.c
index abbd0f7..d98f60f 100644
--- a/drivers/watchdog/ipmi_wdt.c
+++ b/drivers/watchdog/ipmi_wdt.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/itco.c b/drivers/watchdog/itco.c
index 3d077e5..04e38be 100644
--- a/drivers/watchdog/itco.c
+++ b/drivers/watchdog/itco.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 68cb42a..cd89c90 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -33,7 +33,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/wdat.c b/drivers/watchdog/wdat.c
index 4d77c35..15e1e18 100644
--- a/drivers/watchdog/wdat.c
+++ b/drivers/watchdog/wdat.c
@@ -12,7 +12,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/wdfuncs_end.c b/drivers/watchdog/wdfuncs_end.c
index 1a4317c..792cbdf 100644
--- a/drivers/watchdog/wdfuncs_end.c
+++ b/drivers/watchdog/wdfuncs_end.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/drivers/watchdog/wdfuncs_start.c b/drivers/watchdog/wdfuncs_start.c
index 6bbedf6..e327ac9 100644
--- a/drivers/watchdog/wdfuncs_start.c
+++ b/drivers/watchdog/wdfuncs_start.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/env/env_api.c b/env/env_api.c
index e9871cc..0feb127 100644
--- a/env/env_api.c
+++ b/env/env_api.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include "env_api.h"
diff --git a/env/env_api_crc32.c b/env/env_api_crc32.c
index 9cd5955..0e31bd3 100644
--- a/env/env_api_crc32.c
+++ b/env/env_api_crc32.c
@@ -6,7 +6,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

/*-
diff --git a/env/env_api_fat.c b/env/env_api_fat.c
index 3433165..6bca88d 100644
--- a/env/env_api_fat.c
+++ b/env/env_api_fat.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include "env_api.h"
diff --git a/env/env_config_file.c b/env/env_config_file.c
index 232c190..a19678e 100644
--- a/env/env_config_file.c
+++ b/env/env_config_file.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/env/env_config_partitions.c b/env/env_config_partitions.c
index dd91a3f..eae7be1 100644
--- a/env/env_config_partitions.c
+++ b/env/env_config_partitions.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include "env_api.h"
diff --git a/env/env_disk_utils.c b/env/env_disk_utils.c
index e7fd4a1..289174f 100644
--- a/env/env_disk_utils.c
+++ b/env/env_disk_utils.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/env/fatvars.c b/env/fatvars.c
index 1365f0d..56ff65a 100644
--- a/env/fatvars.c
+++ b/env/fatvars.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/env/syspart.c b/env/syspart.c
index 366a106..ece7a3f 100644
--- a/env/syspart.c
+++ b/env/syspart.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <syspart.h>
diff --git a/env/uservars.c b/env/uservars.c
index b26c845..a65701a 100644
--- a/env/uservars.c
+++ b/env/uservars.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <string.h>
diff --git a/gen_version_h b/gen_version_h
index a44c780..2c5e361 100755
--- a/gen_version_h
+++ b/gen_version_h
@@ -10,7 +10,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
#

echo "/* Auto-generated - leave alone and don't commit! */"
diff --git a/include/bootguard.h b/include/bootguard.h
index 6a70187..93d415c 100644
--- a/include/bootguard.h
+++ b/include/bootguard.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/configuration.h b/include/configuration.h
index d79246a..b172943 100644
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/ebgenv.h b/include/ebgenv.h
index 64bcce2..c62d271 100644
--- a/include/ebgenv.h
+++ b/include/ebgenv.h
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*
*/

diff --git a/include/ebgpart.h b/include/ebgpart.h
index cf3d403..308928b 100644
--- a/include/ebgpart.h
+++ b/include/ebgpart.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*
*
* This code implements functions to scan for FAT partitions in DOS/GPT
diff --git a/include/env_api.h b/include/env_api.h
index 93d29c8..99fd0ae 100644
--- a/include/env_api.h
+++ b/include/env_api.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/env_config_file.h b/include/env_config_file.h
index 57949a0..059ce0f 100644
--- a/include/env_config_file.h
+++ b/include/env_config_file.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/env_config_partitions.h b/include/env_config_partitions.h
index c4eb465..4b6d2d9 100644
--- a/include/env_config_partitions.h
+++ b/include/env_config_partitions.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/env_disk_utils.h b/include/env_disk_utils.h
index fb8ad46..ab338e2 100644
--- a/include/env_disk_utils.h
+++ b/include/env_disk_utils.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/envdata.h b/include/envdata.h
index da41dda..cda33be 100644
--- a/include/envdata.h
+++ b/include/envdata.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/loader_interface.h b/include/loader_interface.h
index 40f0167..57f6365 100644
--- a/include/loader_interface.h
+++ b/include/loader_interface.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/mmio.h b/include/mmio.h
index 90c17de..9e2011d 100644
--- a/include/mmio.h
+++ b/include/mmio.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/include/simatic.h b/include/simatic.h
index 43c5515..6685045 100644
--- a/include/simatic.h
+++ b/include/simatic.h
@@ -11,7 +11,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/smbios.h b/include/smbios.h
index edc7c39..9ca23ec 100644
--- a/include/smbios.h
+++ b/include/smbios.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/syspart.h b/include/syspart.h
index d725e23..9792ae1 100644
--- a/include/syspart.h
+++ b/include/syspart.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/test-interface.h b/include/test-interface.h
index 8baacd6..df62618 100644
--- a/include/test-interface.h
+++ b/include/test-interface.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/uservars.h b/include/uservars.h
index 65dab60..9adef9d 100644
--- a/include/uservars.h
+++ b/include/uservars.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/include/utils.h b/include/utils.h
index 6efd434..f924b93 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/kernel-stub/fdt.c b/kernel-stub/fdt.c
index 84cf25d..e10b891 100644
--- a/kernel-stub/fdt.c
+++ b/kernel-stub/fdt.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/kernel-stub/initrd.c b/kernel-stub/initrd.c
index e84ee77..5ba4458 100644
--- a/kernel-stub/initrd.c
+++ b/kernel-stub/initrd.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/kernel-stub/kernel-stub.h b/kernel-stub/kernel-stub.h
index 6bf9d88..b0f10df 100644
--- a/kernel-stub/kernel-stub.h
+++ b/kernel-stub/kernel-stub.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/kernel-stub/main.c b/kernel-stub/main.c
index 71cbc86..dbc894b 100644
--- a/kernel-stub/main.c
+++ b/kernel-stub/main.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/libebgenv.pc.in b/libebgenv.pc.in
index 8778439..9f64a39 100644
--- a/libebgenv.pc.in
+++ b/libebgenv.pc.in
@@ -7,7 +7,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only

prefix=@prefix@
exec_prefix=@exec_prefix@
diff --git a/loader_interface.c b/loader_interface.c
index abd9ca5..e4d5d05 100644
--- a/loader_interface.c
+++ b/loader_interface.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/main.c b/main.c
index 66301a5..3885754 100644
--- a/main.c
+++ b/main.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh
index 08525a2..75feab4 100755
--- a/scripts/cppcheck.sh
+++ b/scripts/cppcheck.sh
@@ -11,7 +11,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
#

ignore=""
diff --git a/scripts/make_release b/scripts/make_release
index ff19f95..8693a6b 100755
--- a/scripts/make_release
+++ b/scripts/make_release
@@ -10,7 +10,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
#

usage() {
diff --git a/tests/bg_setenv.bats b/tests/bg_setenv.bats
index d4fe4be..fbce79b 100755
--- a/tests/bg_setenv.bats
+++ b/tests/bg_setenv.bats
@@ -7,7 +7,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
#

setup() {
diff --git a/tools/bg_envtools.c b/tools/bg_envtools.c
index 5c8128f..6d7c1cd 100644
--- a/tools/bg_envtools.c
+++ b/tools/bg_envtools.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <sys/stat.h>
diff --git a/tools/bg_envtools.h b/tools/bg_envtools.h
index 376041c..bdb73fd 100644
--- a/tools/bg_envtools.h
+++ b/tools/bg_envtools.h
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#ifndef __bg_envtools_h_
diff --git a/tools/bg_gen_unified_kernel b/tools/bg_gen_unified_kernel
index 1d426e1..0c4dd9f 100755
--- a/tools/bg_gen_unified_kernel
+++ b/tools/bg_gen_unified_kernel
@@ -10,7 +10,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only

import argparse
import struct
diff --git a/tools/bg_printenv.c b/tools/bg_printenv.c
index 5e5a55f..80de0fc 100644
--- a/tools/bg_printenv.c
+++ b/tools/bg_printenv.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include "uservars.h"
diff --git a/tools/bg_printenv.h b/tools/bg_printenv.h
index 532db77..de2819b 100644
--- a/tools/bg_printenv.h
+++ b/tools/bg_printenv.h
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#ifndef __bg_printenv_h_
diff --git a/tools/bg_setenv.c b/tools/bg_setenv.c
index 0757e80..1ec0dba 100644
--- a/tools/bg_setenv.c
+++ b/tools/bg_setenv.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <sys/queue.h>
diff --git a/tools/bg_setenv.h b/tools/bg_setenv.h
index 82a8023..d534b4c 100644
--- a/tools/bg_setenv.h
+++ b/tools/bg_setenv.h
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#ifndef __bg_setenv_h_
diff --git a/tools/ebgpart.c b/tools/ebgpart.c
index f406dcd..912f642 100644
--- a/tools/ebgpart.c
+++ b/tools/ebgpart.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*
*
* This code implements functions to scan for FAT partitions in DOS/GPT
diff --git a/tools/fat.c b/tools/fat.c
index 6b055dd..f5ba2bc 100644
--- a/tools/fat.c
+++ b/tools/fat.c
@@ -8,7 +8,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdarg.h>
diff --git a/tools/fat.h b/tools/fat.h
index d0cf3c7..ed974f6 100644
--- a/tools/fat.h
+++ b/tools/fat.h
@@ -8,7 +8,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/
#pragma once

diff --git a/tools/linux_util.h b/tools/linux_util.h
index fcdc1fa..90de96b 100644
--- a/tools/linux_util.h
+++ b/tools/linux_util.h
@@ -8,7 +8,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/
#pragma once

diff --git a/tools/main.c b/tools/main.c
index 42e7755..dc188dc 100644
--- a/tools/main.c
+++ b/tools/main.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include "bg_printenv.h"
diff --git a/tools/tests/Makefile.am b/tools/tests/Makefile.am
index 97d4367..d3fa536 100644
--- a/tools/tests/Makefile.am
+++ b/tools/tests/Makefile.am
@@ -9,7 +9,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
#

OBJCOPY ?= objcopy
diff --git a/tools/tests/fake_devices.c b/tools/tests/fake_devices.c
index 3fc94b3..ad991b4 100644
--- a/tools/tests/fake_devices.c
+++ b/tools/tests/fake_devices.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/tools/tests/fake_devices.h b/tools/tests/fake_devices.h
index a2c619a..895b5e5 100644
--- a/tools/tests/fake_devices.h
+++ b/tools/tests/fake_devices.h
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#pragma once
diff --git a/tools/tests/test_bgenv_init_retval.c b/tools/tests/test_bgenv_init_retval.c
index c1d6742..447fe53 100644
--- a/tools/tests/test_bgenv_init_retval.c
+++ b/tools/tests/test_bgenv_init_retval.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/tools/tests/test_ebgenv_api.c b/tools/tests/test_ebgenv_api.c
index 17e0381..bdc5b17 100644
--- a/tools/tests/test_ebgenv_api.c
+++ b/tools/tests/test_ebgenv_api.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/tools/tests/test_ebgenv_api_internal.c b/tools/tests/test_ebgenv_api_internal.c
index 08d690d..990688d 100644
--- a/tools/tests/test_ebgenv_api_internal.c
+++ b/tools/tests/test_ebgenv_api_internal.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/tools/tests/test_fat.c b/tools/tests/test_fat.c
index 42e0133..6d787b7 100644
--- a/tools/tests/test_fat.c
+++ b/tools/tests/test_fat.c
@@ -8,7 +8,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/tools/tests/test_main.c b/tools/tests/test_main.c
index e3abef8..d01f389 100644
--- a/tools/tests/test_main.c
+++ b/tools/tests/test_main.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/tools/tests/test_probe_config_file.c b/tools/tests/test_probe_config_file.c
index b53207e..ba179b6 100644
--- a/tools/tests/test_probe_config_file.c
+++ b/tools/tests/test_probe_config_file.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/tools/tests/test_probe_config_partitions.c b/tools/tests/test_probe_config_partitions.c
index c33eefd..a98794a 100644
--- a/tools/tests/test_probe_config_partitions.c
+++ b/tools/tests/test_probe_config_partitions.c
@@ -9,7 +9,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/tools/tests/test_uservars.c b/tools/tests/test_uservars.c
index 6990091..33bc148 100644
--- a/tools/tests/test_uservars.c
+++ b/tools/tests/test_uservars.c
@@ -8,7 +8,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <stdlib.h>
diff --git a/utils.c b/utils.c
index 0ae5a5e..e7b9175 100644
--- a/utils.c
+++ b/utils.c
@@ -10,7 +10,7 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
- * SPDX-License-Identifier: GPL-2.0
+ * SPDX-License-Identifier: GPL-2.0-only
*/

#include <efi.h>
--
2.43.0