diff options
| author | Karel Zak | 2018-08-16 14:47:21 +0200 |
|---|---|---|
| committer | Karel Zak | 2018-08-16 14:47:21 +0200 |
| commit | 4189907e6cd9a973c3d6ee9e90f92ed7fd7429bb (patch) | |
| tree | aef5f7ff196af33cc1531f717575fad1d72f1dd1 | |
| parent | fstrim: use -n shortcut for --dry-run (diff) | |
| download | kernel-qcow2-util-linux-4189907e6cd9a973c3d6ee9e90f92ed7fd7429bb.tar.gz kernel-qcow2-util-linux-4189907e6cd9a973c3d6ee9e90f92ed7fd7429bb.tar.xz kernel-qcow2-util-linux-4189907e6cd9a973c3d6ee9e90f92ed7fd7429bb.zip | |
docs: use SPDX license names
Let's use standardized names for licenses. The names used by SPDX
makes things more obvious at first glance. For complete list see:
https://spdx.org/licenses/
Note, this commit does not change any license or so...
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | Documentation/licenses/COPYING.BSD-3-Clause (renamed from Documentation/licenses/COPYING.BSD-3) | 0 | ||||
| -rw-r--r-- | Documentation/licenses/COPYING.BSD-4-Clause-UC (renamed from Documentation/licenses/COPYING.UCB) | 0 | ||||
| -rw-r--r-- | Documentation/licenses/COPYING.GPL-2.0-or-later (renamed from Documentation/licenses/COPYING.GPLv2) | 0 | ||||
| -rw-r--r-- | Documentation/licenses/COPYING.LGPL-2.1-or-later (renamed from Documentation/licenses/COPYING.LGPLv2.1) | 0 | ||||
| -rw-r--r-- | README.licensing | 14 | ||||
| -rw-r--r-- | libblkid/COPYING | 2 | ||||
| -rw-r--r-- | libfdisk/COPYING | 2 | ||||
| -rw-r--r-- | libmount/COPYING | 2 | ||||
| -rw-r--r-- | libsmartcols/COPYING | 2 | ||||
| -rw-r--r-- | libuuid/COPYING | 2 |
10 files changed, 13 insertions, 11 deletions
diff --git a/Documentation/licenses/COPYING.BSD-3 b/Documentation/licenses/COPYING.BSD-3-Clause index 2f1706836..2f1706836 100644 --- a/Documentation/licenses/COPYING.BSD-3 +++ b/Documentation/licenses/COPYING.BSD-3-Clause diff --git a/Documentation/licenses/COPYING.UCB b/Documentation/licenses/COPYING.BSD-4-Clause-UC index 9abbf2410..9abbf2410 100644 --- a/Documentation/licenses/COPYING.UCB +++ b/Documentation/licenses/COPYING.BSD-4-Clause-UC diff --git a/Documentation/licenses/COPYING.GPLv2 b/Documentation/licenses/COPYING.GPL-2.0-or-later index d159169d1..d159169d1 100644 --- a/Documentation/licenses/COPYING.GPLv2 +++ b/Documentation/licenses/COPYING.GPL-2.0-or-later diff --git a/Documentation/licenses/COPYING.LGPLv2.1 b/Documentation/licenses/COPYING.LGPL-2.1-or-later index 4362b4915..4362b4915 100644 --- a/Documentation/licenses/COPYING.LGPLv2.1 +++ b/Documentation/licenses/COPYING.LGPL-2.1-or-later diff --git a/README.licensing b/README.licensing index 91e07871c..5752a9584 100644 --- a/README.licensing +++ b/README.licensing @@ -2,19 +2,21 @@ The project util-linux doesn't use the same license for all of the code. There is code under: - * GPLv2+ (GNU General Public License version 2, or any later version) + * GPL-2.0-or-later - GNU General Public License version 2, or any later version - * GPLv2 (GNU General Public License version 2) + * GPL-2.0 - GNU General Public License version 2 - * LGPLv2+ (GNU Lesser General Public License v2 (or 2.1) or any later version) + * LGPL-2.1-or-later - GNU Lesser General Public License 2.1 or any later version - * BSD with advertising + * BSD-3-Clause - BSD 3-Clause "New" or "Revised" License + + * BSD-4-Clause-UC - BSD 4-Clause University of California-Specific * Public Domain Please, check the source code for more details. A license is usually at the start of each source file. -The ./COPYING file (GPLv2+) is the default license for code without an explicitly -defined license. +The ./COPYING file (GPL-2.0-or-later) is the default license for code without +an explicitly defined license. diff --git a/libblkid/COPYING b/libblkid/COPYING index be1a5b3a1..1c4252aec 100644 --- a/libblkid/COPYING +++ b/libblkid/COPYING @@ -5,4 +5,4 @@ version 2.1 of the License, or (at your option) any later version. The complete text of the license is available in the -../Documentation/licenses/COPYING.LGPLv2.1 file. +../Documentation/licenses/COPYING.LGPL-2.1-or-later file. diff --git a/libfdisk/COPYING b/libfdisk/COPYING index be1a5b3a1..1c4252aec 100644 --- a/libfdisk/COPYING +++ b/libfdisk/COPYING @@ -5,4 +5,4 @@ version 2.1 of the License, or (at your option) any later version. The complete text of the license is available in the -../Documentation/licenses/COPYING.LGPLv2.1 file. +../Documentation/licenses/COPYING.LGPL-2.1-or-later file. diff --git a/libmount/COPYING b/libmount/COPYING index be1a5b3a1..db5ec32eb 100644 --- a/libmount/COPYING +++ b/libmount/COPYING @@ -5,4 +5,4 @@ version 2.1 of the License, or (at your option) any later version. The complete text of the license is available in the -../Documentation/licenses/COPYING.LGPLv2.1 file. +../Documentation/licenses/COPYING.LGPL-2.1-or-later diff --git a/libsmartcols/COPYING b/libsmartcols/COPYING index be1a5b3a1..1c4252aec 100644 --- a/libsmartcols/COPYING +++ b/libsmartcols/COPYING @@ -5,4 +5,4 @@ version 2.1 of the License, or (at your option) any later version. The complete text of the license is available in the -../Documentation/licenses/COPYING.LGPLv2.1 file. +../Documentation/licenses/COPYING.LGPL-2.1-or-later file. diff --git a/libuuid/COPYING b/libuuid/COPYING index 0e902cf8c..8a409361f 100644 --- a/libuuid/COPYING +++ b/libuuid/COPYING @@ -2,4 +2,4 @@ This library is free software; you can redistribute it and/or modify it under the terms of the Modified BSD License. The complete text of the license is available in the -../Documentation/licenses/COPYING.BSD-3 file. +../Documentation/licenses/COPYING.BSD-3-Clause file. |