summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-22 15:09:07 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-22 15:09:07 +0100
commit15f6a56174f7f9a36565671d10ed41b34a0aa2a0 (patch)
tree48312f48b4e003a66814c218b207c9f33fb58a8d
parent4440dabbd6fb12c42120598bd13512969170a867 (diff)
downloadusbutils-15f6a56174f7f9a36565671d10ed41b34a0aa2a0.tar.gz
SPDX header cleanups from GPL-2.0 -> GPL-2.0-only
Ugh, the fact that this license is treated "unique" like this by SPDX is crazy... Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--.travis.yml2
-rw-r--r--LICENSES/GPL-2.0-only.txt (renamed from LICENSES/GPL-2.0.txt)0
l---------LICENSES/GPL-2.0-or-later.txt2
-rw-r--r--Makefile.am2
-rw-r--r--NEWS2
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac2
-rw-r--r--list.h2
-rw-r--r--lsusb-t.c2
-rw-r--r--lsusb.8.in2
-rw-r--r--lsusb.py.in2
-rwxr-xr-xtravis-autogen.sh2
-rw-r--r--usb-devices.1.in2
-rw-r--r--usbreset.c2
14 files changed, 13 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index e13ddca..aaa5d2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
# Copyright 2016 Stephan Linz <linz@li-pro.net>
language: c
diff --git a/LICENSES/GPL-2.0.txt b/LICENSES/GPL-2.0-only.txt
index 4408fbf..4408fbf 100644
--- a/LICENSES/GPL-2.0.txt
+++ b/LICENSES/GPL-2.0-only.txt
diff --git a/LICENSES/GPL-2.0-or-later.txt b/LICENSES/GPL-2.0-or-later.txt
index 857f983..0a87fbd 120000
--- a/LICENSES/GPL-2.0-or-later.txt
+++ b/LICENSES/GPL-2.0-or-later.txt
@@ -1 +1 @@
-GPL-2.0.txt \ No newline at end of file
+GPL-2.0-only.txt \ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 5031ad5..448c854 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,7 @@ EXTRA_DIST = \
usb-devices \
lsusb.py.in \
usbreset.c \
- LICENSES/GPL-2.0.txt \
+ LICENSES/GPL-2.0-only.txt \
LICENSES/GPL-3.0-only.txt
lsusb.py: $(srcdir)/lsusb.py.in
diff --git a/NEWS b/NEWS
index 2be97b0..a6dd157 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
# usbutils old-style "NEWS" file
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
#
# Copyright (c) 2018 Greg Kroah-Hartman <gregkh@linuxfoundation.org>
#
diff --git a/autogen.sh b/autogen.sh
index fe0d009..9fd3c91 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/bin/sh -e
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
# Copyright (c) 2009,2010 Greg Kroah-Hartman <gregkh@suse.de>
if test ! -f usbhid-dump/bootstrap; then
diff --git a/configure.ac b/configure.ac
index 21bb6b2..275ed80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
# Copyright (c) 2009 Kay Sievers <kay.sievers@vrfy.org>
AC_INIT([usbutils],
diff --git a/list.h b/list.h
index 7030385..4f85b26 100644
--- a/list.h
+++ b/list.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
#ifndef _LINUX_LIST_H
#define _LINUX_LIST_H
diff --git a/lsusb-t.c b/lsusb-t.c
index 6733311..7442fd7 100644
--- a/lsusb-t.c
+++ b/lsusb-t.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2009 Greg Kroah-Hartman <gregkh@suse.de> */
#include <stdint.h>
#include <sys/stat.h>
diff --git a/lsusb.8.in b/lsusb.8.in
index 1e96576..0239554 100644
--- a/lsusb.8.in
+++ b/lsusb.8.in
@@ -1,4 +1,4 @@
-.\"SPDX-License-Identifier: GPL-2.0
+.\"SPDX-License-Identifier: GPL-2.0-only
.\"Copyright (c) 1999 Thomas Sailer <sailer@ife.ee.ethz.ch>
.TH lsusb 8 "11 February 2019" "usbutils-VERSION" "Linux USB Utilities"
.IX lsusb
diff --git a/lsusb.py.in b/lsusb.py.in
index a43fab0..01b9645 100644
--- a/lsusb.py.in
+++ b/lsusb.py.in
@@ -1,5 +1,5 @@
#!/usr/bin/python3
-# SPDX-License-Identifier: GPL-2.0 OR GPL-3.0
+# SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only
#
# lsusb-VERSION.py
#
diff --git a/travis-autogen.sh b/travis-autogen.sh
index 9fb35ea..9101995 100755
--- a/travis-autogen.sh
+++ b/travis-autogen.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
# Copyright 2016 Stephan Linz <linz@li-pro.net>
# -Wsign-compare -Wtype-limits
diff --git a/usb-devices.1.in b/usb-devices.1.in
index 2b14237..3667dd9 100644
--- a/usb-devices.1.in
+++ b/usb-devices.1.in
@@ -1,4 +1,4 @@
-.\" SPDX-License-Identifier: GPL-2.0
+.\" SPDX-License-Identifier: GPL-2.0-only
.\" Copyright (c) 2004 Greg Kroah-Hartman <greg@kroah.com>
.\" Copyright (c) 2004 Randy Dunlap <rdunlap@xenotime.net>
.\" Copyright (c) 2004 Frans Pop <elendil@planet.nl>
diff --git a/usbreset.c b/usbreset.c
index a4f1f98..0fcba41 100644
--- a/usbreset.c
+++ b/usbreset.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-only
/* usbreset -- send a USB port reset to a USB device */
/* Copyright (c) 2009-2016 Alan Stern */
/* To build: gcc -o usbreset usbreset.c */