From: Jan Kiszka <
jan.k...@siemens.com>
Conversion was done fully scripted with the following commands:
for f in $(git ls-tree -r --name-only HEAD | grep -v "\(COPYING\|tests/fff\)"); do
if grep -q "This work is licensed under the terms of the GNU GPL, version 2." $f; then
sed -i 's/\( \*\|#\)\( the COPYING file in the top-level directory.\)/\1\2\n\1\n\1 SPDX-License-Identifier:\tGPL-2.0/' $f;
fi
done
Future file additions shall follow the same pattern.
Signed-off-by: Jan Kiszka <
jan.k...@siemens.com>
---
Kate, not yet Jailhouse ;-), but easier to augment due to single license.
.travis-build.sh | 2 ++
.travis.yml | 2 ++
Makefile.am | 2 ++
bootguard.c | 2 ++
configure.ac | 2 ++
drivers/watchdog/atom-quark.c | 2 ++
drivers/watchdog/i6300esb.c | 2 ++
drivers/watchdog/init_array_end.S | 2 ++
drivers/watchdog/init_array_start.S | 2 ++
drivers/watchdog/itco.c | 2 ++
env/env_api.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/syspart.h | 2 ++
include/test-interface.h | 2 ++
include/uservars.h | 2 ++
include/utils.h | 2 ++
main.c | 2 ++
scripts/make_release | 2 ++
tools/bg_setenv.c | 2 ++
tools/ebgpart.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_main.c | 2 ++
tools/tests/test_probe_config_file.c | 2 ++
tools/tests/test_probe_config_partitions.c | 2 ++
utils.c | 2 ++
46 files changed, 92 insertions(+)
diff --git a/.travis-build.sh b/.travis-build.sh
index 3a03b8f..307dea7 100755
--- a/.travis-build.sh
+++ b/.travis-build.sh
@@ -10,6 +10,8 @@
# 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
+#
set -euo pipefail
diff --git a/.travis.yml b/.travis.yml
index bfb55e7..8098fe2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,8 @@
# 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
+#
env:
matrix:
diff --git a/Makefile.am b/Makefile.am
index 01216d0..74fa7f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,8 @@
# 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
+#
# Based on Makefile.am of gummiboot,
# Copyright (C) 2013 Karel Zak <
kz...@redhat.com>
#
diff --git a/bootguard.c b/bootguard.c
index 1b2733a..0aa95b4 100644
--- a/bootguard.c
+++ b/bootguard.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include "bootguard.h"
diff --git a/
configure.ac b/
configure.ac
index d9a719c..6c7f381 100644
--- a/
configure.ac
+++ b/
configure.ac
@@ -10,6 +10,8 @@
# 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
+#
# Based on
configure.ac of gummiboot,
# Copyright (C) 2013 Karel Zak <
kz...@redhat.com>
#
diff --git a/drivers/watchdog/atom-quark.c b/drivers/watchdog/atom-quark.c
index 4e6f9ba..b17ff27 100644
--- a/drivers/watchdog/atom-quark.c
+++ b/drivers/watchdog/atom-quark.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <efi.h>
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index 10babd4..1ba2b8d 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <efi.h>
diff --git a/drivers/watchdog/init_array_end.S b/drivers/watchdog/init_array_end.S
index 868a6de..d91969c 100644
--- a/drivers/watchdog/init_array_end.S
+++ b/drivers/watchdog/init_array_end.S
@@ -8,6 +8,8 @@
*
* 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
*/
.section .init_array
diff --git a/drivers/watchdog/init_array_start.S b/drivers/watchdog/init_array_start.S
index aa09061..6127da3 100644
--- a/drivers/watchdog/init_array_start.S
+++ b/drivers/watchdog/init_array_start.S
@@ -8,6 +8,8 @@
*
* 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
*/
.section .init_array
diff --git a/drivers/watchdog/itco.c b/drivers/watchdog/itco.c
index 35be0c3..b7b6e80 100644
--- a/drivers/watchdog/itco.c
+++ b/drivers/watchdog/itco.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <efi.h>
diff --git a/env/env_api.c b/env/env_api.c
index 75695d1..d22e723 100644
--- a/env/env_api.c
+++ b/env/env_api.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include "env_api.h"
diff --git a/env/env_api_fat.c b/env/env_api_fat.c
index 1705cb9..ad800f8 100644
--- a/env/env_api_fat.c
+++ b/env/env_api_fat.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include "env_api.h"
diff --git a/env/env_config_file.c b/env/env_config_file.c
index 69a707a..7f817cb 100644
--- a/env/env_config_file.c
+++ b/env/env_config_file.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <stdlib.h>
diff --git a/env/env_config_partitions.c b/env/env_config_partitions.c
index b4ffc6c..b7aea8b 100644
--- a/env/env_config_partitions.c
+++ b/env/env_config_partitions.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include "env_api.h"
diff --git a/env/env_disk_utils.c b/env/env_disk_utils.c
index 0ed3762..fae3812 100644
--- a/env/env_disk_utils.c
+++ b/env/env_disk_utils.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <stdlib.h>
diff --git a/env/fatvars.c b/env/fatvars.c
index 42574ea..0645af8 100644
--- a/env/fatvars.c
+++ b/env/fatvars.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <bootguard.h>
diff --git a/env/syspart.c b/env/syspart.c
index a68aad4..7bdf595 100644
--- a/env/syspart.c
+++ b/env/syspart.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <syspart.h>
diff --git a/env/uservars.c b/env/uservars.c
index eff1cf8..8b466d4 100644
--- a/env/uservars.c
+++ b/env/uservars.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <string.h>
diff --git a/gen_version_h b/gen_version_h
index f917fe0..a44c780 100755
--- a/gen_version_h
+++ b/gen_version_h
@@ -10,6 +10,8 @@
# 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
+#
echo "/* Auto-generated - leave alone and don't commit! */"
echo ""
diff --git a/include/bootguard.h b/include/bootguard.h
index fed9e8c..e534ada 100644
--- a/include/bootguard.h
+++ b/include/bootguard.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __H_BOOTGUARD__
diff --git a/include/configuration.h b/include/configuration.h
index 7d9008a..34a1054 100644
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __H_CONFIG__
diff --git a/include/ebgenv.h b/include/ebgenv.h
index 46e692c..0de2556 100644
--- a/include/ebgenv.h
+++ b/include/ebgenv.h
@@ -10,6 +10,8 @@
* 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
+ *
*/
#ifndef __EBGENV_H__
diff --git a/include/ebgpart.h b/include/ebgpart.h
index 097bf8f..a2b7552 100644
--- a/include/ebgpart.h
+++ b/include/ebgpart.h
@@ -9,6 +9,8 @@
* 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
+ *
*
* This code implements functions to scan for FAT partitions in DOS/GPT
* partition tables.
diff --git a/include/env_api.h b/include/env_api.h
index 4d652ff..9a4f8be 100644
--- a/include/env_api.h
+++ b/include/env_api.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __ENV_API_H__
diff --git a/include/env_config_file.h b/include/env_config_file.h
index b172142..8fbe8fa 100644
--- a/include/env_config_file.h
+++ b/include/env_config_file.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __ENV_CONFIG_FILE_H__
diff --git a/include/env_config_partitions.h b/include/env_config_partitions.h
index 01f8d94..ebe6712 100644
--- a/include/env_config_partitions.h
+++ b/include/env_config_partitions.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __ENV_CONFIG_PARTITIONS_H__
diff --git a/include/env_disk_utils.h b/include/env_disk_utils.h
index 9ceb019..7450f20 100644
--- a/include/env_disk_utils.h
+++ b/include/env_disk_utils.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __ENV_DISK_UTILS_H__
diff --git a/include/envdata.h b/include/envdata.h
index 42dcd34..25bd6c5 100644
--- a/include/envdata.h
+++ b/include/envdata.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __H_ENV_DATA__
diff --git a/include/syspart.h b/include/syspart.h
index e7c1337..2b70ed5 100644
--- a/include/syspart.h
+++ b/include/syspart.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __H_SYSPART__
diff --git a/include/test-interface.h b/include/test-interface.h
index bd2572d..9adbf56 100644
--- a/include/test-interface.h
+++ b/include/test-interface.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __TEST_INTERFACE_H__
diff --git a/include/uservars.h b/include/uservars.h
index b1d1d7c..11783a7 100644
--- a/include/uservars.h
+++ b/include/uservars.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __USER_VARS_H__
diff --git a/include/utils.h b/include/utils.h
index 3482549..a73c554 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -9,6 +9,8 @@
*
* 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
*/
#ifndef __H_UTILS__
diff --git a/main.c b/main.c
index bd8a668..3789319 100644
--- a/main.c
+++ b/main.c
@@ -9,6 +9,8 @@
*
* 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
*/
#include <efi.h>
diff --git a/scripts/make_release b/scripts/make_release
index 87512a1..fc14e2f 100755
--- a/scripts/make_release
+++ b/scripts/make_release
@@ -10,6 +10,8 @@
# 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
+#
usage() {
echo "usage: $0 name"
diff --git a/tools/bg_setenv.c b/tools/bg_setenv.c
index ca64b92..5d8e9b8 100644
--- a/tools/bg_setenv.c
+++ b/tools/bg_setenv.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <sys/queue.h>
diff --git a/tools/ebgpart.c b/tools/ebgpart.c
index 262b1c5..eabf5d0 100644
--- a/tools/ebgpart.c
+++ b/tools/ebgpart.c
@@ -9,6 +9,8 @@
* 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
+ *
*
* This code implements functions to scan for FAT partitions in DOS/GPT
* partition tables.
diff --git a/tools/tests/Makefile.am b/tools/tests/Makefile.am
index 4093ac4..c3e6376 100644
--- a/tools/tests/Makefile.am
+++ b/tools/tests/Makefile.am
@@ -9,6 +9,8 @@
# 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
+#
OBJCOPY ?= objcopy
diff --git a/tools/tests/fake_devices.c b/tools/tests/fake_devices.c
index 5e03471..090d720 100644
--- a/tools/tests/fake_devices.c
+++ b/tools/tests/fake_devices.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <stdlib.h>
diff --git a/tools/tests/fake_devices.h b/tools/tests/fake_devices.h
index aa5f423..40a8de1 100644
--- a/tools/tests/fake_devices.h
+++ b/tools/tests/fake_devices.h
@@ -8,6 +8,8 @@
*
* 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
*/
#ifndef __FAKE_DEVICES_H__
diff --git a/tools/tests/test_bgenv_init_retval.c b/tools/tests/test_bgenv_init_retval.c
index 27324c9..6f1c9cc 100644
--- a/tools/tests/test_bgenv_init_retval.c
+++ b/tools/tests/test_bgenv_init_retval.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <stdlib.h>
diff --git a/tools/tests/test_ebgenv_api.c b/tools/tests/test_ebgenv_api.c
index 533b50b..da3196c 100644
--- a/tools/tests/test_ebgenv_api.c
+++ b/tools/tests/test_ebgenv_api.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <stdlib.h>
diff --git a/tools/tests/test_ebgenv_api_internal.c b/tools/tests/test_ebgenv_api_internal.c
index 17b866b..2011bab 100644
--- a/tools/tests/test_ebgenv_api_internal.c
+++ b/tools/tests/test_ebgenv_api_internal.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <stdlib.h>
diff --git a/tools/tests/test_main.c b/tools/tests/test_main.c
index a25e092..73b42d1 100644
--- a/tools/tests/test_main.c
+++ b/tools/tests/test_main.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <stdlib.h>
diff --git a/tools/tests/test_probe_config_file.c b/tools/tests/test_probe_config_file.c
index 63e9a25..f1da154 100644
--- a/tools/tests/test_probe_config_file.c
+++ b/tools/tests/test_probe_config_file.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <stdlib.h>
diff --git a/tools/tests/test_probe_config_partitions.c b/tools/tests/test_probe_config_partitions.c
index 4536aea..da60b95 100644
--- a/tools/tests/test_probe_config_partitions.c
+++ b/tools/tests/test_probe_config_partitions.c
@@ -8,6 +8,8 @@
*
* 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
*/
#include <stdlib.h>
diff --git a/utils.c b/utils.c
index cdfc148..9d3eb4d 100644
--- a/utils.c
+++ b/utils.c
@@ -9,6 +9,8 @@
*
* 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
*/
#include <bootguard.h>
--
2.13.6