aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Spooren <mail@aparcar.org>2020-09-21 22:46:30 -1000
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-22 20:36:04 +0200
commit8be2eb3b9b1e5e808a53bba223badae95c7627ef (patch)
tree3e410fc2f5a64abc355195e350444d79f2d13609
parente8f61bf50d4704dd871e66f08d7f6564af0f5cb0 (diff)
downloadupstream-8be2eb3b9b1e5e808a53bba223badae95c7627ef.tar.gz
upstream-8be2eb3b9b1e5e808a53bba223badae95c7627ef.tar.bz2
upstream-8be2eb3b9b1e5e808a53bba223badae95c7627ef.zip
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 <mail@aparcar.org> [adjust commit title, update remaining files] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--scripts/config/Makefile2
-rw-r--r--scripts/config/conf.c2
-rw-r--r--scripts/config/confdata.c2
-rw-r--r--scripts/config/expr.c2
-rw-r--r--scripts/config/expr.h2
-rw-r--r--scripts/config/images.c2
-rw-r--r--scripts/config/images.h2
-rw-r--r--scripts/config/lexer.l2
-rw-r--r--scripts/config/lexer.lex.c2
-rw-r--r--scripts/config/list.h2
-rw-r--r--scripts/config/lkc.h2
-rw-r--r--scripts/config/lkc_proto.h2
-rw-r--r--scripts/config/lxdialog/checklist.c2
-rw-r--r--scripts/config/lxdialog/dialog.h2
-rw-r--r--scripts/config/lxdialog/inputbox.c2
-rw-r--r--scripts/config/lxdialog/menubox.c2
-rw-r--r--scripts/config/lxdialog/textbox.c2
-rw-r--r--scripts/config/lxdialog/util.c2
-rw-r--r--scripts/config/lxdialog/yesno.c2
-rwxr-xr-xscripts/config/mconf-cfg.sh2
-rw-r--r--scripts/config/mconf.c2
-rw-r--r--scripts/config/menu.c2
-rwxr-xr-xscripts/config/nconf-cfg.sh2
-rw-r--r--scripts/config/nconf.c2
-rw-r--r--scripts/config/nconf.gui.c2
-rw-r--r--scripts/config/nconf.h2
-rw-r--r--scripts/config/parser.y2
-rw-r--r--scripts/config/preprocess.c2
-rwxr-xr-xscripts/config/qconf-cfg.sh2
-rw-r--r--scripts/config/qconf.cc2
-rw-r--r--scripts/config/qconf.h2
-rw-r--r--scripts/config/symbol.c2
-rw-r--r--scripts/config/util.c2
33 files changed, 33 insertions, 33 deletions
diff --git a/scripts/config/Makefile b/scripts/config/Makefile
index 3082a65ceb..89e761a45e 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 d96eab50f1..85902663a4 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index b696dda5e0..cff8d45231 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/expr.c b/scripts/config/expr.c
index 81ebf8108c..552c214655 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/expr.h b/scripts/config/expr.h
index bbd516bdf5..ae67a99d9e 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/images.c b/scripts/config/images.c
index b4fa0e4a63..3765d3356b 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/images.h b/scripts/config/images.h
index d8ff614bd0..565466511d 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/lexer.l b/scripts/config/lexer.l
index 83995662d1..575b679d30 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/lexer.lex.c b/scripts/config/lexer.lex.c
index 98b3aa16e3..190928b2ab 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/list.h b/scripts/config/list.h
index 45cb237ab7..979cd516d6 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 cf0f086d57..64213b6920 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/lkc_proto.h b/scripts/config/lkc_proto.h
index ac777dd56a..386b10f98f 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 <stdarg.h>
/* confdata.c */
diff --git a/scripts/config/lxdialog/checklist.c b/scripts/config/lxdialog/checklist.c
index fd161cfff1..29960ed000 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 68b565e3c4..3930d93a4a 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 1dcfb288ee..b8b6f15779 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 58c2f8afe5..4287745566 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 4e339b1266..b5987735b0 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 1b490d4af0..0de2b05352 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 bcaac9b7ba..ff1db42b3d 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 aa68ec9562..0244b90b33 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 9ea7945675..69eb3083c7 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 <zippel@linux-m68k.org>
*
diff --git a/scripts/config/menu.c b/scripts/config/menu.c
index 1df87dd3a5..9bb5fe1582 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/nconf-cfg.sh b/scripts/config/nconf-cfg.sh
index c212255070..a227309283 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 82ab7e3004..66c8234498 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 <nir.tzachar@gmail.com>
*
diff --git a/scripts/config/nconf.gui.c b/scripts/config/nconf.gui.c
index 77f525a861..cd7249b310 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 <nir.tzachar@gmail.com>
*
diff --git a/scripts/config/nconf.h b/scripts/config/nconf.h
index fa5245eb93..eab138b30d 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 <nir.tzachar@gmail.com>
*
diff --git a/scripts/config/parser.y b/scripts/config/parser.y
index e26dbc3095..6b9de46c00 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/preprocess.c b/scripts/config/preprocess.c
index dcc07c45eb..92bed17254 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 <yamada.masahiro@socionext.com>
diff --git a/scripts/config/qconf-cfg.sh b/scripts/config/qconf-cfg.sh
index 02ccc0ae10..ebbc7ab475 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 82773cc35d..a1e4d263e3 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 <zippel@linux-m68k.org>
* Copyright (C) 2015 Boris Barbulovski <bbarbulovski@gmail.com>
diff --git a/scripts/config/qconf.h b/scripts/config/qconf.h
index 45bfe9b2b9..61ecd5bdab 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/symbol.c b/scripts/config/symbol.c
index 2406a74ec3..b85e5cab76 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 <zippel@linux-m68k.org>
*/
diff --git a/scripts/config/util.c b/scripts/config/util.c
index 29585394df..0bc415cd73 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 <zippel@linux-m68k.org>
* Copyright (C) 2002-2005 Sam Ravnborg <sam@ravnborg.org>