From 8be2eb3b9b1e5e808a53bba223badae95c7627ef Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Mon, 21 Sep 2020 22:46:30 -1000 Subject: [PATCH] scripts: update SPDX license names SPDX moved from GPL-2.0 to GPL-2.0-only and from GPL-2.0+ to GPL-2.0-or-later. Reflect that in the SPDX license headers. Signed-off-by: Paul Spooren [adjust commit title, update remaining files] Signed-off-by: Adrian Schmutzler --- scripts/config/Makefile | 2 +- scripts/config/conf.c | 2 +- scripts/config/confdata.c | 2 +- scripts/config/expr.c | 2 +- scripts/config/expr.h | 2 +- scripts/config/images.c | 2 +- scripts/config/images.h | 2 +- scripts/config/lexer.l | 2 +- scripts/config/lexer.lex.c | 2 +- scripts/config/list.h | 2 +- scripts/config/lkc.h | 2 +- scripts/config/lkc_proto.h | 2 +- scripts/config/lxdialog/checklist.c | 2 +- scripts/config/lxdialog/dialog.h | 2 +- scripts/config/lxdialog/inputbox.c | 2 +- scripts/config/lxdialog/menubox.c | 2 +- scripts/config/lxdialog/textbox.c | 2 +- scripts/config/lxdialog/util.c | 2 +- scripts/config/lxdialog/yesno.c | 2 +- scripts/config/mconf-cfg.sh | 2 +- scripts/config/mconf.c | 2 +- scripts/config/menu.c | 2 +- scripts/config/nconf-cfg.sh | 2 +- scripts/config/nconf.c | 2 +- scripts/config/nconf.gui.c | 2 +- scripts/config/nconf.h | 2 +- scripts/config/parser.y | 2 +- scripts/config/preprocess.c | 2 +- scripts/config/qconf-cfg.sh | 2 +- scripts/config/qconf.cc | 2 +- scripts/config/qconf.h | 2 +- scripts/config/symbol.c | 2 +- scripts/config/util.c | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/scripts/config/Makefile b/scripts/config/Makefile index 3082a65ceb96..89e761a45e47 100644 --- a/scripts/config/Makefile +++ b/scripts/config/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only # =========================================================================== # OpenWrt configuration targets diff --git a/scripts/config/conf.c b/scripts/config/conf.c index d96eab50f139..85902663a479 100644 --- a/scripts/config/conf.c +++ b/scripts/config/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/scripts/config/confdata.c b/scripts/config/confdata.c index b696dda5e01b..cff8d4523192 100644 --- a/scripts/config/confdata.c +++ b/scripts/config/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/scripts/config/expr.c b/scripts/config/expr.c index 81ebf8108ca7..552c2146559a 100644 --- a/scripts/config/expr.c +++ b/scripts/config/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/scripts/config/expr.h b/scripts/config/expr.h index bbd516bdf5be..ae67a99d9eff 100644 --- a/scripts/config/expr.h +++ b/scripts/config/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/scripts/config/images.c b/scripts/config/images.c index b4fa0e4a63a5..3765d3356b1c 100644 --- a/scripts/config/images.c +++ b/scripts/config/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/scripts/config/images.h b/scripts/config/images.h index d8ff614bd087..565466511d04 100644 --- a/scripts/config/images.h +++ b/scripts/config/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/scripts/config/lexer.l b/scripts/config/lexer.l index 83995662d11f..575b679d3015 100644 --- a/scripts/config/lexer.l +++ b/scripts/config/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/scripts/config/lexer.lex.c b/scripts/config/lexer.lex.c index 98b3aa16e36b..190928b2ab00 100644 --- a/scripts/config/lexer.lex.c +++ b/scripts/config/lexer.lex.c @@ -2540,7 +2540,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/scripts/config/list.h b/scripts/config/list.h index 45cb237ab7ef..979cd516d6c0 100644 --- a/scripts/config/list.h +++ b/scripts/config/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/scripts/config/lkc.h b/scripts/config/lkc.h index cf0f086d577d..64213b692078 100644 --- a/scripts/config/lkc.h +++ b/scripts/config/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/scripts/config/lkc_proto.h b/scripts/config/lkc_proto.h index ac777dd56aaf..386b10f98f91 100644 --- a/scripts/config/lkc_proto.h +++ b/scripts/config/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/scripts/config/lxdialog/checklist.c b/scripts/config/lxdialog/checklist.c index fd161cfff121..29960ed000bb 100644 --- a/scripts/config/lxdialog/checklist.c +++ b/scripts/config/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/scripts/config/lxdialog/dialog.h b/scripts/config/lxdialog/dialog.h index 68b565e3c495..3930d93a4adf 100644 --- a/scripts/config/lxdialog/dialog.h +++ b/scripts/config/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/scripts/config/lxdialog/inputbox.c b/scripts/config/lxdialog/inputbox.c index 1dcfb288ee63..b8b6f15779ce 100644 --- a/scripts/config/lxdialog/inputbox.c +++ b/scripts/config/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/scripts/config/lxdialog/menubox.c b/scripts/config/lxdialog/menubox.c index 58c2f8afe59b..428774556674 100644 --- a/scripts/config/lxdialog/menubox.c +++ b/scripts/config/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/scripts/config/lxdialog/textbox.c b/scripts/config/lxdialog/textbox.c index 4e339b12664e..b5987735b06c 100644 --- a/scripts/config/lxdialog/textbox.c +++ b/scripts/config/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/scripts/config/lxdialog/util.c b/scripts/config/lxdialog/util.c index 1b490d4af0d3..0de2b0535271 100644 --- a/scripts/config/lxdialog/util.c +++ b/scripts/config/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/scripts/config/lxdialog/yesno.c b/scripts/config/lxdialog/yesno.c index bcaac9b7bab2..ff1db42b3d93 100644 --- a/scripts/config/lxdialog/yesno.c +++ b/scripts/config/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/scripts/config/mconf-cfg.sh b/scripts/config/mconf-cfg.sh index aa68ec95620d..0244b90b3384 100755 --- a/scripts/config/mconf-cfg.sh +++ b/scripts/config/mconf-cfg.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only PKG="ncursesw" PKG2="ncurses" diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c index 9ea7945675cd..69eb3083c70d 100644 --- a/scripts/config/mconf.c +++ b/scripts/config/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/scripts/config/menu.c b/scripts/config/menu.c index 1df87dd3a5b2..9bb5fe15825a 100644 --- a/scripts/config/menu.c +++ b/scripts/config/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/scripts/config/nconf-cfg.sh b/scripts/config/nconf-cfg.sh index c212255070c0..a22730928397 100755 --- a/scripts/config/nconf-cfg.sh +++ b/scripts/config/nconf-cfg.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only PKG="ncursesw menuw panelw" PKG2="ncurses menu panel" diff --git a/scripts/config/nconf.c b/scripts/config/nconf.c index 82ab7e30049e..66c82344980c 100644 --- a/scripts/config/nconf.c +++ b/scripts/config/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/scripts/config/nconf.gui.c b/scripts/config/nconf.gui.c index 77f525a8617c..cd7249b31051 100644 --- a/scripts/config/nconf.gui.c +++ b/scripts/config/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/scripts/config/nconf.h b/scripts/config/nconf.h index fa5245eb93a7..eab138b30d6d 100644 --- a/scripts/config/nconf.h +++ b/scripts/config/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/scripts/config/parser.y b/scripts/config/parser.y index e26dbc30956d..6b9de46c0064 100644 --- a/scripts/config/parser.y +++ b/scripts/config/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/scripts/config/preprocess.c b/scripts/config/preprocess.c index dcc07c45ebe6..92bed1725472 100644 --- a/scripts/config/preprocess.c +++ b/scripts/config/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/scripts/config/qconf-cfg.sh b/scripts/config/qconf-cfg.sh index 02ccc0ae1031..ebbc7ab4756b 100755 --- a/scripts/config/qconf-cfg.sh +++ b/scripts/config/qconf-cfg.sh @@ -1,5 +1,5 @@ #!/bin/sh -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only PKG="Qt5Core Qt5Gui Qt5Widgets" PKG2="QtCore QtGui" diff --git a/scripts/config/qconf.cc b/scripts/config/qconf.cc index 82773cc35d35..a1e4d263e3c0 100644 --- a/scripts/config/qconf.cc +++ b/scripts/config/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/scripts/config/qconf.h b/scripts/config/qconf.h index 45bfe9b2b966..61ecd5bdab34 100644 --- a/scripts/config/qconf.h +++ b/scripts/config/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/scripts/config/symbol.c b/scripts/config/symbol.c index 2406a74ec352..b85e5cab76fb 100644 --- a/scripts/config/symbol.c +++ b/scripts/config/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/scripts/config/util.c b/scripts/config/util.c index 29585394df71..0bc415cd737e 100644 --- a/scripts/config/util.c +++ b/scripts/config/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 -- 2.30.2