From be08c1d6dca1b6dbaf3e0f3f8d953120c6ee02f9 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Fri, 16 Feb 2024 09:12:33 -0700 Subject: Treewide: Fix incorrect SPDX license strings These strings didn't match the license names exactly, so update them to match. Change-Id: Ib946eb15ca5fa64cbd6b657350b989b4a4c1b7b7 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/c/coreboot/+/80583 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- .clang-format | 2 +- payloads/libpayload/tests/libcbfs/cbfs-lookup-test.c | 2 +- src/vendorcode/amd/pi/Kconfig | 2 +- util/kconfig/Makefile | 2 +- util/kconfig/conf.c | 2 +- util/kconfig/confdata.c | 2 +- util/kconfig/expr.c | 2 +- util/kconfig/expr.h | 2 +- util/kconfig/gconf-cfg.sh | 2 +- util/kconfig/gconf.c | 2 +- util/kconfig/images.c | 2 +- util/kconfig/images.h | 2 +- util/kconfig/lexer.l | 2 +- util/kconfig/lexer.lex.c_shipped | 2 +- util/kconfig/list.h | 2 +- util/kconfig/lkc.h | 2 +- util/kconfig/lkc_proto.h | 2 +- util/kconfig/lxdialog/checklist.c | 2 +- util/kconfig/lxdialog/dialog.h | 2 +- util/kconfig/lxdialog/inputbox.c | 2 +- util/kconfig/lxdialog/menubox.c | 2 +- util/kconfig/lxdialog/textbox.c | 2 +- util/kconfig/lxdialog/util.c | 2 +- util/kconfig/lxdialog/yesno.c | 2 +- util/kconfig/mconf-cfg.sh | 2 +- util/kconfig/mconf.c | 2 +- util/kconfig/menu.c | 2 +- util/kconfig/merge_config.sh | 2 +- util/kconfig/nconf-cfg.sh | 2 +- util/kconfig/nconf.c | 2 +- util/kconfig/nconf.gui.c | 2 +- util/kconfig/nconf.h | 2 +- util/kconfig/parser.y | 2 +- util/kconfig/preprocess.c | 2 +- util/kconfig/qconf-cfg.sh | 2 +- util/kconfig/qconf.cc | 2 +- util/kconfig/qconf.h | 2 +- util/kconfig/streamline_config.pl | 2 +- util/kconfig/symbol.c | 2 +- util/kconfig/util.c | 2 +- util/lint/checkpatch.pl | 2 +- util/nvramtool/hexdump.c | 2 +- util/nvramtool/hexdump.h | 2 +- util/scripts/config | 2 +- util/scripts/parse-maintainers.pl | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.clang-format b/.clang-format index efd1065c9c2a..47210ae1134b 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only # # clang-format configuration file. Intended for clang-format >= 16. # diff --git a/payloads/libpayload/tests/libcbfs/cbfs-lookup-test.c b/payloads/libpayload/tests/libcbfs/cbfs-lookup-test.c index 0650e313e73a..5c2105fe925e 100644 --- a/payloads/libpayload/tests/libcbfs/cbfs-lookup-test.c +++ b/payloads/libpayload/tests/libcbfs/cbfs-lookup-test.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0.-only */ +/* SPDX-License-Identifier: GPL-2.0-only */ #include #include diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig index a841785dbf3b..7672ac38da25 100644 --- a/src/vendorcode/amd/pi/Kconfig +++ b/src/vendorcode/amd/pi/Kconfig @@ -1,4 +1,4 @@ -## SPDX-License-Identifier: BSD-3-clause +## SPDX-License-Identifier: BSD-3-Clause # # Copyright (c) 2013 - 2014, Sage Electronic Engineering, LLC diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile index 4eee155121a8..245445e0b960 100644 --- a/util/kconfig/Makefile +++ b/util/kconfig/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only # =========================================================================== # Kernel configuration targets # These targets are used from top-level makefile diff --git a/util/kconfig/conf.c b/util/kconfig/conf.c index d91f5a2dc8de..f13c02c52d83 100644 --- a/util/kconfig/conf.c +++ b/util/kconfig/conf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c index a6ee708b4b9f..3fbd9e7f844c 100644 --- a/util/kconfig/confdata.c +++ b/util/kconfig/confdata.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/expr.c b/util/kconfig/expr.c index 81ebf8108ca7..552c2146559a 100644 --- a/util/kconfig/expr.c +++ b/util/kconfig/expr.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/expr.h b/util/kconfig/expr.h index 4a9a23b1b7e1..90668cab4e99 100644 --- a/util/kconfig/expr.h +++ b/util/kconfig/expr.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/gconf-cfg.sh b/util/kconfig/gconf-cfg.sh index 040d8f338820..9b7472766f5d 100755 --- a/util/kconfig/gconf-cfg.sh +++ b/util/kconfig/gconf-cfg.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only cflags=$1 libs=$2 diff --git a/util/kconfig/gconf.c b/util/kconfig/gconf.c index 9709aca3a30f..2d630a098bf7 100644 --- a/util/kconfig/gconf.c +++ b/util/kconfig/gconf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2002-2003 Romain Lievin */ diff --git a/util/kconfig/images.c b/util/kconfig/images.c index 2f9afffa5d79..ea3bfabd9ff8 100644 --- a/util/kconfig/images.c +++ b/util/kconfig/images.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/images.h b/util/kconfig/images.h index 7212dec2006c..1e3c73622a43 100644 --- a/util/kconfig/images.h +++ b/util/kconfig/images.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/lexer.l b/util/kconfig/lexer.l index 2a754a8f1e12..fa3f3543539a 100644 --- a/util/kconfig/lexer.l +++ b/util/kconfig/lexer.l @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/lexer.lex.c_shipped b/util/kconfig/lexer.lex.c_shipped index 19540002e0c8..2de805047569 100644 --- a/util/kconfig/lexer.lex.c_shipped +++ b/util/kconfig/lexer.lex.c_shipped @@ -2221,7 +2221,7 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/list.h b/util/kconfig/list.h index 45cb237ab7ef..979cd516d6c0 100644 --- a/util/kconfig/list.h +++ b/util/kconfig/list.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef LIST_H #define LIST_H diff --git a/util/kconfig/lkc.h b/util/kconfig/lkc.h index 2bdee9cbaec7..6989a48e9edf 100644 --- a/util/kconfig/lkc.h +++ b/util/kconfig/lkc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/lkc_proto.h b/util/kconfig/lkc_proto.h index edd1e617b25c..72ac6127ce00 100644 --- a/util/kconfig/lkc_proto.h +++ b/util/kconfig/lkc_proto.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ #include /* confdata.c */ diff --git a/util/kconfig/lxdialog/checklist.c b/util/kconfig/lxdialog/checklist.c index fd161cfff121..29960ed000bb 100644 --- a/util/kconfig/lxdialog/checklist.c +++ b/util/kconfig/lxdialog/checklist.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * checklist.c -- implements the checklist box * diff --git a/util/kconfig/lxdialog/dialog.h b/util/kconfig/lxdialog/dialog.h index a501abf9fa31..3128bd6d7664 100644 --- a/util/kconfig/lxdialog/dialog.h +++ b/util/kconfig/lxdialog/dialog.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0-or-later */ /* * dialog.h -- common declarations for all dialog modules * diff --git a/util/kconfig/lxdialog/inputbox.c b/util/kconfig/lxdialog/inputbox.c index 1dcfb288ee63..b8b6f15779ce 100644 --- a/util/kconfig/lxdialog/inputbox.c +++ b/util/kconfig/lxdialog/inputbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * inputbox.c -- implements the input box * diff --git a/util/kconfig/lxdialog/menubox.c b/util/kconfig/lxdialog/menubox.c index 0e333284e947..bcdf3bbac99a 100644 --- a/util/kconfig/lxdialog/menubox.c +++ b/util/kconfig/lxdialog/menubox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * menubox.c -- implements the menu box * diff --git a/util/kconfig/lxdialog/textbox.c b/util/kconfig/lxdialog/textbox.c index 058ed0e5bbd5..e02acb749310 100644 --- a/util/kconfig/lxdialog/textbox.c +++ b/util/kconfig/lxdialog/textbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * textbox.c -- implements the text box * diff --git a/util/kconfig/lxdialog/util.c b/util/kconfig/lxdialog/util.c index 1dacd6c84c44..a8578069e335 100644 --- a/util/kconfig/lxdialog/util.c +++ b/util/kconfig/lxdialog/util.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * util.c * diff --git a/util/kconfig/lxdialog/yesno.c b/util/kconfig/lxdialog/yesno.c index bcaac9b7bab2..ff1db42b3d93 100644 --- a/util/kconfig/lxdialog/yesno.c +++ b/util/kconfig/lxdialog/yesno.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * yesno.c -- implements the yes/no box * diff --git a/util/kconfig/mconf-cfg.sh b/util/kconfig/mconf-cfg.sh index 99f498336df1..74c1c27b7ced 100755 --- a/util/kconfig/mconf-cfg.sh +++ b/util/kconfig/mconf-cfg.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only cflags=$1 libs=$2 diff --git a/util/kconfig/mconf.c b/util/kconfig/mconf.c index eccc87a441e7..078b0a84254d 100644 --- a/util/kconfig/mconf.c +++ b/util/kconfig/mconf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2002 Roman Zippel * diff --git a/util/kconfig/menu.c b/util/kconfig/menu.c index 61c442d84aef..d936ccca9488 100644 --- a/util/kconfig/menu.c +++ b/util/kconfig/menu.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/merge_config.sh b/util/kconfig/merge_config.sh index 902eb429b9db..1772b3c05018 100755 --- a/util/kconfig/merge_config.sh +++ b/util/kconfig/merge_config.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only # # merge_config.sh - Takes a list of config fragment values, and merges # them one by one. Provides warnings on overridden values, and specified diff --git a/util/kconfig/nconf-cfg.sh b/util/kconfig/nconf-cfg.sh index f871a2160e36..9d4096074941 100755 --- a/util/kconfig/nconf-cfg.sh +++ b/util/kconfig/nconf-cfg.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only cflags=$1 libs=$2 diff --git a/util/kconfig/nconf.c b/util/kconfig/nconf.c index 143a2c351d57..a8c3cc06cae7 100644 --- a/util/kconfig/nconf.c +++ b/util/kconfig/nconf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2008 Nir Tzachar * diff --git a/util/kconfig/nconf.gui.c b/util/kconfig/nconf.gui.c index 25a7263ef3c8..48ba1c1a07f5 100644 --- a/util/kconfig/nconf.gui.c +++ b/util/kconfig/nconf.gui.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2008 Nir Tzachar * diff --git a/util/kconfig/nconf.h b/util/kconfig/nconf.h index ab836d582664..174b035fdef1 100644 --- a/util/kconfig/nconf.h +++ b/util/kconfig/nconf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2008 Nir Tzachar * diff --git a/util/kconfig/parser.y b/util/kconfig/parser.y index 1c257371aec9..21eea842c7f9 100644 --- a/util/kconfig/parser.y +++ b/util/kconfig/parser.y @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/preprocess.c b/util/kconfig/preprocess.c index d1f5bcff4b62..a96bcbdc9401 100644 --- a/util/kconfig/preprocess.c +++ b/util/kconfig/preprocess.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // // Copyright (C) 2018 Masahiro Yamada diff --git a/util/kconfig/qconf-cfg.sh b/util/kconfig/qconf-cfg.sh index 0e113b0f2455..203ddf420340 100755 --- a/util/kconfig/qconf-cfg.sh +++ b/util/kconfig/qconf-cfg.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only cflags=$1 libs=$2 diff --git a/util/kconfig/qconf.cc b/util/kconfig/qconf.cc index 620a3527c767..abf0d0b392b9 100644 --- a/util/kconfig/qconf.cc +++ b/util/kconfig/qconf.cc @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2002 Roman Zippel * Copyright (C) 2015 Boris Barbulovski diff --git a/util/kconfig/qconf.h b/util/kconfig/qconf.h index 9196c1c20e16..f7e11b398369 100644 --- a/util/kconfig/qconf.h +++ b/util/kconfig/qconf.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/streamline_config.pl b/util/kconfig/streamline_config.pl index d51cd7ac15d2..a9f472c56a93 100755 --- a/util/kconfig/streamline_config.pl +++ b/util/kconfig/streamline_config.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only # # Copyright 2005-2009 - Steven Rostedt # diff --git a/util/kconfig/symbol.c b/util/kconfig/symbol.c index 34fc66e075b7..77de8ee3472a 100644 --- a/util/kconfig/symbol.c +++ b/util/kconfig/symbol.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2002 Roman Zippel */ diff --git a/util/kconfig/util.c b/util/kconfig/util.c index b78f114ad48c..53e079e2e8af 100644 --- a/util/kconfig/util.c +++ b/util/kconfig/util.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2002-2005 Roman Zippel * Copyright (C) 2002-2005 Sam Ravnborg diff --git a/util/lint/checkpatch.pl b/util/lint/checkpatch.pl index bda7b31d88f5..b6ac890dff97 100755 --- a/util/lint/checkpatch.pl +++ b/util/lint/checkpatch.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only # # (c) 2001, Dave Jones. (the file handling bit) # (c) 2005, Joel Schopp (the ugly bit) diff --git a/util/nvramtool/hexdump.c b/util/nvramtool/hexdump.c index a34f4ef88cd8..1d4fee1a8e0b 100644 --- a/util/nvramtool/hexdump.c +++ b/util/nvramtool/hexdump.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only */ #include "hexdump.h" #include diff --git a/util/nvramtool/hexdump.h b/util/nvramtool/hexdump.h index 4b03d85ff338..2a4e5633a9df 100644 --- a/util/nvramtool/hexdump.h +++ b/util/nvramtool/hexdump.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0 */ +/* SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-only */ #ifndef _HEXDUMP_H #define _HEXDUMP_H diff --git a/util/scripts/config b/util/scripts/config index ba11e350e8af..084de65f9a2a 100755 --- a/util/scripts/config +++ b/util/scripts/config @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only # Manipulate options in a .config file from the command line myname=${0##*/} diff --git a/util/scripts/parse-maintainers.pl b/util/scripts/parse-maintainers.pl index 2b5d6f785842..4b47efe300df 100755 --- a/util/scripts/parse-maintainers.pl +++ b/util/scripts/parse-maintainers.pl @@ -1,5 +1,5 @@ #!/usr/bin/env perl -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only use strict; use warnings; -- cgit v1.2.3