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 <[email protected]>
[adjust commit title, update remaining files]
Signed-off-by: Adrian Schmutzler <[email protected]>

diff --git a/scripts/config/Makefile b/scripts/config/Makefile
index 3082a65ceb96d4fae5d20d7f5b8150dc13691edc..89e761a45e474f8ecdc05a8ee2dcd5e41207a084 100644 (file)
--- 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 d96eab50f13969655ab3276c245dcc6db942cf24..85902663a4790ca1a06d0ebccd59774f37dd44e6 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index b696dda5e01b6eb0dae7a4bec7c5549817282204..cff8d4523192e61fddaf1de8a87e02a1e0914446 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/expr.c b/scripts/config/expr.c
index 81ebf8108ca748893d469c77af1eebf8ecbf7df2..552c2146559a4004a5cac72702846568629febfc 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/expr.h b/scripts/config/expr.h
index bbd516bdf5bec26f0ad63bf54aaa1c509182b3e4..ae67a99d9eff57ccfdf51a0e826f49ae168916e3 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/images.c b/scripts/config/images.c
index b4fa0e4a63a5c4d4419ebee4357cf11a9247c2c1..3765d3356b1caf21e7d47264f49569ecc9dd1609 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/images.h b/scripts/config/images.h
index d8ff614bd0874891e1516aa128addf8a7a9f742c..565466511d04b001dc4c18252d4df51d09c999ce 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/lexer.l b/scripts/config/lexer.l
index 83995662d11fe4fc1856342851042ea9276aa611..575b679d301578e25639eeb4c07b01e421763b4f 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/lexer.lex.c b/scripts/config/lexer.lex.c
index 98b3aa16e36b898682a2090f60709f742daaaf6d..190928b2ab00f64659c9f5498fc97a01a4cfc21f 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/list.h b/scripts/config/list.h
index 45cb237ab7ef7a9f17779647220da6a30afd06fc..979cd516d6c0ba0d12b86532a1678bc14bc4553b 100644 (file)
--- 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 cf0f086d577d83d023e03af8bd212c9b3ffa9bf3..64213b692078642360b44f083c27ce742d583ee4 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/lkc_proto.h b/scripts/config/lkc_proto.h
index ac777dd56aaf7a693185341ac92581ae3b14198e..386b10f98f91631d0eaf8ce098ec932e5cfc0c8c 100644 (file)
--- 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 <stdarg.h>
 
 /* confdata.c */

diff --git a/scripts/config/lxdialog/checklist.c b/scripts/config/lxdialog/checklist.c
index fd161cfff121fd15e45aebce45bbc38f311d3709..29960ed000bb2661236040e7c88ff66c69df358b 100644 (file)
--- 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 68b565e3c495664881d1ae85ba9a2d7de6e157e5..3930d93a4adf0de5961686e907050122bd5d79fb 100644 (file)
--- 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 1dcfb288ee63630e7e73be6fe28f1fd1a3bc5857..b8b6f15779ce4e47df92a411782b08477e119e8f 100644 (file)
--- 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 58c2f8afe59bbd93a08dc0d453bd189557787035..428774556674e609d4696369100e2858c7f5e8d5 100644 (file)
--- 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 4e339b12664e0f3d719be4ff41b35b1f789d3a5e..b5987735b06cd5e438786a43b7a6866b6c303cae 100644 (file)
--- 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 1b490d4af0d3b6176439c658534b56430220678e..0de2b0535271c17881ddbca4c99444333fec06de 100644 (file)
--- 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 bcaac9b7bab2cafb17b82d5e447ae778c68ff618..ff1db42b3d9309051ec727d4efb07d89a1ea3ece 100644 (file)
--- 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 aa68ec95620d6095123c538e25193d627ba6107c..0244b90b338452b666dd5cee4056d1b9bab2a517 100755 (executable)
--- 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 9ea7945675cd351da72f3f82c8417a92993c6dae..69eb3083c70d4bea953a4a4e09f6f55514ff7519 100644 (file)
--- 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 <[email protected]>
  *

diff --git a/scripts/config/menu.c b/scripts/config/menu.c
index 1df87dd3a5b2986168b9b0e3e2c8e8f7d02eb199..9bb5fe15825a1ebace40ef41656c736215af256a 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/nconf-cfg.sh b/scripts/config/nconf-cfg.sh
index c212255070c0cafc4dd9e212bf7b68399ef41512..a22730928397e3fa8f96d5df2a305a965965d304 100755 (executable)
--- 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 82ab7e30049e8592f6f7cfc7e1ea8eed423caa2a..66c82344980c233ded4409b580a97cbbdf750940 100644 (file)
--- 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 <[email protected]>
  *

diff --git a/scripts/config/nconf.gui.c b/scripts/config/nconf.gui.c
index 77f525a8617c27788cc30f9a65c41041050806ed..cd7249b310515d96a9def1064f04a5b6feaef385 100644 (file)
--- 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 <[email protected]>
  *

diff --git a/scripts/config/nconf.h b/scripts/config/nconf.h
index fa5245eb93a75358b3427f5d5224020fbe1e1fd9..eab138b30d6d28d8331ca0372715714e465d9804 100644 (file)
--- 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 <[email protected]>
  *

diff --git a/scripts/config/parser.y b/scripts/config/parser.y
index e26dbc30956d06279302a67f18ddefde862ca54e..6b9de46c00648a940e3d74c620353de761194c02 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/preprocess.c b/scripts/config/preprocess.c
index dcc07c45ebe60c41fc4126f2567f9940de6913c1..92bed17254726c43535fa2ad8e7ee935bc3ee34a 100644 (file)
--- 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 <[email protected]>
 

diff --git a/scripts/config/qconf-cfg.sh b/scripts/config/qconf-cfg.sh
index 02ccc0ae103187a4a1f9c56bac3eca08823087b8..ebbc7ab4756b45ec68ff37d8d9abca849540da65 100755 (executable)
--- 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 82773cc35d356a82d20287e3982122d61dd92fbc..a1e4d263e3c0df651a812959e62a0deb2f524c0f 100644 (file)
--- 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 <[email protected]>
  * Copyright (C) 2015 Boris Barbulovski <[email protected]>

diff --git a/scripts/config/qconf.h b/scripts/config/qconf.h
index 45bfe9b2b96655833cb674f6eb72d6a9d22d6bd4..61ecd5bdab3423dc524b619c00c2c143d486871d 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/symbol.c b/scripts/config/symbol.c
index 2406a74ec352427a943680cd17c0cefd410f5b3c..b85e5cab76fba05b42e47f5f20999b813dece70d 100644 (file)
--- 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 <[email protected]>
  */

diff --git a/scripts/config/util.c b/scripts/config/util.c
index 29585394df71dfb75e3f56fcd1995b593863fc8d..0bc415cd737e544c035a3fe910d954b58aa5ab8e 100644 (file)
--- 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 <[email protected]>
  * Copyright (C) 2002-2005 Sam Ravnborg <[email protected]>