Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80583?usp=email )
Change subject: Treewide: Fix incorrect SPDX license strings ......................................................................
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 gaumless@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/80583 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Felix Singer service+coreboot-gerrit@felixsinger.de --- M .clang-format M payloads/libpayload/tests/libcbfs/cbfs-lookup-test.c M src/vendorcode/amd/pi/Kconfig M util/kconfig/Makefile M util/kconfig/conf.c M util/kconfig/confdata.c M util/kconfig/expr.c M util/kconfig/expr.h M util/kconfig/gconf-cfg.sh M util/kconfig/gconf.c M util/kconfig/images.c M util/kconfig/images.h M util/kconfig/lexer.l M util/kconfig/lexer.lex.c_shipped M util/kconfig/list.h M util/kconfig/lkc.h M util/kconfig/lkc_proto.h M util/kconfig/lxdialog/checklist.c M util/kconfig/lxdialog/dialog.h M util/kconfig/lxdialog/inputbox.c M util/kconfig/lxdialog/menubox.c M util/kconfig/lxdialog/textbox.c M util/kconfig/lxdialog/util.c M util/kconfig/lxdialog/yesno.c M util/kconfig/mconf-cfg.sh M util/kconfig/mconf.c M util/kconfig/menu.c M util/kconfig/merge_config.sh M util/kconfig/nconf-cfg.sh M util/kconfig/nconf.c M util/kconfig/nconf.gui.c M util/kconfig/nconf.h M util/kconfig/parser.y M util/kconfig/preprocess.c M util/kconfig/qconf-cfg.sh M util/kconfig/qconf.cc M util/kconfig/qconf.h M util/kconfig/streamline_config.pl M util/kconfig/symbol.c M util/kconfig/util.c M util/lint/checkpatch.pl M util/nvramtool/hexdump.c M util/nvramtool/hexdump.h M util/scripts/config M util/scripts/parse-maintainers.pl 45 files changed, 45 insertions(+), 45 deletions(-)
Approvals: Felix Singer: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/.clang-format b/.clang-format index efd1065..47210ae 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 0650e31..5c2105f 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 <libpayload-config.h> #include <cbfs.h> diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig index a841785..7672ac3 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 4eee155..245445e 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 d91f5a2..f13c02c 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c index a6ee708..3fbd9e7 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/expr.c b/util/kconfig/expr.c index 81ebf81..552c214 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/expr.h b/util/kconfig/expr.h index 4a9a23b..90668ca 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/gconf-cfg.sh b/util/kconfig/gconf-cfg.sh index 040d8f3..9b74727 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 9709aca..2d630a0 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 roms@tilp.info */ diff --git a/util/kconfig/images.c b/util/kconfig/images.c index 2f9afff..ea3bfab 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/images.h b/util/kconfig/images.h index 7212dec..1e3c736 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/lexer.l b/util/kconfig/lexer.l index 2a754a8..fa3f354 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/lexer.lex.c_shipped b/util/kconfig/lexer.lex.c_shipped index 1954000..2de8050 100644 --- a/util/kconfig/lexer.lex.c_shipped +++ b/util/kconfig/lexer.lex.c_shipped @@ -2221,7 +2221,7 @@ #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 zippel@linux-m68k.org */ diff --git a/util/kconfig/list.h b/util/kconfig/list.h index 45cb237..979cd51 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 2bdee9c..6989a48 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/lkc_proto.h b/util/kconfig/lkc_proto.h index edd1e61..72ac612 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 <stdarg.h>
/* confdata.c */ diff --git a/util/kconfig/lxdialog/checklist.c b/util/kconfig/lxdialog/checklist.c index fd161cf..29960ed 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 a501abf..3128bd6 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 1dcfb28..b8b6f15 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 0e33328..bcdf3bb 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 058ed0e..e02acb7 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 1dacd6c..a857806 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 bcaac9b..ff1db42 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 99f4983..74c1c27 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 eccc87a..078b0a8 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 zippel@linux-m68k.org * diff --git a/util/kconfig/menu.c b/util/kconfig/menu.c index 61c442d..d936ccc 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/merge_config.sh b/util/kconfig/merge_config.sh index 902eb42..1772b3c 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 f871a21..9d40960 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 143a2c3..a8c3cc0 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 nir.tzachar@gmail.com * diff --git a/util/kconfig/nconf.gui.c b/util/kconfig/nconf.gui.c index 25a7263..48ba1c1 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 nir.tzachar@gmail.com * diff --git a/util/kconfig/nconf.h b/util/kconfig/nconf.h index ab836d5..174b035 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 nir.tzachar@gmail.com * diff --git a/util/kconfig/parser.y b/util/kconfig/parser.y index 1c257371..21eea84 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/preprocess.c b/util/kconfig/preprocess.c index d1f5bcf..a96bcbd 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 yamada.masahiro@socionext.com
diff --git a/util/kconfig/qconf-cfg.sh b/util/kconfig/qconf-cfg.sh index 0e113b0..203ddf4 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 620a352..abf0d0b 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 zippel@linux-m68k.org * Copyright (C) 2015 Boris Barbulovski bbarbulovski@gmail.com diff --git a/util/kconfig/qconf.h b/util/kconfig/qconf.h index 9196c1c..f7e11b3 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/streamline_config.pl b/util/kconfig/streamline_config.pl index d51cd7a..a9f472c 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 34fc66e..77de8ee 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 zippel@linux-m68k.org */ diff --git a/util/kconfig/util.c b/util/kconfig/util.c index b78f114..53e079e 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 zippel@linux-m68k.org * Copyright (C) 2002-2005 Sam Ravnborg sam@ravnborg.org diff --git a/util/lint/checkpatch.pl b/util/lint/checkpatch.pl index bda7b31..b6ac890 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 jschopp@austin.ibm.com (the ugly bit) diff --git a/util/nvramtool/hexdump.c b/util/nvramtool/hexdump.c index a34f4ef..1d4fee1 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 <ctype.h> diff --git a/util/nvramtool/hexdump.h b/util/nvramtool/hexdump.h index 4b03d85..2a4e563 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 ba11e35..084de65 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 2b5d6f7..4b47efe 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;