* [Buildroot] [PATCH 01/21] docs/manual: refer to SPDX License List
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 20:54 ` Arnout Vandecappelle
2017-04-01 13:13 ` Thomas Petazzoni
2017-03-30 13:43 ` [Buildroot] [PATCH 02/21] package: use SPDX short identifier for GPLv1/GPLv1+ Rahul Bedarkar
` (21 subsequent siblings)
22 siblings, 2 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX short identifier for license string as much as
possible. So refer to SPDX license list and use SPDX short identifier
for license strings in documentation.
Also remove License abbreviations that we have.
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
docs/manual/adding-packages-generic.txt | 12 ++---
docs/manual/adding-packages-kernel-module.txt | 4 +-
docs/manual/adding-packages-perl.txt | 2 +-
docs/manual/adding-packages-python.txt | 2 +-
docs/manual/legal-notice.txt | 75 ---------------------------
5 files changed, 10 insertions(+), 85 deletions(-)
diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index a08283c..2c47be1 100644
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -22,7 +22,7 @@ system is based on hand-written Makefiles or shell scripts.
07: LIBFOO_VERSION = 1.0
08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
09: LIBFOO_SITE = http://www.foosoftware.org/download
-10: LIBFOO_LICENSE = GPLv3+
+10: LIBFOO_LICENSE = GPL-3.0+
11: LIBFOO_LICENSE_FILES = COPYING
12: LIBFOO_INSTALL_STAGING = YES
13: LIBFOO_CONFIG_SCRIPTS = libfoo-config
@@ -396,8 +396,8 @@ information is (assuming the package name is +libfoo+) :
* +LIBFOO_LICENSE+ defines the license (or licenses) under which the package
is released.
This name will appear in the manifest file produced by +make legal-info+.
- If the license appears in xref:legal-info-list-licenses[the following list],
- use the same string to make the manifest file uniform.
+ If the license appears in https://spdx.org/licenses/[SPDX License List],
+ use the SPDX short identifier to make the manifest file uniform.
Otherwise, describe the license in a precise and concise way, avoiding
ambiguous names such as +BSD+ which actually name a family of licenses.
This variable is optional. If it is not defined, +unknown+ will appear in
@@ -405,12 +405,12 @@ information is (assuming the package name is +libfoo+) :
The expected format for this variable must comply with the following rules:
** If different parts of the package are released under different
licenses, then +comma+ separate licenses (e.g. +`LIBFOO_LICENSE =
- GPLv2+, LGPLv2.1+`+). If there is clear distinction between which
+ GPL-2.0+, LGPL-2.1+`+). If there is clear distinction between which
component is licensed under what license, then annotate the license
with that component, between parenthesis (e.g. +`LIBFOO_LICENSE =
- GPLv2+ (programs), LGPLv2.1+ (libraries)`+).
+ GPL-2.0+ (programs), LGPL-2.1+ (libraries)`+).
** If the package is dual licensed, then separate licenses with the
- +or+ keyword (e.g. +`LIBFOO_LICENSE = AFLv2.1 or GPLv2+`+).
+ +or+ keyword (e.g. +`LIBFOO_LICENSE = AFL-2.1 or GPL-2.0+`+).
* +LIBFOO_LICENSE_FILES+ is a space-separated list of files in the package
tarball that contain the license(s) under which the package is released.
diff --git a/docs/manual/adding-packages-kernel-module.txt b/docs/manual/adding-packages-kernel-module.txt
index ffeeef5..b609ecc 100644
--- a/docs/manual/adding-packages-kernel-module.txt
+++ b/docs/manual/adding-packages-kernel-module.txt
@@ -24,7 +24,7 @@ builds a kernel module, and no other component:
07: FOO_VERSION = 1.2.3
08: FOO_SOURCE = foo-$(FOO_VERSION).tar.xz
09: FOO_SITE = http://www.foosoftware.org/download
-10: FOO_LICENSE = GPLv2
+10: FOO_LICENSE = GPL-2.0
11: FOO_LICENSE_FILES = COPYING
12:
13: $(eval $(kernel-module))
@@ -63,7 +63,7 @@ Let's look at a more complex example:
07: FOO_VERSION = 1.2.3
08: FOO_SOURCE = foo-$(FOO_VERSION).tar.xz
09: FOO_SITE = http://www.foosoftware.org/download
-10: FOO_LICENSE = GPLv2
+10: FOO_LICENSE = GPL-2.0
11: FOO_LICENSE_FILES = COPYING
12:
13: FOO_MODULE_SUBDIRS = driver/base
diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
index 3476b62..08ef559 100644
--- a/docs/manual/adding-packages-perl.txt
+++ b/docs/manual/adding-packages-perl.txt
@@ -21,7 +21,7 @@ with an example :
08: PERL_FOO_BAR_SOURCE = Foo-Bar-$(PERL_FOO_BAR_VERSION).tar.gz
09: PERL_FOO_BAR_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MO/MONGER
10: PERL_FOO_BAR_DEPENDENCIES = perl-strictures
-11: PERL_FOO_BAR_LICENSE = Artistic or GPLv1+
+11: PERL_FOO_BAR_LICENSE = Artistic or GPL-1.0+
12: PERL_FOO_BAR_LICENSE_FILES = LICENSE
13:
14: $(eval $(perl-package))
diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
index 19d31e2..a67a4be 100644
--- a/docs/manual/adding-packages-python.txt
+++ b/docs/manual/adding-packages-python.txt
@@ -24,7 +24,7 @@ with an example :
07: PYTHON_FOO_VERSION = 1.0
08: PYTHON_FOO_SOURCE = python-foo-$(PYTHON_FOO_VERSION).tar.xz
09: PYTHON_FOO_SITE = http://www.foosoftware.org/download
-10: PYTHON_FOO_LICENSE = BSD-3c
+10: PYTHON_FOO_LICENSE = BSD-3-Clause
11: PYTHON_FOO_LICENSE_FILES = LICENSE
12: PYTHON_FOO_ENV = SOME_VAR=1
13: PYTHON_FOO_DEPENDENCIES = libmad
diff --git a/docs/manual/legal-notice.txt b/docs/manual/legal-notice.txt
index df82fd2..6975328 100644
--- a/docs/manual/legal-notice.txt
+++ b/docs/manual/legal-notice.txt
@@ -83,81 +83,6 @@ of +make legal-info+ before using it as your own compliance delivery. See
the _NO WARRANTY_ clauses (clauses 11 and 12) in the +COPYING+ file at the
root of the Buildroot distribution.
-[[legal-info-list-licenses]]
-=== License abbreviations
-
-Here is a list of the licenses that are most widely used by packages in
-Buildroot, with the name used in the manifest files:
-
-* `AGPLv3`:
- http://www.gnu.org/licenses/agpl-3.0.en.html[
- GNU Affero General Public License, version 3];
-* `GPLv2`:
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
- GNU General Public License, version 2];
-* `GPLv2+`:
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
- GNU General Public License, version 2]
- or (at your option) any later version;
-* `GPLv3`:
- http://www.gnu.org/licenses/gpl.html[
- GNU General Public License, version 3];
-* `GPLv3+`:
- http://www.gnu.org/licenses/gpl.html[
- GNU General Public License, version 3]
- or (at your option) any later version;
-* `GPL`:
- http://www.gnu.org/licenses/gpl.html[
- GNU General Public License] (any version);
-* `LGPLv2`:
- http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html[
- GNU Library General Public License, version 2];
-* `LGPLv2+`:
- http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html[
- GNU Library General Public License, version 2]
- or (at your option) any later version;
-* `LGPLv2.1`:
- http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
- GNU Lesser General Public License, version 2.1];
-* `LGPLv2.1+`:
- http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
- GNU Lesser General Public License, version 2.1]
- or (at your option) any later version;
-* `LGPLv3`:
- http://www.gnu.org/licenses/lgpl.html[
- GNU Lesser General Public License, version 3];
-* `LGPLv3+`:
- http://www.gnu.org/licenses/lgpl.html[
- GNU Lesser General Public License, version 3]
- or (at your option) any later version;
-* `LGPL`:
- http://www.gnu.org/licenses/lgpl.html[
- GNU Lesser General Public License] (any version);
-* `BSD-4c`:
- http://directory.fsf.org/wiki/License:BSD_4Clause[
- Original BSD 4-clause license];
-* `BSD-3c`:
- http://opensource.org/licenses/BSD-3-Clause[
- BSD 3-clause license];
-* `BSD-2c`:
- http://opensource.org/licenses/BSD-2-Clause[
- BSD 2-clause license];
-* `MIT`:
- http://opensource.org/licenses/mit-license.html[
- MIT-style license];
-* `Apache-2.0`:
- http://apache.org/licenses/LICENSE-2.0.html[
- Apache License, version 2.0];
-* `ISC`:
- https://opensource.org/licenses/ISC[
- ISC License];
-* `MPLv1.1`:
- https://www.mozilla.org/en-US/MPL/1.1[
- Mozilla Public License Version 1.1]
-* `MPLv2.0`:
- https://www.mozilla.org/en-US/MPL/2.0[
- Mozilla Public License Version 2.0]
-
[[legal-info-buildroot]]
=== Complying with the Buildroot license
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 01/21] docs/manual: refer to SPDX License List
2017-03-30 13:43 ` [Buildroot] [PATCH 01/21] docs/manual: refer to SPDX License List Rahul Bedarkar
@ 2017-03-30 20:54 ` Arnout Vandecappelle
2017-03-30 22:12 ` Arnout Vandecappelle
2017-04-01 13:13 ` Thomas Petazzoni
1 sibling, 1 reply; 34+ messages in thread
From: Arnout Vandecappelle @ 2017-03-30 20:54 UTC (permalink / raw)
To: buildroot
On 30-03-17 15:43, Rahul Bedarkar wrote:
> We want to use SPDX short identifier for license string as much as
> possible. So refer to SPDX license list and use SPDX short identifier
> for license strings in documentation.
>
> Also remove License abbreviations that we have.
>
> Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
> ---
> docs/manual/adding-packages-generic.txt | 12 ++---
> docs/manual/adding-packages-kernel-module.txt | 4 +-
> docs/manual/adding-packages-perl.txt | 2 +-
> docs/manual/adding-packages-python.txt | 2 +-
> docs/manual/legal-notice.txt | 75 ---------------------------
> 5 files changed, 10 insertions(+), 85 deletions(-)
>
> diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
> index a08283c..2c47be1 100644
> --- a/docs/manual/adding-packages-generic.txt
> +++ b/docs/manual/adding-packages-generic.txt
> @@ -22,7 +22,7 @@ system is based on hand-written Makefiles or shell scripts.
> 07: LIBFOO_VERSION = 1.0
> 08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
> 09: LIBFOO_SITE = http://www.foosoftware.org/download
> -10: LIBFOO_LICENSE = GPLv3+
> +10: LIBFOO_LICENSE = GPL-3.0+
> 11: LIBFOO_LICENSE_FILES = COPYING
> 12: LIBFOO_INSTALL_STAGING = YES
> 13: LIBFOO_CONFIG_SCRIPTS = libfoo-config
> @@ -396,8 +396,8 @@ information is (assuming the package name is +libfoo+) :
> * +LIBFOO_LICENSE+ defines the license (or licenses) under which the package
> is released.
> This name will appear in the manifest file produced by +make legal-info+.
> - If the license appears in xref:legal-info-list-licenses[the following list],
> - use the same string to make the manifest file uniform.
> + If the license appears in https://spdx.org/licenses/[SPDX License List],
^the
With this minor thing fixed:
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Regards,
Arnout
> + use the SPDX short identifier to make the manifest file uniform.
> Otherwise, describe the license in a precise and concise way, avoiding
> ambiguous names such as +BSD+ which actually name a family of licenses.
> This variable is optional. If it is not defined, +unknown+ will appear in
[snip]
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 01/21] docs/manual: refer to SPDX License List
2017-03-30 20:54 ` Arnout Vandecappelle
@ 2017-03-30 22:12 ` Arnout Vandecappelle
0 siblings, 0 replies; 34+ messages in thread
From: Arnout Vandecappelle @ 2017-03-30 22:12 UTC (permalink / raw)
To: buildroot
On 30-03-17 22:54, Arnout Vandecappelle wrote:
>
>
> On 30-03-17 15:43, Rahul Bedarkar wrote:
>> We want to use SPDX short identifier for license string as much as
>> possible. So refer to SPDX license list and use SPDX short identifier
>> for license strings in documentation.
>>
>> Also remove License abbreviations that we have.
>>
>> Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
>> ---
>> docs/manual/adding-packages-generic.txt | 12 ++---
>> docs/manual/adding-packages-kernel-module.txt | 4 +-
>> docs/manual/adding-packages-perl.txt | 2 +-
>> docs/manual/adding-packages-python.txt | 2 +-
>> docs/manual/legal-notice.txt | 75 ---------------------------
Oh, you missed one instance: docs/manual/contribute.txt still has a reference
to GPLv2 ("... under the Buildroot license (i.e. GPLv2, except for ...").
Regards,
Arnout
[snip]
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 34+ messages in thread
* [Buildroot] [PATCH 01/21] docs/manual: refer to SPDX License List
2017-03-30 13:43 ` [Buildroot] [PATCH 01/21] docs/manual: refer to SPDX License List Rahul Bedarkar
2017-03-30 20:54 ` Arnout Vandecappelle
@ 2017-04-01 13:13 ` Thomas Petazzoni
1 sibling, 0 replies; 34+ messages in thread
From: Thomas Petazzoni @ 2017-04-01 13:13 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 30 Mar 2017 19:13:30 +0530, Rahul Bedarkar wrote:
> We want to use SPDX short identifier for license string as much as
> possible. So refer to SPDX license list and use SPDX short identifier
> for license strings in documentation.
>
> Also remove License abbreviations that we have.
>
> Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
> ---
> docs/manual/adding-packages-generic.txt | 12 ++---
> docs/manual/adding-packages-kernel-module.txt | 4 +-
> docs/manual/adding-packages-perl.txt | 2 +-
> docs/manual/adding-packages-python.txt | 2 +-
> docs/manual/legal-notice.txt | 75 ---------------------------
> 5 files changed, 10 insertions(+), 85 deletions(-)
Applied to master, after taking into account the suggestions from
Arnout. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 34+ messages in thread
* [Buildroot] [PATCH 02/21] package: use SPDX short identifier for GPLv1/GPLv1+
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 01/21] docs/manual: refer to SPDX License List Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 21:08 ` Arnout Vandecappelle
2017-03-30 13:43 ` [Buildroot] [PATCH 03/21] boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+ Rahul Bedarkar
` (20 subsequent siblings)
22 siblings, 1 reply; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for licenses as much as possible. SPDX
short identifier for GPLv1/GPLv1+ is GPL-1.0/GPL-1.0+.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/GPLv1(\+)?/GPL-1.0\1/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/joe/joe.mk | 2 +-
package/libxml-parser-perl/libxml-parser-perl.mk | 2 +-
package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk | 2 +-
package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk | 2 +-
package/perl-datetime-tiny/perl-datetime-tiny.mk | 2 +-
package/perl-digest-hmac/perl-digest-hmac.mk | 2 +-
package/perl-digest-sha1/perl-digest-sha1.mk | 2 +-
package/perl-encode-locale/perl-encode-locale.mk | 2 +-
package/perl-file-listing/perl-file-listing.mk | 2 +-
package/perl-file-util/perl-file-util.mk | 2 +-
package/perl-gd/perl-gd.mk | 2 +-
package/perl-gdgraph/perl-gdgraph.mk | 2 +-
package/perl-html-parser/perl-html-parser.mk | 2 +-
package/perl-html-tagset/perl-html-tagset.mk | 2 +-
package/perl-http-cookies/perl-http-cookies.mk | 2 +-
package/perl-http-daemon/perl-http-daemon.mk | 2 +-
package/perl-http-date/perl-http-date.mk | 2 +-
package/perl-http-message/perl-http-message.mk | 2 +-
package/perl-http-negotiate/perl-http-negotiate.mk | 2 +-
package/perl-io-html/perl-io-html.mk | 2 +-
package/perl-io-socket-ssl/perl-io-socket-ssl.mk | 2 +-
package/perl-libwww-perl/perl-libwww-perl.mk | 2 +-
package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk | 2 +-
package/perl-mailtools/perl-mailtools.mk | 2 +-
package/perl-mime-base64/perl-mime-base64.mk | 2 +-
package/perl-module-build/perl-module-build.mk | 2 +-
package/perl-net-http/perl-net-http.mk | 2 +-
package/perl-netaddr-ip/perl-netaddr-ip.mk | 2 +-
package/perl-time-hires/perl-time-hires.mk | 2 +-
package/perl-timedate/perl-timedate.mk | 2 +-
package/perl-uri/perl-uri.mk | 2 +-
package/perl-www-robotrules/perl-www-robotrules.mk | 2 +-
package/perl-xml-libxml/perl-xml-libxml.mk | 2 +-
package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk | 2 +-
package/perl-xml-sax-base/perl-xml-sax-base.mk | 2 +-
package/perl-xml-sax/perl-xml-sax.mk | 2 +-
package/perl/perl.mk | 2 +-
37 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/package/joe/joe.mk b/package/joe/joe.mk
index e86007e..e19cae1 100644
--- a/package/joe/joe.mk
+++ b/package/joe/joe.mk
@@ -6,7 +6,7 @@
JOE_VERSION = 3.7
JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION)
-JOE_LICENSE = GPLv1+
+JOE_LICENSE = GPL-1.0+
JOE_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_NCURSES),y)
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index e512815..401470d 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -8,7 +8,7 @@ LIBXML_PARSER_PERL_VERSION = 2.44
LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz
LIBXML_PARSER_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR
HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat
-LIBXML_PARSER_PERL_LICENSE = Artistic or GPLv1+
+LIBXML_PARSER_PERL_LICENSE = Artistic or GPL-1.0+
LIBXML_PARSER_PERL_RUN_PERL = `which perl`
define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
diff --git a/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk b/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
index 6152821..de029e9 100644
--- a/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
+++ b/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
@@ -8,7 +8,7 @@ PERL_CRYPT_OPENSSL_RANDOM_VERSION = 0.11
PERL_CRYPT_OPENSSL_RANDOM_SOURCE = Crypt-OpenSSL-Random-$(PERL_CRYPT_OPENSSL_RANDOM_VERSION).tar.gz
PERL_CRYPT_OPENSSL_RANDOM_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN
PERL_CRYPT_OPENSSL_RANDOM_DEPENDENCIES = openssl
-PERL_CRYPT_OPENSSL_RANDOM_LICENSE = Artistic or GPLv1+
+PERL_CRYPT_OPENSSL_RANDOM_LICENSE = Artistic or GPL-1.0+
PERL_CRYPT_OPENSSL_RANDOM_LICENSE_FILES = LICENSE
$(eval $(perl-package))
diff --git a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
index 7a4e31e..b853d99 100644
--- a/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
+++ b/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
@@ -8,7 +8,7 @@ PERL_CRYPT_OPENSSL_RSA_VERSION = 0.28
PERL_CRYPT_OPENSSL_RSA_SOURCE = Crypt-OpenSSL-RSA-$(PERL_CRYPT_OPENSSL_RSA_VERSION).tar.gz
PERL_CRYPT_OPENSSL_RSA_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PERLER
PERL_CRYPT_OPENSSL_RSA_DEPENDENCIES = perl-crypt-openssl-random
-PERL_CRYPT_OPENSSL_RSA_LICENSE = Artistic or GPLv1+
+PERL_CRYPT_OPENSSL_RSA_LICENSE = Artistic or GPL-1.0+
PERL_CRYPT_OPENSSL_RSA_LICENSE_FILES = LICENSE
$(eval $(perl-package))
diff --git a/package/perl-datetime-tiny/perl-datetime-tiny.mk b/package/perl-datetime-tiny/perl-datetime-tiny.mk
index 5758973..6b54967 100644
--- a/package/perl-datetime-tiny/perl-datetime-tiny.mk
+++ b/package/perl-datetime-tiny/perl-datetime-tiny.mk
@@ -7,7 +7,7 @@
PERL_DATETIME_TINY_VERSION = 1.06
PERL_DATETIME_TINY_SOURCE = DateTime-Tiny-$(PERL_DATETIME_TINY_VERSION).tar.gz
PERL_DATETIME_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN
-PERL_DATETIME_TINY_LICENSE = Artistic or GPLv1+
+PERL_DATETIME_TINY_LICENSE = Artistic or GPL-1.0+
PERL_DATETIME_TINY_LICENSE_FILES = LICENSE
$(eval $(perl-package))
diff --git a/package/perl-digest-hmac/perl-digest-hmac.mk b/package/perl-digest-hmac/perl-digest-hmac.mk
index bee32f4..a926a1e 100644
--- a/package/perl-digest-hmac/perl-digest-hmac.mk
+++ b/package/perl-digest-hmac/perl-digest-hmac.mk
@@ -7,7 +7,7 @@
PERL_DIGEST_HMAC_VERSION = 1.03
PERL_DIGEST_HMAC_SOURCE = Digest-HMAC-$(PERL_DIGEST_HMAC_VERSION).tar.gz
PERL_DIGEST_HMAC_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_DIGEST_HMAC_LICENSE = Artistic or GPLv1+
+PERL_DIGEST_HMAC_LICENSE = Artistic or GPL-1.0+
PERL_DIGEST_HMAC_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-digest-sha1/perl-digest-sha1.mk b/package/perl-digest-sha1/perl-digest-sha1.mk
index 52b9ec3..d93159b 100644
--- a/package/perl-digest-sha1/perl-digest-sha1.mk
+++ b/package/perl-digest-sha1/perl-digest-sha1.mk
@@ -7,7 +7,7 @@
PERL_DIGEST_SHA1_VERSION = 2.13
PERL_DIGEST_SHA1_SOURCE = Digest-SHA1-$(PERL_DIGEST_SHA1_VERSION).tar.gz
PERL_DIGEST_SHA1_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_DIGEST_SHA1_LICENSE = Artistic or GPLv1+
+PERL_DIGEST_SHA1_LICENSE = Artistic or GPL-1.0+
PERL_DIGEST_SHA1_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-encode-locale/perl-encode-locale.mk b/package/perl-encode-locale/perl-encode-locale.mk
index 2544b16..80d9c3b 100644
--- a/package/perl-encode-locale/perl-encode-locale.mk
+++ b/package/perl-encode-locale/perl-encode-locale.mk
@@ -7,7 +7,7 @@
PERL_ENCODE_LOCALE_VERSION = 1.05
PERL_ENCODE_LOCALE_SOURCE = Encode-Locale-$(PERL_ENCODE_LOCALE_VERSION).tar.gz
PERL_ENCODE_LOCALE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_ENCODE_LOCALE_LICENSE = Artistic or GPLv1+
+PERL_ENCODE_LOCALE_LICENSE = Artistic or GPL-1.0+
PERL_ENCODE_LOCALE_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-file-listing/perl-file-listing.mk b/package/perl-file-listing/perl-file-listing.mk
index a9d8ced..e150de7 100644
--- a/package/perl-file-listing/perl-file-listing.mk
+++ b/package/perl-file-listing/perl-file-listing.mk
@@ -8,7 +8,7 @@ PERL_FILE_LISTING_VERSION = 6.04
PERL_FILE_LISTING_SOURCE = File-Listing-$(PERL_FILE_LISTING_VERSION).tar.gz
PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
PERL_FILE_LISTING_DEPENDENCIES = perl-http-date
-PERL_FILE_LISTING_LICENSE = Artistic or GPLv1+
+PERL_FILE_LISTING_LICENSE = Artistic or GPL-1.0+
PERL_FILE_LISTING_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-file-util/perl-file-util.mk b/package/perl-file-util/perl-file-util.mk
index 7026515..723cc7a 100644
--- a/package/perl-file-util/perl-file-util.mk
+++ b/package/perl-file-util/perl-file-util.mk
@@ -8,7 +8,7 @@ PERL_FILE_UTIL_VERSION = 4.132140
PERL_FILE_UTIL_SOURCE = File-Util-$(PERL_FILE_UTIL_VERSION).tar.gz
PERL_FILE_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOMMY
PERL_FILE_UTIL_DEPENDENCIES = host-perl-module-build
-PERL_FILE_UTIL_LICENSE = Artistic or GPLv1+
+PERL_FILE_UTIL_LICENSE = Artistic or GPL-1.0+
PERL_FILE_UTIL_LICENSE_FILES = COPYING LICENSE
HOST_PERL_FILE_UTIL_DEPENDENCIES = host-perl-module-build
diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk
index 2ad966c..89a21cf 100644
--- a/package/perl-gd/perl-gd.mk
+++ b/package/perl-gd/perl-gd.mk
@@ -8,7 +8,7 @@ PERL_GD_VERSION = 2.56
PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz
PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LD/LDS
PERL_GD_DEPENDENCIES = zlib libpng freetype gd
-PERL_GD_LICENSE = Artistic or GPLv1+
+PERL_GD_LICENSE = Artistic or GPL-1.0+
PERL_GD_LICENSE_FILES = LICENSE
PERL_GD_PREFER_INSTALLER = EUMM
diff --git a/package/perl-gdgraph/perl-gdgraph.mk b/package/perl-gdgraph/perl-gdgraph.mk
index dc7ffd9..c431707 100644
--- a/package/perl-gdgraph/perl-gdgraph.mk
+++ b/package/perl-gdgraph/perl-gdgraph.mk
@@ -8,7 +8,7 @@ PERL_GDGRAPH_VERSION = 1.54
PERL_GDGRAPH_SOURCE = GDGraph-$(PERL_GDGRAPH_VERSION).tar.gz
PERL_GDGRAPH_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RUZ
PERL_GDGRAPH_DEPENDENCIES = perl-gd perl-gdtextutil
-PERL_GDGRAPH_LICENSE = Artistic or GPLv1+
+PERL_GDGRAPH_LICENSE = Artistic or GPL-1.0+
PERL_GDGRAPH_LICENSE_FILES = Dustismo.LICENSE
$(eval $(perl-package))
diff --git a/package/perl-html-parser/perl-html-parser.mk b/package/perl-html-parser/perl-html-parser.mk
index 14a2826..66016eb 100644
--- a/package/perl-html-parser/perl-html-parser.mk
+++ b/package/perl-html-parser/perl-html-parser.mk
@@ -8,7 +8,7 @@ PERL_HTML_PARSER_VERSION = 3.72
PERL_HTML_PARSER_SOURCE = HTML-Parser-$(PERL_HTML_PARSER_VERSION).tar.gz
PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
PERL_HTML_PARSER_DEPENDENCIES = perl-html-tagset
-PERL_HTML_PARSER_LICENSE = Artistic or GPLv1+
+PERL_HTML_PARSER_LICENSE = Artistic or GPL-1.0+
PERL_HTML_PARSER_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-html-tagset/perl-html-tagset.mk b/package/perl-html-tagset/perl-html-tagset.mk
index d18d6a6..ff371fa 100644
--- a/package/perl-html-tagset/perl-html-tagset.mk
+++ b/package/perl-html-tagset/perl-html-tagset.mk
@@ -7,7 +7,7 @@
PERL_HTML_TAGSET_VERSION = 3.20
PERL_HTML_TAGSET_SOURCE = HTML-Tagset-$(PERL_HTML_TAGSET_VERSION).tar.gz
PERL_HTML_TAGSET_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PETDANCE
-PERL_HTML_TAGSET_LICENSE = Artistic or GPLv1+
+PERL_HTML_TAGSET_LICENSE = Artistic or GPL-1.0+
PERL_HTML_TAGSET_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-http-cookies/perl-http-cookies.mk b/package/perl-http-cookies/perl-http-cookies.mk
index 52ee74a..a4ef552 100644
--- a/package/perl-http-cookies/perl-http-cookies.mk
+++ b/package/perl-http-cookies/perl-http-cookies.mk
@@ -8,7 +8,7 @@ PERL_HTTP_COOKIES_VERSION = 6.01
PERL_HTTP_COOKIES_SOURCE = HTTP-Cookies-$(PERL_HTTP_COOKIES_VERSION).tar.gz
PERL_HTTP_COOKIES_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
PERL_HTTP_COOKIES_DEPENDENCIES = perl-http-date perl-http-message
-PERL_HTTP_COOKIES_LICENSE = Artistic or GPLv1+
+PERL_HTTP_COOKIES_LICENSE = Artistic or GPL-1.0+
PERL_HTTP_COOKIES_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-http-daemon/perl-http-daemon.mk b/package/perl-http-daemon/perl-http-daemon.mk
index 56dbd78..65cdaf8 100644
--- a/package/perl-http-daemon/perl-http-daemon.mk
+++ b/package/perl-http-daemon/perl-http-daemon.mk
@@ -8,7 +8,7 @@ PERL_HTTP_DAEMON_VERSION = 6.01
PERL_HTTP_DAEMON_SOURCE = HTTP-Daemon-$(PERL_HTTP_DAEMON_VERSION).tar.gz
PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
PERL_HTTP_DAEMON_DEPENDENCIES = perl-http-date perl-http-message perl-lwp-mediatypes
-PERL_HTTP_DAEMON_LICENSE = Artistic or GPLv1+
+PERL_HTTP_DAEMON_LICENSE = Artistic or GPL-1.0+
PERL_HTTP_DAEMON_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-http-date/perl-http-date.mk b/package/perl-http-date/perl-http-date.mk
index bb5f4dc..feccf25 100644
--- a/package/perl-http-date/perl-http-date.mk
+++ b/package/perl-http-date/perl-http-date.mk
@@ -7,7 +7,7 @@
PERL_HTTP_DATE_VERSION = 6.02
PERL_HTTP_DATE_SOURCE = HTTP-Date-$(PERL_HTTP_DATE_VERSION).tar.gz
PERL_HTTP_DATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_HTTP_DATE_LICENSE = Artistic or GPLv1+
+PERL_HTTP_DATE_LICENSE = Artistic or GPL-1.0+
PERL_HTTP_DATE_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-http-message/perl-http-message.mk b/package/perl-http-message/perl-http-message.mk
index 77213fa..a66353a 100644
--- a/package/perl-http-message/perl-http-message.mk
+++ b/package/perl-http-message/perl-http-message.mk
@@ -8,7 +8,7 @@ PERL_HTTP_MESSAGE_VERSION = 6.11
PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz
PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER
PERL_HTTP_MESSAGE_DEPENDENCIES = perl-encode-locale perl-http-date perl-io-html perl-lwp-mediatypes perl-uri
-PERL_HTTP_MESSAGE_LICENSE = Artistic or GPLv1+
+PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+
PERL_HTTP_MESSAGE_LICENSE_FILES = LICENSE
$(eval $(perl-package))
diff --git a/package/perl-http-negotiate/perl-http-negotiate.mk b/package/perl-http-negotiate/perl-http-negotiate.mk
index 569ed2b..86ca554 100644
--- a/package/perl-http-negotiate/perl-http-negotiate.mk
+++ b/package/perl-http-negotiate/perl-http-negotiate.mk
@@ -8,7 +8,7 @@ PERL_HTTP_NEGOTIATE_VERSION = 6.01
PERL_HTTP_NEGOTIATE_SOURCE = HTTP-Negotiate-$(PERL_HTTP_NEGOTIATE_VERSION).tar.gz
PERL_HTTP_NEGOTIATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
PERL_HTTP_NEGOTIATE_DEPENDENCIES = perl-http-message
-PERL_HTTP_NEGOTIATE_LICENSE = Artistic or GPLv1+
+PERL_HTTP_NEGOTIATE_LICENSE = Artistic or GPL-1.0+
PERL_HTTP_NEGOTIATE_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-io-html/perl-io-html.mk b/package/perl-io-html/perl-io-html.mk
index 4bdcc8d..bb79f45 100644
--- a/package/perl-io-html/perl-io-html.mk
+++ b/package/perl-io-html/perl-io-html.mk
@@ -7,7 +7,7 @@
PERL_IO_HTML_VERSION = 1.001
PERL_IO_HTML_SOURCE = IO-HTML-$(PERL_IO_HTML_VERSION).tar.gz
PERL_IO_HTML_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CJ/CJM
-PERL_IO_HTML_LICENSE = Artistic or GPLv1+
+PERL_IO_HTML_LICENSE = Artistic or GPL-1.0+
PERL_IO_HTML_LICENSE_FILES = LICENSE
$(eval $(perl-package))
diff --git a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk
index 5bbd0c6..be7db72 100644
--- a/package/perl-io-socket-ssl/perl-io-socket-ssl.mk
+++ b/package/perl-io-socket-ssl/perl-io-socket-ssl.mk
@@ -8,7 +8,7 @@ PERL_IO_SOCKET_SSL_VERSION = 2.022
PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz
PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR
PERL_IO_SOCKET_SSL_DEPENDENCIES = perl-net-ssleay
-PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPLv1+
+PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+
PERL_IO_SOCKET_SSL_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-libwww-perl/perl-libwww-perl.mk b/package/perl-libwww-perl/perl-libwww-perl.mk
index 8d4d00e..fe5bd98 100644
--- a/package/perl-libwww-perl/perl-libwww-perl.mk
+++ b/package/perl-libwww-perl/perl-libwww-perl.mk
@@ -20,7 +20,7 @@ PERL_LIBWWW_PERL_DEPENDENCIES = \
perl-net-http \
perl-uri \
perl-www-robotrules
-PERL_LIBWWW_PERL_LICENSE = Artistic or GPLv1+
+PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+
PERL_LIBWWW_PERL_LICENSE_FILES = LICENSE
$(eval $(perl-package))
diff --git a/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk b/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk
index cd7c75a..bcf4e5f 100644
--- a/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk
+++ b/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk
@@ -7,7 +7,7 @@
PERL_LWP_MEDIATYPES_VERSION = 6.02
PERL_LWP_MEDIATYPES_SOURCE = LWP-MediaTypes-$(PERL_LWP_MEDIATYPES_VERSION).tar.gz
PERL_LWP_MEDIATYPES_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_LWP_MEDIATYPES_LICENSE = Artistic or GPLv1+
+PERL_LWP_MEDIATYPES_LICENSE = Artistic or GPL-1.0+
PERL_LWP_MEDIATYPES_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-mailtools/perl-mailtools.mk b/package/perl-mailtools/perl-mailtools.mk
index 1c41831..bddaf9f 100644
--- a/package/perl-mailtools/perl-mailtools.mk
+++ b/package/perl-mailtools/perl-mailtools.mk
@@ -8,7 +8,7 @@ PERL_MAILTOOLS_VERSION = 2.18
PERL_MAILTOOLS_SOURCE = MailTools-$(PERL_MAILTOOLS_VERSION).tar.gz
PERL_MAILTOOLS_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MA/MARKOV
PERL_MAILTOOLS_DEPENDENCIES = perl-timedate
-PERL_MAILTOOLS_LICENSE = Artistic or GPLv1+
+PERL_MAILTOOLS_LICENSE = Artistic or GPL-1.0+
PERL_MAILTOOLS_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-mime-base64/perl-mime-base64.mk b/package/perl-mime-base64/perl-mime-base64.mk
index d064337..e7febe1 100644
--- a/package/perl-mime-base64/perl-mime-base64.mk
+++ b/package/perl-mime-base64/perl-mime-base64.mk
@@ -7,7 +7,7 @@
PERL_MIME_BASE64_VERSION = 3.15
PERL_MIME_BASE64_SOURCE = MIME-Base64-$(PERL_MIME_BASE64_VERSION).tar.gz
PERL_MIME_BASE64_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_MIME_BASE64_LICENSE = Artistic or GPLv1+
+PERL_MIME_BASE64_LICENSE = Artistic or GPL-1.0+
PERL_MIME_BASE64_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-module-build/perl-module-build.mk b/package/perl-module-build/perl-module-build.mk
index 3c27002..080e817 100644
--- a/package/perl-module-build/perl-module-build.mk
+++ b/package/perl-module-build/perl-module-build.mk
@@ -7,7 +7,7 @@
PERL_MODULE_BUILD_VERSION = 0.4220
PERL_MODULE_BUILD_SOURCE = Module-Build-$(PERL_MODULE_BUILD_VERSION).tar.gz
PERL_MODULE_BUILD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT
-PERL_MODULE_BUILD_LICENSE = Artistic or GPLv1+
+PERL_MODULE_BUILD_LICENSE = Artistic or GPL-1.0+
PERL_MODULE_BUILD_LICENSE_FILES = LICENSE
$(eval $(host-perl-package))
diff --git a/package/perl-net-http/perl-net-http.mk b/package/perl-net-http/perl-net-http.mk
index ec74a3f..8dfe278 100644
--- a/package/perl-net-http/perl-net-http.mk
+++ b/package/perl-net-http/perl-net-http.mk
@@ -8,7 +8,7 @@ PERL_NET_HTTP_VERSION = 6.12
PERL_NET_HTTP_SOURCE = Net-HTTP-$(PERL_NET_HTTP_VERSION).tar.gz
PERL_NET_HTTP_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS
PERL_NET_HTTP_DEPENDENCIES = perl-uri
-PERL_NET_HTTP_LICENSE = Artistic or GPLv1+
+PERL_NET_HTTP_LICENSE = Artistic or GPL-1.0+
PERL_NET_HTTP_LICENSE_FILES = LICENSE
$(eval $(perl-package))
diff --git a/package/perl-netaddr-ip/perl-netaddr-ip.mk b/package/perl-netaddr-ip/perl-netaddr-ip.mk
index b5ee9a1..a1f02c6 100644
--- a/package/perl-netaddr-ip/perl-netaddr-ip.mk
+++ b/package/perl-netaddr-ip/perl-netaddr-ip.mk
@@ -7,7 +7,7 @@
PERL_NETADDR_IP_VERSION = 4.079
PERL_NETADDR_IP_SOURCE = NetAddr-IP-$(PERL_NETADDR_IP_VERSION).tar.gz
PERL_NETADDR_IP_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKER
-PERL_NETADDR_IP_LICENSE = Artistic or GPLv1+
+PERL_NETADDR_IP_LICENSE = Artistic or GPL-1.0+
PERL_NETADDR_IP_LICENSE_FILES = Artistic Copying
# we always build the Pure Perl version.
diff --git a/package/perl-time-hires/perl-time-hires.mk b/package/perl-time-hires/perl-time-hires.mk
index 7436d96..e1c32a2 100644
--- a/package/perl-time-hires/perl-time-hires.mk
+++ b/package/perl-time-hires/perl-time-hires.mk
@@ -7,7 +7,7 @@
PERL_TIME_HIRES_VERSION = 1.9726
PERL_TIME_HIRES_SOURCE = Time-HiRes-$(PERL_TIME_HIRES_VERSION).tar.gz
PERL_TIME_HIRES_SITE = $(BR2_CPAN_MIRROR)/authors/id/Z/ZE/ZEFRAM
-PERL_TIME_HIRES_LICENSE = Artistic or GPLv1+
+PERL_TIME_HIRES_LICENSE = Artistic or GPL-1.0+
PERL_TIME_HIRES_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-timedate/perl-timedate.mk b/package/perl-timedate/perl-timedate.mk
index 4c594fb..cdc2c07 100644
--- a/package/perl-timedate/perl-timedate.mk
+++ b/package/perl-timedate/perl-timedate.mk
@@ -7,7 +7,7 @@
PERL_TIMEDATE_VERSION = 2.30
PERL_TIMEDATE_SOURCE = TimeDate-$(PERL_TIMEDATE_VERSION).tar.gz
PERL_TIMEDATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GB/GBARR
-PERL_TIMEDATE_LICENSE = Artistic or GPLv1+
+PERL_TIMEDATE_LICENSE = Artistic or GPL-1.0+
PERL_TIMEDATE_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-uri/perl-uri.mk b/package/perl-uri/perl-uri.mk
index e7118fc..effeb16 100644
--- a/package/perl-uri/perl-uri.mk
+++ b/package/perl-uri/perl-uri.mk
@@ -7,7 +7,7 @@
PERL_URI_VERSION = 1.71
PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz
PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER
-PERL_URI_LICENSE = Artistic or GPLv1+
+PERL_URI_LICENSE = Artistic or GPL-1.0+
PERL_URI_LICENSE_FILES = LICENSE
$(eval $(perl-package))
diff --git a/package/perl-www-robotrules/perl-www-robotrules.mk b/package/perl-www-robotrules/perl-www-robotrules.mk
index 0c68b98..5e8bab9 100644
--- a/package/perl-www-robotrules/perl-www-robotrules.mk
+++ b/package/perl-www-robotrules/perl-www-robotrules.mk
@@ -8,7 +8,7 @@ PERL_WWW_ROBOTRULES_VERSION = 6.02
PERL_WWW_ROBOTRULES_SOURCE = WWW-RobotRules-$(PERL_WWW_ROBOTRULES_VERSION).tar.gz
PERL_WWW_ROBOTRULES_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
PERL_WWW_ROBOTRULES_DEPENDENCIES = perl-uri
-PERL_WWW_ROBOTRULES_LICENSE = Artistic or GPLv1+
+PERL_WWW_ROBOTRULES_LICENSE = Artistic or GPL-1.0+
PERL_WWW_ROBOTRULES_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-xml-libxml/perl-xml-libxml.mk b/package/perl-xml-libxml/perl-xml-libxml.mk
index 8d8f590..69cf57c 100644
--- a/package/perl-xml-libxml/perl-xml-libxml.mk
+++ b/package/perl-xml-libxml/perl-xml-libxml.mk
@@ -8,7 +8,7 @@ PERL_XML_LIBXML_VERSION = 2.0128
PERL_XML_LIBXML_SOURCE = XML-LibXML-$(PERL_XML_LIBXML_VERSION).tar.gz
PERL_XML_LIBXML_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SH/SHLOMIF
PERL_XML_LIBXML_DEPENDENCIES = zlib libxml2 perl-xml-namespacesupport perl-xml-sax perl-xml-sax-base
-PERL_XML_LIBXML_LICENSE = Artistic or GPLv1+
+PERL_XML_LIBXML_LICENSE = Artistic or GPL-1.0+
PERL_XML_LIBXML_LICENSE_FILES = LICENSE
PERL_XML_LIBXML_CONF_OPTS = \
diff --git a/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk b/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
index 31b71c1..d7bcdd4 100644
--- a/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
+++ b/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
@@ -7,7 +7,7 @@
PERL_XML_NAMESPACESUPPORT_VERSION = 1.11
PERL_XML_NAMESPACESUPPORT_SOURCE = XML-NamespaceSupport-$(PERL_XML_NAMESPACESUPPORT_VERSION).tar.gz
PERL_XML_NAMESPACESUPPORT_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PERIGRIN
-PERL_XML_NAMESPACESUPPORT_LICENSE = Artistic or GPLv1+
+PERL_XML_NAMESPACESUPPORT_LICENSE = Artistic or GPL-1.0+
PERL_XML_NAMESPACESUPPORT_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-xml-sax-base/perl-xml-sax-base.mk b/package/perl-xml-sax-base/perl-xml-sax-base.mk
index 60dec31..bb197ae 100644
--- a/package/perl-xml-sax-base/perl-xml-sax-base.mk
+++ b/package/perl-xml-sax-base/perl-xml-sax-base.mk
@@ -7,7 +7,7 @@
PERL_XML_SAX_BASE_VERSION = 1.08
PERL_XML_SAX_BASE_SOURCE = XML-SAX-Base-$(PERL_XML_SAX_BASE_VERSION).tar.gz
PERL_XML_SAX_BASE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM
-PERL_XML_SAX_BASE_LICENSE = Artistic or GPLv1+
+PERL_XML_SAX_BASE_LICENSE = Artistic or GPL-1.0+
PERL_XML_SAX_BASE_LICENSE_FILES = README
$(eval $(perl-package))
diff --git a/package/perl-xml-sax/perl-xml-sax.mk b/package/perl-xml-sax/perl-xml-sax.mk
index f6d0372..90b2cd6 100644
--- a/package/perl-xml-sax/perl-xml-sax.mk
+++ b/package/perl-xml-sax/perl-xml-sax.mk
@@ -8,7 +8,7 @@ PERL_XML_SAX_VERSION = 0.99
PERL_XML_SAX_SOURCE = XML-SAX-$(PERL_XML_SAX_VERSION).tar.gz
PERL_XML_SAX_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM
PERL_XML_SAX_DEPENDENCIES = perl-xml-namespacesupport perl-xml-sax-base
-PERL_XML_SAX_LICENSE = Artistic or GPLv1+
+PERL_XML_SAX_LICENSE = Artistic or GPL-1.0+
PERL_XML_SAX_LICENSE_FILES = LICENSE
$(eval $(perl-package))
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index b407e05..130441f 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -9,7 +9,7 @@ PERL_VERSION_MAJOR = 24
PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1
PERL_SITE = http://www.cpan.org/src/5.0
PERL_SOURCE = perl-$(PERL_VERSION).tar.xz
-PERL_LICENSE = Artistic or GPLv1+
+PERL_LICENSE = Artistic or GPL-1.0+
PERL_LICENSE_FILES = Artistic Copying README
PERL_INSTALL_STAGING = YES
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 02/21] package: use SPDX short identifier for GPLv1/GPLv1+
2017-03-30 13:43 ` [Buildroot] [PATCH 02/21] package: use SPDX short identifier for GPLv1/GPLv1+ Rahul Bedarkar
@ 2017-03-30 21:08 ` Arnout Vandecappelle
0 siblings, 0 replies; 34+ messages in thread
From: Arnout Vandecappelle @ 2017-03-30 21:08 UTC (permalink / raw)
To: buildroot
On 30-03-17 15:43, Rahul Bedarkar wrote:
> We want to use SPDX identifier for licenses as much as possible. SPDX
> short identifier for GPLv1/GPLv1+ is GPL-1.0/GPL-1.0+.
>
> This change is done using following command.
> find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/GPLv1(\+)?/GPL-1.0\1/g'
^^^^
This bit is not
really needed, and in subsequent patches you indeed dropped it. Anyway it
doesn't affect the result.
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(yes, I looked at the entire patch!)
Regards,
Arnout
>
> Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 34+ messages in thread
* [Buildroot] [PATCH 03/21] boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 01/21] docs/manual: refer to SPDX License List Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 02/21] package: use SPDX short identifier for GPLv1/GPLv1+ Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 21:50 ` Arnout Vandecappelle
2017-03-30 13:43 ` [Buildroot] [PATCH 04/21] boot, package: use SPDX short identifier for GPLv3/GPLv3+ Rahul Bedarkar
` (19 subsequent siblings)
22 siblings, 1 reply; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license strings as much as possible.
SPDX short identifier for GPLv2/GPLv2+ is GPL-2.0/GPL-2.0+.
This change is done by using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv2\>/GPL-2.0/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
boot/barebox/barebox.mk | 2 +-
boot/grub/grub.mk | 2 +-
boot/mxs-bootlets/mxs-bootlets.mk | 2 +-
boot/syslinux/syslinux.mk | 2 +-
boot/uboot/uboot.mk | 2 +-
boot/xloader/xloader.mk | 2 +-
linux/linux.mk | 2 +-
package/acl/acl.mk | 2 +-
package/acpica/acpica.mk | 2 +-
package/acpid/acpid.mk | 2 +-
package/acpitool/acpitool.mk | 2 +-
package/aer-inject/aer-inject.mk | 2 +-
package/aircrack-ng/aircrack-ng.mk | 2 +-
package/alsa-lib/alsa-lib.mk | 2 +-
package/alsa-utils/alsa-utils.mk | 2 +-
package/alsamixergui/alsamixergui.mk | 2 +-
package/argus/argus.mk | 2 +-
package/arptables/arptables.mk | 2 +-
package/at/at.mk | 2 +-
package/atftp/atftp.mk | 2 +-
package/atkmm/atkmm.mk | 2 +-
package/atop/atop.mk | 2 +-
package/attr/attr.mk | 2 +-
package/audiofile/audiofile.mk | 2 +-
package/audit/audit.mk | 2 +-
package/aufs-util/aufs-util.mk | 2 +-
package/aufs/aufs.mk | 2 +-
package/aumix/aumix.mk | 2 +-
package/autofs/autofs.mk | 2 +-
package/automake/automake.mk | 2 +-
package/avrdude/avrdude.mk | 4 ++--
package/axel/axel.mk | 2 +-
package/axfsutils/axfsutils.mk | 2 +-
package/batctl/batctl.mk | 2 +-
package/batman-adv/batman-adv.mk | 2 +-
package/bc/bc.mk | 2 +-
package/bcache-tools/bcache-tools.mk | 2 +-
package/bcm2835/bcm2835.mk | 2 +-
package/bctoolbox/bctoolbox.mk | 2 +-
package/bcusdk/bcusdk.mk | 2 +-
package/blktrace/blktrace.mk | 2 +-
package/bluez5_utils/bluez5_utils.mk | 2 +-
package/bluez_utils/bluez_utils.mk | 2 +-
package/boa/boa.mk | 2 +-
package/bonnie/bonnie.mk | 2 +-
package/bootutils/bootutils.mk | 2 +-
package/bridge-utils/bridge-utils.mk | 2 +-
package/btrfs-progs/btrfs-progs.mk | 2 +-
package/busybox/busybox.mk | 2 +-
package/bwm-ng/bwm-ng.mk | 2 +-
package/c-icap-modules/c-icap-modules.mk | 2 +-
package/ca-certificates/ca-certificates.mk | 2 +-
package/cannelloni/cannelloni.mk | 2 +-
package/cbootimage/cbootimage.mk | 2 +-
package/cc-tool/cc-tool.mk | 2 +-
package/ccrypt/ccrypt.mk | 2 +-
package/cdrkit/cdrkit.mk | 2 +-
package/checkpolicy/checkpolicy.mk | 2 +-
package/chocolate-doom/chocolate-doom.mk | 2 +-
package/chrony/chrony.mk | 2 +-
package/clamav/clamav.mk | 2 +-
package/classpath/classpath.mk | 2 +-
package/cloop/cloop.mk | 2 +-
package/collectd/collectd.mk | 2 +-
package/connman-gtk/connman-gtk.mk | 2 +-
package/connman/connman.mk | 2 +-
package/conntrack-tools/conntrack-tools.mk | 2 +-
package/cpuload/cpuload.mk | 2 +-
package/cramfs/cramfs.mk | 2 +-
package/crudini/crudini.mk | 2 +-
package/cryptodev-linux/cryptodev-linux.mk | 2 +-
package/cryptsetup/cryptsetup.mk | 2 +-
package/ctorrent/ctorrent.mk | 2 +-
package/cups/cups.mk | 2 +-
package/curlftpfs/curlftpfs.mk | 2 +-
package/cwiid/cwiid.mk | 2 +-
package/dash/dash.mk | 2 +-
package/dbus-glib/dbus-glib.mk | 2 +-
package/dbus-triggerd/dbus-triggerd.mk | 2 +-
package/dbus/dbus.mk | 2 +-
package/ddrescue/ddrescue.mk | 2 +-
package/debianutils/debianutils.mk | 2 +-
package/devmem2/devmem2.mk | 2 +-
package/dfu-util/dfu-util.mk | 2 +-
package/dmidecode/dmidecode.mk | 2 +-
package/dmraid/dmraid.mk | 2 +-
package/dnsmasq/dnsmasq.mk | 2 +-
package/docker/docker.mk | 2 +-
package/doxygen/doxygen.mk | 2 +-
package/drbd-utils/drbd-utils.mk | 2 +-
package/dropwatch/dropwatch.mk | 2 +-
package/dstat/dstat.mk | 2 +-
package/dtach/dtach.mk | 2 +-
package/dtc/dtc.mk | 4 ++--
package/dtv-scan-tables/dtv-scan-tables.mk | 2 +-
package/duma/duma.mk | 2 +-
package/dvb-apps/dvb-apps.mk | 2 +-
package/dvblast/dvblast.mk | 2 +-
package/dvbsnoop/dvbsnoop.mk | 2 +-
package/dvdauthor/dvdauthor.mk | 2 +-
package/dvdrw-tools/dvdrw-tools.mk | 2 +-
package/e2fsprogs/e2fsprogs.mk | 2 +-
package/e2tools/e2tools.mk | 2 +-
package/ebtables/ebtables.mk | 2 +-
package/ecryptfs-utils/ecryptfs-utils.mk | 2 +-
package/eeprog/eeprog.mk | 2 +-
package/efibootmgr/efibootmgr.mk | 2 +-
package/efl/efl.mk | 2 +-
package/ejabberd/ejabberd.mk | 2 +-
package/elf2flt/elf2flt.mk | 2 +-
package/elfutils/elfutils.mk | 2 +-
package/emlog/emlog.mk | 2 +-
package/erlang-p1-iconv/erlang-p1-iconv.mk | 2 +-
package/erlang-p1-sip/erlang-p1-sip.mk | 2 +-
package/erlang-p1-stun/erlang-p1-stun.mk | 2 +-
package/erlang-p1-tls/erlang-p1-tls.mk | 2 +-
package/erlang-p1-utils/erlang-p1-utils.mk | 2 +-
package/erlang-p1-zlib/erlang-p1-zlib.mk | 2 +-
package/ethtool/ethtool.mk | 2 +-
package/eudev/eudev.mk | 2 +-
package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk | 2 +-
package/evtest/evtest.mk | 2 +-
package/exim/exim.mk | 2 +-
package/exiv2/exiv2.mk | 2 +-
package/f2fs-tools/f2fs-tools.mk | 2 +-
package/faad2/faad2.mk | 2 +-
package/fakedate/fakedate.mk | 2 +-
package/faketime/faketime.mk | 2 +-
package/fan-ctrl/fan-ctrl.mk | 2 +-
package/fb-test-app/fb-test-app.mk | 2 +-
package/fbdump/fbdump.mk | 2 +-
package/fbgrab/fbgrab.mk | 2 +-
package/fbset/fbset.mk | 2 +-
package/fbterm/fbterm.mk | 2 +-
package/fbtft/fbtft.mk | 2 +-
package/fbv/fbv.mk | 2 +-
package/fconfig/fconfig.mk | 2 +-
package/fetchmail/fetchmail.mk | 2 +-
package/ffmpeg/ffmpeg.mk | 2 +-
package/fftw/fftw.mk | 2 +-
package/fio/fio.mk | 2 +-
package/firejail/firejail.mk | 2 +-
package/fis/fis.mk | 2 +-
package/flac/flac.mk | 2 +-
package/flashbench/flashbench.mk | 2 +-
package/flashrom/flashrom.mk | 2 +-
package/flickcurl/flickcurl.mk | 2 +-
package/fmlib/fmlib.mk | 2 +-
package/fmtools/fmtools.mk | 2 +-
package/freescale-imx/imx-kobs/imx-kobs.mk | 2 +-
package/freescale-imx/imx-uuc/imx-uuc.mk | 2 +-
.../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk | 2 +-
package/freetype/freetype.mk | 2 +-
package/fswebcam/fswebcam.mk | 2 +-
package/fwts/fwts.mk | 2 +-
package/fxload/fxload.mk | 2 +-
package/gdb/gdb.mk | 2 +-
package/genext2fs/genext2fs.mk | 2 +-
package/genimage/genimage.mk | 2 +-
package/genromfs/genromfs.mk | 2 +-
package/gesftpserver/gesftpserver.mk | 2 +-
package/ghostscript-fonts/ghostscript-fonts.mk | 2 +-
package/git/git.mk | 2 +-
package/glibc/glibc.mk | 2 +-
package/glibmm/glibmm.mk | 2 +-
package/gmp/gmp.mk | 2 +-
package/gmpc/gmpc.mk | 2 +-
package/gmrender-resurrect/gmrender-resurrect.mk | 2 +-
package/gnu-efi/gnu-efi.mk | 2 +-
package/gnuchess/gnuchess.mk | 2 +-
package/gpm/gpm.mk | 2 +-
package/gptfdisk/gptfdisk.mk | 2 +-
package/gqview/gqview.mk | 2 +-
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 2 +-
package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk | 2 +-
package/gstreamer/gst-plugins-base/gst-plugins-base.mk | 2 +-
package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk | 2 +-
package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +-
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +-
package/gtkmm3/gtkmm3.mk | 2 +-
package/gtkperf/gtkperf.mk | 2 +-
package/gupnp-tools/gupnp-tools.mk | 2 +-
package/gutenprint/gutenprint.mk | 2 +-
package/haserl/haserl.mk | 2 +-
package/hiawatha/hiawatha.mk | 2 +-
package/hicolor-icon-theme/hicolor-icon-theme.mk | 2 +-
package/hplip/hplip.mk | 2 +-
package/htop/htop.mk | 2 +-
package/httping/httping.mk | 2 +-
package/hwdata/hwdata.mk | 2 +-
package/i2c-tools/i2c-tools.mk | 2 +-
package/i7z/i7z.mk | 2 +-
package/ifplugd/ifplugd.mk | 2 +-
package/iftop/iftop.mk | 2 +-
package/ifupdown/ifupdown.mk | 2 +-
package/igd2-for-linux/igd2-for-linux.mk | 2 +-
package/igh-ethercat/igh-ethercat.mk | 2 +-
package/igmpproxy/igmpproxy.mk | 2 +-
package/inadyn/inadyn.mk | 2 +-
package/input-tools/input-tools.mk | 2 +-
package/intltool/intltool.mk | 2 +-
package/iotop/iotop.mk | 2 +-
package/iproute2/iproute2.mk | 2 +-
package/ipset/ipset.mk | 2 +-
package/iptables/iptables.mk | 2 +-
package/iptraf-ng/iptraf-ng.mk | 2 +-
package/iputils/iputils.mk | 2 +-
package/iqvlinux/iqvlinux.mk | 2 +-
package/irda-utils/irda-utils.mk | 2 +-
package/irqbalance/irqbalance.mk | 2 +-
| 2 +-
package/iucode-tool/iucode-tool.mk | 2 +-
package/jack2/jack2.mk | 2 +-
package/jamvm/jamvm.mk | 2 +-
package/jo/jo.mk | 2 +-
package/kbd/kbd.mk | 2 +-
package/keepalived/keepalived.mk | 2 +-
package/kexec-lite/kexec-lite.mk | 2 +-
package/kexec/kexec.mk | 2 +-
package/keyutils/keyutils.mk | 2 +-
package/kismet/kismet.mk | 2 +-
package/kmod/kmod.mk | 2 +-
package/knock/knock.mk | 2 +-
package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk | 2 +-
package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk | 2 +-
package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk | 2 +-
package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk | 2 +-
package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk | 2 +-
package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk | 2 +-
package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk | 2 +-
package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk | 2 +-
package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk | 2 +-
package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk | 2 +-
package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk | 2 +-
package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk | 2 +-
package/kodi-platform/kodi-platform.mk | 2 +-
package/kodi-pvr-argustv/kodi-pvr-argustv.mk | 2 +-
package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk | 2 +-
package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk | 2 +-
package/kodi-pvr-filmon/kodi-pvr-filmon.mk | 2 +-
package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk | 2 +-
package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +-
package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +-
.../kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk | 2 +-
package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +-
package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +-
package/kodi-pvr-njoy/kodi-pvr-njoy.mk | 2 +-
package/kodi-pvr-pctv/kodi-pvr-pctv.mk | 2 +-
package/kodi-pvr-stalker/kodi-pvr-stalker.mk | 2 +-
package/kodi-pvr-vbox/kodi-pvr-vbox.mk | 2 +-
package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk | 2 +-
package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk | 2 +-
package/kodi-pvr-wmc/kodi-pvr-wmc.mk | 2 +-
package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk | 2 +-
package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk | 2 +-
package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk | 2 +-
.../kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk | 2 +-
package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk | 2 +-
.../kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk | 2 +-
package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk | 2 +-
package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk | 2 +-
package/kodi-screensaver-stars/kodi-screensaver-stars.mk | 2 +-
package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk | 2 +-
package/kodi-visualisation-goom/kodi-visualisation-goom.mk | 2 +-
package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk | 2 +-
package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk | 2 +-
.../kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk | 2 +-
package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk | 2 +-
package/kodi/kodi.mk | 2 +-
package/ktap/ktap.mk | 2 +-
package/kvmtool/kvmtool.mk | 2 +-
package/latencytop/latencytop.mk | 2 +-
package/lbreakout2/lbreakout2.mk | 2 +-
package/lcdproc/lcdproc.mk | 2 +-
package/leafpad/leafpad.mk | 2 +-
package/libao/libao.mk | 2 +-
package/libatomic_ops/libatomic_ops.mk | 2 +-
package/libcap-ng/libcap-ng.mk | 2 +-
package/libcap/libcap.mk | 2 +-
package/libcdaudio/libcdaudio.mk | 2 +-
package/libcec/libcec.mk | 2 +-
package/libcoap/libcoap.mk | 2 +-
package/libcue/libcue.mk | 2 +-
package/libcuefile/libcuefile.mk | 2 +-
package/libdvbcsa/libdvbcsa.mk | 2 +-
package/libdvdcss/libdvdcss.mk | 2 +-
package/libdvdnav/libdvdnav.mk | 2 +-
package/libdvdread/libdvdread.mk | 2 +-
package/libeXosip2/libeXosip2.mk | 2 +-
package/libenca/libenca.mk | 2 +-
package/libesmtp/libesmtp.mk | 2 +-
package/libev/libev.mk | 2 +-
| 2 +-
package/libfm/libfm.mk | 2 +-
package/libfreeimage/libfreeimage.mk | 2 +-
package/libftdi1/libftdi1.mk | 2 +-
package/libfuse/libfuse.mk | 2 +-
package/libgpg-error/libgpg-error.mk | 2 +-
package/libhid/libhid.mk | 2 +-
package/libid3tag/libid3tag.mk | 2 +-
package/libidn/libidn.mk | 2 +-
package/libiscsi/libiscsi.mk | 2 +-
package/libkcapi/libkcapi.mk | 2 +-
package/libksba/libksba.mk | 2 +-
package/liblockfile/liblockfile.mk | 2 +-
package/libmad/libmad.mk | 2 +-
package/libmbim/libmbim.mk | 2 +-
package/libmpd/libmpd.mk | 2 +-
package/libmpeg2/libmpeg2.mk | 2 +-
package/libnetfilter_conntrack/libnetfilter_conntrack.mk | 2 +-
package/libnetfilter_cthelper/libnetfilter_cthelper.mk | 2 +-
package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk | 2 +-
package/libnetfilter_log/libnetfilter_log.mk | 2 +-
package/libnetfilter_queue/libnetfilter_queue.mk | 2 +-
package/libnfnetlink/libnfnetlink.mk | 2 +-
package/libnftnl/libnftnl.mk | 2 +-
package/libnpth/libnpth.mk | 2 +-
package/liboping/liboping.mk | 2 +-
package/libpam-radius-auth/libpam-radius-auth.mk | 2 +-
package/libpam-tacplus/libpam-tacplus.mk | 2 +-
package/libpjsip/libpjsip.mk | 2 +-
package/libplatform/libplatform.mk | 2 +-
package/libqmi/libqmi.mk | 2 +-
package/librtlsdr/librtlsdr.mk | 2 +-
package/libserial/libserial.mk | 2 +-
package/libsidplay2/libsidplay2.mk | 2 +-
package/libsigsegv/libsigsegv.mk | 2 +-
package/libsysfs/libsysfs.mk | 2 +-
package/libtool/libtool.mk | 2 +-
package/libtorrent/libtorrent.mk | 2 +-
package/libuci/libuci.mk | 4 ++--
package/libuio/libuio.mk | 2 +-
package/libunistring/libunistring.mk | 2 +-
package/libupnpp/libupnpp.mk | 2 +-
package/liburcu/liburcu.mk | 2 +-
package/libusbgx/libusbgx.mk | 2 +-
package/libv4l/libv4l.mk | 2 +-
package/libvncserver/libvncserver.mk | 2 +-
package/linknx/linknx.mk | 2 +-
package/links/links.mk | 2 +-
package/linphone/linphone.mk | 2 +-
package/linux-backports/linux-backports.mk | 2 +-
package/linux-fusion/linux-fusion.mk | 2 +-
| 2 +-
package/linux-zigbee/linux-zigbee.mk | 2 +-
package/lirc-tools/lirc-tools.mk | 2 +-
package/lksctp-tools/lksctp-tools.mk | 2 +-
package/lm-sensors/lm-sensors.mk | 2 +-
package/lmbench/lmbench.mk | 2 +-
package/lockfile-progs/lockfile-progs.mk | 2 +-
package/logrotate/logrotate.mk | 2 +-
package/lpc3250loader/lpc3250loader.mk | 2 +-
package/lrzsz/lrzsz.mk | 2 +-
package/lshw/lshw.mk | 2 +-
package/lsuio/lsuio.mk | 2 +-
package/ltp-testsuite/ltp-testsuite.mk | 2 +-
package/ltrace/ltrace.mk | 2 +-
package/ltris/ltris.mk | 2 +-
package/lttng-babeltrace/lttng-babeltrace.mk | 2 +-
package/lttng-libust/lttng-libust.mk | 2 +-
package/lttng-modules/lttng-modules.mk | 2 +-
package/lttng-tools/lttng-tools.mk | 2 +-
package/lugaru/lugaru.mk | 2 +-
package/lvm2/lvm2.mk | 2 +-
package/lz4/lz4.mk | 2 +-
package/lzip/lzip.mk | 2 +-
package/lzo/lzo.mk | 2 +-
package/lzop/lzop.mk | 2 +-
package/macchanger/macchanger.mk | 2 +-
package/madplay/madplay.mk | 2 +-
package/makedevs/makedevs.mk | 2 +-
package/mariadb/mariadb.mk | 2 +-
package/matchbox-common/matchbox-common.mk | 2 +-
package/matchbox-desktop/matchbox-desktop.mk | 2 +-
package/matchbox-fakekey/matchbox-fakekey.mk | 2 +-
package/matchbox-keyboard/matchbox-keyboard.mk | 2 +-
package/matchbox-panel/matchbox-panel.mk | 2 +-
package/matchbox-startup-monitor/matchbox-startup-monitor.mk | 2 +-
package/matchbox/matchbox.mk | 2 +-
package/mcelog/mcelog.mk | 2 +-
package/mdadm/mdadm.mk | 2 +-
package/mediastreamer/mediastreamer.mk | 2 +-
package/memtest86/memtest86.mk | 2 +-
package/memtester/memtester.mk | 2 +-
package/memtool/memtool.mk | 2 +-
package/metacity/metacity.mk | 2 +-
package/minicom/minicom.mk | 2 +-
package/minidlna/minidlna.mk | 2 +-
package/miraclecast/miraclecast.mk | 2 +-
package/mjpegtools/mjpegtools.mk | 2 +-
package/mjpg-streamer/mjpg-streamer.mk | 2 +-
package/mkpasswd/mkpasswd.mk | 2 +-
package/mkpimage/mkpimage.mk | 2 +-
package/mmc-utils/mmc-utils.mk | 2 +-
package/modem-manager/modem-manager.mk | 2 +-
package/mongoose/mongoose.mk | 2 +-
package/mono/mono.mk | 2 +-
package/motion/motion.mk | 2 +-
package/mpd-mpc/mpd-mpc.mk | 2 +-
package/mpd/mpd.mk | 2 +-
package/mplayer/mplayer.mk | 2 +-
package/mpv/mpv.mk | 2 +-
package/msr-tools/msr-tools.mk | 2 +-
package/mtd/mtd.mk | 2 +-
package/mtr/mtr.mk | 2 +-
package/multicat/multicat.mk | 2 +-
package/mutt/mutt.mk | 2 +-
package/mxsldr/mxsldr.mk | 2 +-
package/nanocom/nanocom.mk | 2 +-
package/nbd/nbd.mk | 2 +-
package/ncmpc/ncmpc.mk | 2 +-
package/ndisc6/ndisc6.mk | 2 +-
package/neard/neard.mk | 2 +-
package/neardal/neardal.mk | 2 +-
package/neon/neon.mk | 2 +-
package/net-tools/net-tools.mk | 2 +-
package/netatalk/netatalk.mk | 2 +-
package/netcat/netcat.mk | 2 +-
package/netplug/netplug.mk | 2 +-
package/netsniff-ng/netsniff-ng.mk | 2 +-
package/netstat-nat/netstat-nat.mk | 2 +-
package/nettle/nettle.mk | 2 +-
package/network-manager/network-manager.mk | 2 +-
package/newt/newt.mk | 2 +-
package/nfacct/nfacct.mk | 2 +-
package/nfs-utils/nfs-utils.mk | 2 +-
package/nftables/nftables.mk | 2 +-
package/nginx-naxsi/nginx-naxsi.mk | 2 +-
package/ngircd/ngircd.mk | 2 +-
package/nload/nload.mk | 2 +-
package/nmap/nmap.mk | 2 +-
package/nodm/nodm.mk | 2 +-
package/noip/noip.mk | 2 +-
package/ntfs-3g/ntfs-3g.mk | 2 +-
package/numactl/numactl.mk | 2 +-
package/nut/nut.mk | 2 +-
package/nuttcp/nuttcp.mk | 2 +-
package/nvme/nvme.mk | 2 +-
package/odhcp6c/odhcp6c.mk | 2 +-
package/ofono/ofono.mk | 2 +-
package/ola/ola.mk | 2 +-
package/omap-u-boot-utils/omap-u-boot-utils.mk | 2 +-
package/omxplayer/omxplayer.mk | 2 +-
package/on2-8170-modules/on2-8170-modules.mk | 2 +-
package/open2300/open2300.mk | 2 +-
package/openbox/openbox.mk | 2 +-
package/openipmi/openipmi.mk | 2 +-
package/openobex/openobex.mk | 2 +-
package/openpowerlink/openpowerlink.mk | 2 +-
package/openswan/openswan.mk | 2 +-
package/opentyrian/opentyrian.mk | 2 +-
package/openvpn/openvpn.mk | 2 +-
package/opkg-utils/opkg-utils.mk | 2 +-
package/opkg/opkg.mk | 2 +-
package/oprofile/oprofile.mk | 2 +-
package/oracle-mysql/oracle-mysql.mk | 2 +-
package/owfs/owfs.mk | 2 +-
package/p910nd/p910nd.mk | 2 +-
package/pangomm/pangomm.mk | 2 +-
package/pax-utils/pax-utils.mk | 2 +-
package/pciutils/pciutils.mk | 2 +-
package/pcmanfm/pcmanfm.mk | 2 +-
package/picocom/picocom.mk | 2 +-
package/pinentry/pinentry.mk | 2 +-
package/policycoreutils/policycoreutils.mk | 2 +-
package/polkit/polkit.mk | 2 +-
package/poppler/poppler.mk | 2 +-
package/powerpc-utils/powerpc-utils.mk | 2 +-
package/powertop/powertop.mk | 2 +-
package/pppd/pppd.mk | 2 +-
package/pps-tools/pps-tools.mk | 2 +-
package/pptp-linux/pptp-linux.mk | 2 +-
package/prboom/prboom.mk | 2 +-
package/privoxy/privoxy.mk | 2 +-
package/procps-ng/procps-ng.mk | 2 +-
package/proftpd/proftpd.mk | 2 +-
package/proxychains-ng/proxychains-ng.mk | 2 +-
package/pru-software-support/pru-software-support.mk | 2 +-
package/psmisc/psmisc.mk | 2 +-
package/psplash/psplash.mk | 2 +-
package/pwgen/pwgen.mk | 2 +-
package/python-dicttoxml/python-dicttoxml.mk | 2 +-
package/python-id3/python-id3.mk | 2 +-
package/python-mad/python-mad.mk | 2 +-
package/python-mutagen/python-mutagen.mk | 2 +-
package/python-pylru/python-pylru.mk | 2 +-
package/python-pyparted/python-pyparted.mk | 2 +-
package/python-pyqt/python-pyqt.mk | 2 +-
package/python-pyroute2/python-pyroute2.mk | 2 +-
package/python-scapy3k/python-scapy3k.mk | 2 +-
package/python-sip/python-sip.mk | 2 +-
package/python-smbus-cffi/python-smbus-cffi.mk | 2 +-
package/python-spidev/python-spidev.mk | 2 +-
package/qemu/qemu.mk | 2 +-
package/qt5/qt53d/qt53d.mk | 2 +-
package/qt5/qt5base/qt5base.mk | 2 +-
package/qt5/qt5canvas3d/qt5canvas3d.mk | 2 +-
package/qt5/qt5connectivity/qt5connectivity.mk | 4 ++--
package/qt5/qt5declarative/qt5declarative.mk | 2 +-
package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 ++--
package/qt5/qt5imageformats/qt5imageformats.mk | 4 ++--
package/qt5/qt5location/qt5location.mk | 4 ++--
package/qt5/qt5multimedia/qt5multimedia.mk | 2 +-
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +-
package/qt5/qt5sensors/qt5sensors.mk | 4 ++--
package/qt5/qt5serialbus/qt5serialbus.mk | 2 +-
package/qt5/qt5serialport/qt5serialport.mk | 4 ++--
package/qt5/qt5svg/qt5svg.mk | 2 +-
package/qt5/qt5tools/qt5tools.mk | 2 +-
package/qt5/qt5webchannel/qt5webchannel.mk | 4 ++--
package/qt5/qt5websockets/qt5websockets.mk | 2 +-
| 4 ++--
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +-
package/quagga/quagga.mk | 2 +-
package/quota/quota.mk | 2 +-
package/racehound/racehound.mk | 2 +-
package/raptor/raptor.mk | 2 +-
package/rng-tools/rng-tools.mk | 2 +-
package/rp-pppoe/rp-pppoe.mk | 2 +-
package/rpm/rpm.mk | 2 +-
package/rrdtool/rrdtool.mk | 2 +-
package/rsh-redone/rsh-redone.mk | 2 +-
package/rt-tests/rt-tests.mk | 2 +-
package/rtl8188eu/rtl8188eu.mk | 2 +-
package/rtl8723bs/rtl8723bs.mk | 2 +-
package/rtl8821au/rtl8821au.mk | 2 +-
package/rtorrent/rtorrent.mk | 2 +-
package/sane-backends/sane-backends.mk | 2 +-
package/sbc/sbc.mk | 2 +-
package/sconeserver/sconeserver.mk | 2 +-
package/scrub/scrub.mk | 2 +-
package/sepolgen/sepolgen.mk | 2 +-
package/ser2net/ser2net.mk | 2 +-
package/setools/setools.mk | 2 +-
package/setserial/setserial.mk | 2 +-
package/sg3_utils/sg3_utils.mk | 2 +-
package/shared-mime-info/shared-mime-info.mk | 2 +-
package/shellinabox/shellinabox.mk | 2 +-
package/simicsfs/simicsfs.mk | 2 +-
package/sispmctl/sispmctl.mk | 2 +-
package/slang/slang.mk | 2 +-
package/smartmontools/smartmontools.mk | 2 +-
package/smcroute/smcroute.mk | 2 +-
package/smstools3/smstools3.mk | 2 +-
package/socat/socat.mk | 2 +-
package/socketcand/socketcand.mk | 2 +-
package/softether/softether.mk | 2 +-
package/sox/sox.mk | 2 +-
| 2 +-
package/spi-tools/spi-tools.mk | 2 +-
package/spidev_test/spidev_test.mk | 2 +-
package/squashfs/squashfs.mk | 2 +-
package/squid/squid.mk | 2 +-
package/sredird/sredird.mk | 2 +-
package/sshfs/sshfs.mk | 2 +-
package/sshpass/sshpass.mk | 2 +-
package/sslh/sslh.mk | 2 +-
package/start-stop-daemon/start-stop-daemon.mk | 2 +-
package/statserial/statserial.mk | 2 +-
package/stella/stella.mk | 2 +-
package/stm32flash/stm32flash.mk | 2 +-
package/stress-ng/stress-ng.mk | 2 +-
package/stress/stress.mk | 2 +-
package/strongswan/strongswan.mk | 2 +-
package/stunnel/stunnel.mk | 2 +-
package/sunxi-tools/sunxi-tools.mk | 2 +-
package/swupdate/swupdate.mk | 2 +-
package/sylpheed/sylpheed.mk | 2 +-
package/synergy/synergy.mk | 2 +-
package/sysdig/sysdig.mk | 2 +-
package/sysklogd/sysklogd.mk | 2 +-
package/syslog-ng/syslog-ng.mk | 2 +-
package/sysprof/sysprof.mk | 2 +-
package/sysstat/sysstat.mk | 2 +-
package/systemd/systemd.mk | 2 +-
package/sysvinit/sysvinit.mk | 2 +-
package/ti-sgx-km/ti-sgx-km.mk | 2 +-
package/ti-uim/ti-uim.mk | 2 +-
package/time/time.mk | 2 +-
package/tinc/tinc.mk | 2 +-
package/tovid/tovid.mk | 2 +-
package/trace-cmd/trace-cmd.mk | 2 +-
package/transmission/transmission.mk | 2 +-
package/tree/tree.mk | 2 +-
package/trinity/trinity.mk | 2 +-
package/tunctl/tunctl.mk | 2 +-
package/uboot-tools/uboot-tools.mk | 2 +-
package/uccp420wlan/uccp420wlan.mk | 2 +-
package/ucl/ucl.mk | 2 +-
package/udisks/udisks.mk | 2 +-
package/udpcast/udpcast.mk | 2 +-
package/ulogd/ulogd.mk | 2 +-
package/unixodbc/unixodbc.mk | 2 +-
package/unscd/unscd.mk | 2 +-
package/upmpdcli/upmpdcli.mk | 2 +-
package/upower/upower.mk | 2 +-
package/upx/upx.mk | 2 +-
package/usb_modeswitch/usb_modeswitch.mk | 2 +-
package/usb_modeswitch_data/usb_modeswitch_data.mk | 2 +-
package/usbredir/usbredir.mk | 2 +-
package/usbutils/usbutils.mk | 2 +-
package/ushare/ushare.mk | 2 +-
package/ussp-push/ussp-push.mk | 2 +-
package/util-linux/util-linux.mk | 2 +-
package/v4l2grab/v4l2grab.mk | 2 +-
package/valgrind/valgrind.mk | 2 +-
package/vde2/vde2.mk | 2 +-
package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk | 2 +-
package/vdr/vdr.mk | 2 +-
package/vlc/vlc.mk | 2 +-
package/vnstat/vnstat.mk | 2 +-
package/vorbis-tools/vorbis-tools.mk | 2 +-
package/vpnc/vpnc.mk | 2 +-
package/vsftpd/vsftpd.mk | 2 +-
package/vtun/vtun.mk | 2 +-
package/w_scan/w_scan.mk | 2 +-
package/whois/whois.mk | 2 +-
package/wipe/wipe.mk | 2 +-
package/wireless_tools/wireless_tools.mk | 2 +-
package/wmctrl/wmctrl.mk | 2 +-
package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk | 2 +-
package/x11vnc/x11vnc.mk | 2 +-
package/x264/x264.mk | 2 +-
package/x265/x265.mk | 2 +-
package/xen/xen.mk | 2 +-
package/xenomai/xenomai.mk | 2 +-
package/xl2tp/xl2tp.mk | 2 +-
package/xscreensaver/xscreensaver.mk | 2 +-
package/xtables-addons/xtables-addons.mk | 2 +-
package/xvisor/xvisor.mk | 2 +-
package/xvkbd/xvkbd.mk | 2 +-
package/xxhash/xxhash.mk | 2 +-
package/xz/xz.mk | 2 +-
package/yaffs2utils/yaffs2utils.mk | 2 +-
package/yasm/yasm.mk | 2 +-
package/yavta/yavta.mk | 2 +-
package/ympd/ympd.mk | 2 +-
package/zd1211-firmware/zd1211-firmware.mk | 2 +-
638 files changed, 649 insertions(+), 649 deletions(-)
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index 7a110d2..3ae349a 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -36,7 +36,7 @@ endif
endif
$(1)_DEPENDENCIES = host-lzop
-$(1)_LICENSE = GPLv2 with exceptions
+$(1)_LICENSE = GPL-2.0 with exceptions
$(1)_LICENSE_FILES = COPYING
$(1)_CUSTOM_EMBEDDED_ENV_PATH = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_EMBEDDED_ENV_PATH))
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index ae687d6..21f4462 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -9,7 +9,7 @@ GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
GRUB_PATCH = grub_$(GRUB_VERSION)-68.diff.gz
GRUB_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/g/grub
-GRUB_LICENSE = GPLv2+
+GRUB_LICENSE = GPL-2.0+
GRUB_LICENSE_FILES = COPYING
# Passing -O0 since the default -O2 passed by Buildroot generates
diff --git a/boot/mxs-bootlets/mxs-bootlets.mk b/boot/mxs-bootlets/mxs-bootlets.mk
index 17af6dc..1955a37 100644
--- a/boot/mxs-bootlets/mxs-bootlets.mk
+++ b/boot/mxs-bootlets/mxs-bootlets.mk
@@ -35,7 +35,7 @@ MXS_BOOTLETS_ELFTOSB_OPTIONS += -f imx28
endif
MXS_BOOTLETS_DEPENDENCIES = host-elftosb
-MXS_BOOTLETS_LICENSE = GPLv2+
+MXS_BOOTLETS_LICENSE = GPL-2.0+
ifeq ($(BR2_TARGET_MXS_BOOTLETS_BAREBOX),y)
MXS_BOOTLETS_DEPENDENCIES += barebox
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index 82890c5..5b7906c 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -8,7 +8,7 @@ SYSLINUX_VERSION = 6.03
SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
-SYSLINUX_LICENSE = GPLv2+
+SYSLINUX_LICENSE = GPL-2.0+
SYSLINUX_LICENSE_FILES = COPYING
SYSLINUX_INSTALL_IMAGES = YES
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 1e22eaa..aac692c 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -7,7 +7,7 @@
UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
-UBOOT_LICENSE = GPLv2+
+UBOOT_LICENSE = GPL-2.0+
UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt
UBOOT_INSTALL_IMAGES = YES
diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
index c68dc81..7e0b286 100644
--- a/boot/xloader/xloader.mk
+++ b/boot/xloader/xloader.mk
@@ -8,7 +8,7 @@ XLOADER_VERSION = 6f3a26101303051e0f91b6213735b68ce804e94e
XLOADER_SITE = git://gitorious.org/x-loader/x-loader.git
XLOADER_BOARD_NAME = $(call qstrip,$(BR2_TARGET_XLOADER_BOARDNAME))
-XLOADER_LICENSE = GPLv2+
+XLOADER_LICENSE = GPL-2.0+
XLOADER_LICENSE_FILES = README
XLOADER_INSTALL_IMAGES = YES
diff --git a/linux/linux.mk b/linux/linux.mk
index d160d28..f68a3ff 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -5,7 +5,7 @@
################################################################################
LINUX_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
-LINUX_LICENSE = GPLv2
+LINUX_LICENSE = GPL-2.0
LINUX_LICENSE_FILES = COPYING
define LINUX_HELP_CMDS
diff --git a/package/acl/acl.mk b/package/acl/acl.mk
index e1462b6..93e20c3 100644
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -10,7 +10,7 @@ ACL_SITE = http://download.savannah.gnu.org/releases/acl
ACL_INSTALL_STAGING = YES
ACL_DEPENDENCIES = attr
ACL_CONF_OPTS = --enable-gettext=no
-ACL_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
+ACL_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (libraries)
ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
# While the configuration system uses autoconf, the Makefiles are
diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk
index f76c948..18870c2 100644
--- a/package/acpica/acpica.mk
+++ b/package/acpica/acpica.mk
@@ -7,7 +7,7 @@
ACPICA_VERSION = 20161117
ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz
ACPICA_SITE = https://acpica.org/sites/acpica/files
-ACPICA_LICENSE = BSD-3c or GPLv2
+ACPICA_LICENSE = BSD-3c or GPL-2.0
ACPICA_LICENSE_FILES = source/include/acpi.h
ACPICA_DEPENDENCIES = host-bison host-flex
diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk
index f561b90..2141a1a 100644
--- a/package/acpid/acpid.mk
+++ b/package/acpid/acpid.mk
@@ -7,7 +7,7 @@
ACPID_VERSION = 2.0.28
ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz
ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
-ACPID_LICENSE = GPLv2+
+ACPID_LICENSE = GPL-2.0+
ACPID_LICENSE_FILES = COPYING
define ACPID_INSTALL_INIT_SYSV
diff --git a/package/acpitool/acpitool.mk b/package/acpitool/acpitool.mk
index f663fbb..547da37 100644
--- a/package/acpitool/acpitool.mk
+++ b/package/acpitool/acpitool.mk
@@ -7,7 +7,7 @@
ACPITOOL_VERSION = 0.5.1
ACPITOOL_SOURCE = acpitool-$(ACPITOOL_VERSION).tar.bz2
ACPITOOL_SITE = http://downloads.sourceforge.net/sourceforge/acpitool
-ACPITOOL_LICENSE = GPLv2+
+ACPITOOL_LICENSE = GPL-2.0+
ACPITOOL_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/aer-inject/aer-inject.mk b/package/aer-inject/aer-inject.mk
index e00570e..72495bb 100644
--- a/package/aer-inject/aer-inject.mk
+++ b/package/aer-inject/aer-inject.mk
@@ -6,7 +6,7 @@
AER_INJECT_VERSION = 9bd5e2c7886fca72f139cd8402488a2235957d41
AER_INJECT_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git
-AER_INJECT_LICENSE = GPLv2
+AER_INJECT_LICENSE = GPL-2.0
AER_INJECT_LICENSE_FILES = README
AER_INJECT_DEPENDENCIES = host-flex host-bison
diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk
index 7e5464d..8cf1f47 100644
--- a/package/aircrack-ng/aircrack-ng.mk
+++ b/package/aircrack-ng/aircrack-ng.mk
@@ -6,7 +6,7 @@
AIRCRACK_NG_VERSION = 1.2-rc1
AIRCRACK_NG_SITE = http://download.aircrack-ng.org
-AIRCRACK_NG_LICENSE = GPLv2+
+AIRCRACK_NG_LICENSE = GPL-2.0+
AIRCRACK_NG_LICENSE_FILES = LICENSE
AIRCRACK_NG_DEPENDENCIES = openssl zlib host-pkgconf
# Enable buddy-ng, easside-ng, tkiptun-ng, wesside-ng
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 5957568..8f421a0 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -7,7 +7,7 @@
ALSA_LIB_VERSION = 1.1.3
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
-ALSA_LIB_LICENSE = LGPLv2.1+ (library), GPLv2+ (aserver)
+ALSA_LIB_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (aserver)
ALSA_LIB_LICENSE_FILES = COPYING aserver/COPYING
ALSA_LIB_INSTALL_STAGING = YES
ALSA_LIB_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk
index a72191e..847a97f 100644
--- a/package/alsa-utils/alsa-utils.mk
+++ b/package/alsa-utils/alsa-utils.mk
@@ -7,7 +7,7 @@
ALSA_UTILS_VERSION = 1.1.3
ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
-ALSA_UTILS_LICENSE = GPLv2
+ALSA_UTILS_LICENSE = GPL-2.0
ALSA_UTILS_LICENSE_FILES = COPYING
ALSA_UTILS_INSTALL_STAGING = YES
ALSA_UTILS_DEPENDENCIES = host-gettext host-pkgconf alsa-lib \
diff --git a/package/alsamixergui/alsamixergui.mk b/package/alsamixergui/alsamixergui.mk
index 0d37c8c..24e2497 100644
--- a/package/alsamixergui/alsamixergui.mk
+++ b/package/alsamixergui/alsamixergui.mk
@@ -7,7 +7,7 @@
ALSAMIXERGUI_VERSION = 0.9.0rc2-1
ALSAMIXERGUI_SOURCE = alsamixergui_$(ALSAMIXERGUI_VERSION).orig.tar.gz
ALSAMIXERGUI_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/alsamixergui
-ALSAMIXERGUI_LICENSE = GPLv2+
+ALSAMIXERGUI_LICENSE = GPL-2.0+
ALSAMIXERGUI_LICENSE_FILES = debian/copyright
ALSAMIXERGUI_AUTORECONF = YES
diff --git a/package/argus/argus.mk b/package/argus/argus.mk
index bd1c559..941f439 100644
--- a/package/argus/argus.mk
+++ b/package/argus/argus.mk
@@ -9,7 +9,7 @@ ARGUS_SITE = http://qosient.com/argus/src
ARGUS_DEPENDENCIES = libpcap
ARGUS_CONF_ENV = arg_cv_sys_errlist=yes
# Code is really v2+ though COPYING is v3 so ship README to avoid confusion
-ARGUS_LICENSE = GPLv2+
+ARGUS_LICENSE = GPL-2.0+
ARGUS_LICENSE_FILES = README
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
diff --git a/package/arptables/arptables.mk b/package/arptables/arptables.mk
index 888d396..257b636 100644
--- a/package/arptables/arptables.mk
+++ b/package/arptables/arptables.mk
@@ -7,7 +7,7 @@
ARPTABLES_VERSION = 0.0.4
ARPTABLES_SOURCE = arptables-v$(ARPTABLES_VERSION).tar.gz
ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arptables-v$(ARPTABLES_VERSION)
-ARPTABLES_LICENSE = GPLv2+
+ARPTABLES_LICENSE = GPL-2.0+
define ARPTABLES_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
diff --git a/package/at/at.mk b/package/at/at.mk
index 8865360..db38aa7 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -11,7 +11,7 @@ AT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a
AT_MAKE = $(MAKE1)
AT_AUTORECONF = YES
AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex
-AT_LICENSE = GPLv2+, GPLv3+, ISC
+AT_LICENSE = GPL-2.0+, GPLv3+, ISC
AT_LICENSE_FILES = Copyright COPYING
AT_CONF_OPTS = \
diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk
index 615b6ea..e1c257c 100644
--- a/package/atftp/atftp.mk
+++ b/package/atftp/atftp.mk
@@ -6,7 +6,7 @@
ATFTP_VERSION = 0.7.1
ATFTP_SITE = http://sourceforge.net/projects/atftp/files
-ATFTP_LICENSE = GPLv2+
+ATFTP_LICENSE = GPL-2.0+
ATFTP_LICENSE_FILES = LICENSE
ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp
# For static we need to explicitly link against libpthread
diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk
index 2c070f2..0f98ee0 100644
--- a/package/atkmm/atkmm.mk
+++ b/package/atkmm/atkmm.mk
@@ -8,7 +8,7 @@ ATKMM_VERSION_MAJOR = 2.24
ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).2
ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz
ATKMM_SITE = http://ftp.gnome.org/pub/gnome/sources/atkmm/$(ATKMM_VERSION_MAJOR)
-ATKMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
+ATKMM_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (tools)
ATKMM_LICENSE_FILES = COPYING COPYING.tools
ATKMM_INSTALL_STAGING = YES
ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf
diff --git a/package/atop/atop.mk b/package/atop/atop.mk
index 27e1f82..f089382 100644
--- a/package/atop/atop.mk
+++ b/package/atop/atop.mk
@@ -6,7 +6,7 @@
ATOP_VERSION = 2.2-3
ATOP_SITE = http://www.atoptool.nl/download
-ATOP_LICENSE = GPLv2+
+ATOP_LICENSE = GPL-2.0+
ATOP_LICENSE_FILES = COPYING
ATOP_DEPENDENCIES = ncurses zlib
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
index 4d5a07d..24222b5 100644
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -10,7 +10,7 @@ ATTR_SITE = http://download.savannah.gnu.org/releases/attr
ATTR_INSTALL_STAGING = YES
ATTR_CONF_OPTS = --enable-gettext=no
HOST_ATTR_CONF_OPTS = --enable-gettext=no
-ATTR_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
+ATTR_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (libraries)
ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
# While the configuration system uses autoconf, the Makefiles are
diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
index ee3f833..74550a3 100644
--- a/package/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
@@ -12,7 +12,7 @@ AUDIOFILE_CONF_OPTS = --disable-examples
AUDIOFILE_DEPENDENCIES = host-pkgconf
# configure is outdated and has old bugs because of it
AUDIOFILE_AUTORECONF = YES
-AUDIOFILE_LICENSE = GPLv2+, LGPLv2.1+
+AUDIOFILE_LICENSE = GPL-2.0+, LGPLv2.1+
AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL
ifeq ($(BR2_PACKAGE_FLAC),y)
diff --git a/package/audit/audit.mk b/package/audit/audit.mk
index 298ef20..b94d0bf 100644
--- a/package/audit/audit.mk
+++ b/package/audit/audit.mk
@@ -6,7 +6,7 @@
AUDIT_VERSION = 2.7.1
AUDIT_SITE = http://people.redhat.com/sgrubb/audit
-AUDIT_LICENSE = GPLv2+ (programs), unclear (libraries)
+AUDIT_LICENSE = GPL-2.0+ (programs), unclear (libraries)
AUDIT_LICENSE_FILES = COPYING
AUDIT_INSTALL_STAGING = YES
diff --git a/package/aufs-util/aufs-util.mk b/package/aufs-util/aufs-util.mk
index d41b4ac..d954f02 100644
--- a/package/aufs-util/aufs-util.mk
+++ b/package/aufs-util/aufs-util.mk
@@ -8,7 +8,7 @@
AUFS_UTIL_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_UTIL_VERSION))
AUFS_UTIL_SITE = http://git.code.sf.net/p/aufs/aufs-util
AUFS_UTIL_SITE_METHOD = git
-AUFS_UTIL_LICENSE = GPLv2
+AUFS_UTIL_LICENSE = GPL-2.0
AUFS_UTIL_LICENSE_FILES = COPYING
AUFS_UTIL_DEPENDENCIES = linux
diff --git a/package/aufs/aufs.mk b/package/aufs/aufs.mk
index 1ba5508..55dbf94 100644
--- a/package/aufs/aufs.mk
+++ b/package/aufs/aufs.mk
@@ -5,7 +5,7 @@
################################################################################
AUFS_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_VERSION))
-AUFS_LICENSE = GPLv2
+AUFS_LICENSE = GPL-2.0
AUFS_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_AUFS_SERIES),3)
diff --git a/package/aumix/aumix.mk b/package/aumix/aumix.mk
index eae34d0..9bcc19a 100644
--- a/package/aumix/aumix.mk
+++ b/package/aumix/aumix.mk
@@ -9,7 +9,7 @@ AUMIX_SOURCE = aumix-$(AUMIX_VERSION).tar.bz2
AUMIX_SITE = http://jpj.net/~trevor/aumix/releases
AUMIX_AUTORECONF = YES
AUMIX_GETTEXTIZE = YES
-AUMIX_LICENSE = GPLv2+
+AUMIX_LICENSE = GPL-2.0+
AUMIX_LICENSE_FILES = COPYING
AUMIX_CONF_OPTS = \
diff --git a/package/autofs/autofs.mk b/package/autofs/autofs.mk
index 23e6836..f20a19a 100644
--- a/package/autofs/autofs.mk
+++ b/package/autofs/autofs.mk
@@ -7,7 +7,7 @@
AUTOFS_VERSION = 5.1.2
AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz
AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5
-AUTOFS_LICENSE = GPLv2+
+AUTOFS_LICENSE = GPL-2.0+
AUTOFS_LICENSE_FILES = COPYING COPYRIGHT
AUTOFS_DEPENDENCIES = host-flex host-bison
# For 0002-autofs-configure-check-for-clock_gettime-in-librt.patch and
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 84f05dc..e62038c 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -7,7 +7,7 @@
AUTOMAKE_VERSION = 1.15
AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz
AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
-AUTOMAKE_LICENSE = GPLv2+
+AUTOMAKE_LICENSE = GPL-2.0+
AUTOMAKE_LICENSE_FILES = COPYING
HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk
index 27a74de..f914ed7 100644
--- a/package/avrdude/avrdude.mk
+++ b/package/avrdude/avrdude.mk
@@ -6,7 +6,7 @@
AVRDUDE_VERSION = ad04c429a90f4c34f000ea4ae11db2705915a31f
AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION))
-AVRDUDE_LICENSE = GPLv2+
+AVRDUDE_LICENSE = GPL-2.0+
AVRDUDE_LICENSE_FILES = avrdude/COPYING
AVRDUDE_SUBDIR = avrdude
# Sources coming from git, without generated configure and Makefile.in
@@ -14,7 +14,7 @@ AVRDUDE_SUBDIR = avrdude
AVRDUDE_AUTORECONF = YES
AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \
host-flex host-bison
-AVRDUDE_LICENSE = GPLv2+
+AVRDUDE_LICENSE = GPL-2.0+
AVRDUDE_LICENSE_FILES = avrdude/COPYING
ifeq ($(BR2_PACKAGE_LIBFTDI1),y)
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index 6cf0fa8..e89a946 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -6,7 +6,7 @@
AXEL_VERSION = 2.4
AXEL_SITE = http://sources.buildroot.net
-AXEL_LICENSE = GPLv2+
+AXEL_LICENSE = GPL-2.0+
AXEL_LICENSE_FILES = COPYING
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
diff --git a/package/axfsutils/axfsutils.mk b/package/axfsutils/axfsutils.mk
index 1bd6280..e1f7427 100644
--- a/package/axfsutils/axfsutils.mk
+++ b/package/axfsutils/axfsutils.mk
@@ -6,7 +6,7 @@
AXFSUTILS_VERSION = 64886703fdff6cfc64eb20fbe7d7295bbeec867b
AXFSUTILS_SITE = $(call github,jaredeh,axfs,$(AXFSUTILS_VERSION))
-AXFSUTILS_LICENSE = GPLv2
+AXFSUTILS_LICENSE = GPL-2.0
AXFSUTILS_LICENSE_FILES = mkfs.axfs-legacy/COPYING
HOST_AXFSUTILS_DEPENDENCIES = host-zlib
diff --git a/package/batctl/batctl.mk b/package/batctl/batctl.mk
index ed1b06c..73d4598 100644
--- a/package/batctl/batctl.mk
+++ b/package/batctl/batctl.mk
@@ -6,7 +6,7 @@
BATCTL_VERSION = 2016.1
BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION)
-BATCTL_LICENSE = GPLv2
+BATCTL_LICENSE = GPL-2.0
BATCTL_DEPENDENCIES = libnl host-pkgconf
define BATCTL_BUILD_CMDS
diff --git a/package/batman-adv/batman-adv.mk b/package/batman-adv/batman-adv.mk
index 256781f..ead2cca 100644
--- a/package/batman-adv/batman-adv.mk
+++ b/package/batman-adv/batman-adv.mk
@@ -6,7 +6,7 @@
BATMAN_ADV_VERSION = 2016.1
BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv
-BATMAN_ADV_LICENSE = GPLv2
+BATMAN_ADV_LICENSE = GPL-2.0
# Bridge Loop Avoidance, Distributed Arp Table are always enabled
BATMAN_ADV_CFLAGS = \
diff --git a/package/bc/bc.mk b/package/bc/bc.mk
index 8f3e08d..3193ffa 100644
--- a/package/bc/bc.mk
+++ b/package/bc/bc.mk
@@ -8,7 +8,7 @@ BC_VERSION = 1.06.95
BC_SOURCE = bc-$(BC_VERSION).tar.bz2
BC_SITE = http://alpha.gnu.org/gnu/bc
BC_DEPENDENCIES = host-flex
-BC_LICENSE = GPLv2+, LGPLv2.1+
+BC_LICENSE = GPL-2.0+, LGPLv2.1+
BC_LICENSE_FILES = COPYING COPYING.LIB
# Build after busybox so target ends up with bc's "dc" version
diff --git a/package/bcache-tools/bcache-tools.mk b/package/bcache-tools/bcache-tools.mk
index 09604f6..0e7a282 100644
--- a/package/bcache-tools/bcache-tools.mk
+++ b/package/bcache-tools/bcache-tools.mk
@@ -6,7 +6,7 @@
BCACHE_TOOLS_VERSION = v1.0.8
BCACHE_TOOLS_SITE = $(call github,g2p,bcache-tools,$(BCACHE_TOOLS_VERSION))
-BCACHE_TOOLS_LICENSE = GPLv2
+BCACHE_TOOLS_LICENSE = GPL-2.0
BCACHE_TOOLS_LICENSE_FILES = COPYING
BCACHE_TOOLS_DEPENDENCIES = host-pkgconf util-linux
diff --git a/package/bcm2835/bcm2835.mk b/package/bcm2835/bcm2835.mk
index c111a0a..e24c819 100644
--- a/package/bcm2835/bcm2835.mk
+++ b/package/bcm2835/bcm2835.mk
@@ -6,7 +6,7 @@
BCM2835_VERSION = 1.48
BCM2835_SITE = http://www.airspayce.com/mikem/bcm2835
-BCM2835_LICENSE = GPLv2
+BCM2835_LICENSE = GPL-2.0
BCM2835_LICENSE_FILES = COPYING
BCM2835_INSTALL_STAGING = YES
diff --git a/package/bctoolbox/bctoolbox.mk b/package/bctoolbox/bctoolbox.mk
index f972ab6..281a0bf 100644
--- a/package/bctoolbox/bctoolbox.mk
+++ b/package/bctoolbox/bctoolbox.mk
@@ -6,7 +6,7 @@
BCTOOLBOX_VERSION = 0.4.0
BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION))
-BCTOOLBOX_LICENSE = GPLv2+
+BCTOOLBOX_LICENSE = GPL-2.0+
BCTOOLBOX_LICENSE_FILES = COPYING
BCTOOLBOX_INSTALL_STAGING = YES
diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk
index 697b5ce..12f41ea 100644
--- a/package/bcusdk/bcusdk.mk
+++ b/package/bcusdk/bcusdk.mk
@@ -7,7 +7,7 @@
BCUSDK_VERSION = 0.0.5
BCUSDK_SOURCE = bcusdk_$(BCUSDK_VERSION).tar.gz
BCUSDK_SITE = http://www.auto.tuwien.ac.at/~mkoegler/eib
-BCUSDK_LICENSE = GPLv2+
+BCUSDK_LICENSE = GPL-2.0+
BCUSDK_LICENSE_FILES = COPYING
BCUSDK_INSTALL_STAGING = YES
BCUSDK_CONF_OPTS = \
diff --git a/package/blktrace/blktrace.mk b/package/blktrace/blktrace.mk
index de583cf..bc29c25 100644
--- a/package/blktrace/blktrace.mk
+++ b/package/blktrace/blktrace.mk
@@ -7,7 +7,7 @@
BLKTRACE_VERSION = 1.1.0
BLKTRACE_SITE = http://brick.kernel.dk/snaps
BLKTRACE_DEPENDENCIES = libaio
-BLKTRACE_LICENSE = GPLv2+
+BLKTRACE_LICENSE = GPL-2.0+
BLKTRACE_LICENSE_FILES = COPYING
define BLKTRACE_BUILD_CMDS
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
index 63f29ab..a72899a 100644
--- a/package/bluez5_utils/bluez5_utils.mk
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -9,7 +9,7 @@ BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
BLUEZ5_UTILS_INSTALL_STAGING = YES
BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2
-BLUEZ5_UTILS_LICENSE = GPLv2+, LGPLv2.1+
+BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPLv2.1+
BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
BLUEZ5_UTILS_CONF_OPTS = \
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index 1c93f2e..2fa8f7f 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -11,7 +11,7 @@ BLUEZ_UTILS_INSTALL_STAGING = YES
BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools
BLUEZ_UTILS_AUTORECONF = YES
-BLUEZ_UTILS_LICENSE = GPLv2+, LGPLv2.1+
+BLUEZ_UTILS_LICENSE = GPL-2.0+, LGPLv2.1+
BLUEZ_UTILS_LICENSE_FILES = COPYING COPYING.LIB
# BlueZ 3.x compatibility
diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index ab23d90..d8bcaa1 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -6,7 +6,7 @@
BOA_VERSION = 0.94.14rc21
BOA_SITE = http://www.boa.org
-BOA_LICENSE = GPLv2+
+BOA_LICENSE = GPL-2.0+
BOA_LICENSE_FILES = COPYING
define BOA_INSTALL_TARGET_CMDS
diff --git a/package/bonnie/bonnie.mk b/package/bonnie/bonnie.mk
index 787d180..e5c8640 100644
--- a/package/bonnie/bonnie.mk
+++ b/package/bonnie/bonnie.mk
@@ -7,7 +7,7 @@
BONNIE_VERSION = 1.03e
BONNIE_SOURCE = bonnie++-$(BONNIE_VERSION).tgz
BONNIE_SITE = http://www.coker.com.au/bonnie++
-BONNIE_LICENSE = GPLv2
+BONNIE_LICENSE = GPL-2.0
BONNIE_LICENSE_FILES = copyright.txt
define BONNIE_INSTALL_TARGET_CMDS
diff --git a/package/bootutils/bootutils.mk b/package/bootutils/bootutils.mk
index eb3cb4f..bc4b3e8 100644
--- a/package/bootutils/bootutils.mk
+++ b/package/bootutils/bootutils.mk
@@ -7,7 +7,7 @@
BOOTUTILS_VERSION = 1.0.0
BOOTUTILS_SITE = http://downloads.sourceforge.net/project/bootutils/Stable/v$(BOOTUTILS_VERSION)
BOOTUTILS_CONF_OPTS = --prefix=/ --exec-prefix=/
-BOOTUTILS_LICENSE = GPLv2+
+BOOTUTILS_LICENSE = GPL-2.0+
BOOTUTILS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk
index efe57cd..7982025 100644
--- a/package/bridge-utils/bridge-utils.mk
+++ b/package/bridge-utils/bridge-utils.mk
@@ -9,7 +9,7 @@ BRIDGE_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/bridge-utils
BRIDGE_UTILS_SOURCE = bridge-utils-1.6.tar.xz
BRIDGE_UTILS_AUTORECONF = YES
BRIDGE_UTILS_CONF_OPTS = --with-linux-headers=$(LINUX_HEADERS_DIR)
-BRIDGE_UTILS_LICENSE = GPLv2+
+BRIDGE_UTILS_LICENSE = GPL-2.0+
BRIDGE_UTILS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk
index 852c614..1504303 100644
--- a/package/btrfs-progs/btrfs-progs.mk
+++ b/package/btrfs-progs/btrfs-progs.mk
@@ -9,7 +9,7 @@ BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs
BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz
BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib
BTRFS_PROGS_CONF_OPTS = --disable-backtrace
-BTRFS_PROGS_LICENSE = GPLv2
+BTRFS_PROGS_LICENSE = GPL-2.0
BTRFS_PROGS_LICENSE_FILES = COPYING
BTRFS_PROGS_INSTALL_STAGING = YES
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 577f2f2..f9dacc7 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -7,7 +7,7 @@
BUSYBOX_VERSION = 1.26.2
BUSYBOX_SITE = http://www.busybox.net/downloads
BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
-BUSYBOX_LICENSE = GPLv2
+BUSYBOX_LICENSE = GPL-2.0
BUSYBOX_LICENSE_FILES = LICENSE
define BUSYBOX_HELP_CMDS
diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk
index e285422..85ee689 100644
--- a/package/bwm-ng/bwm-ng.mk
+++ b/package/bwm-ng/bwm-ng.mk
@@ -7,7 +7,7 @@
BWM_NG_VERSION = 0.6.1
BWM_NG_SITE = http://www.gropp.org/bwm-ng
BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats
-BWM_NG_LICENSE = GPLv2
+BWM_NG_LICENSE = GPL-2.0
BWM_NG_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_NCURSES),y)
diff --git a/package/c-icap-modules/c-icap-modules.mk b/package/c-icap-modules/c-icap-modules.mk
index cf388aa..9daee58 100644
--- a/package/c-icap-modules/c-icap-modules.mk
+++ b/package/c-icap-modules/c-icap-modules.mk
@@ -7,7 +7,7 @@
C_ICAP_MODULES_VERSION = 0.4.2
C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz
C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap
-C_ICAP_MODULES_LICENSE = GPLv2+
+C_ICAP_MODULES_LICENSE = GPL-2.0+
C_ICAP_MODULES_LICENSE_FILES = COPYING
C_ICAP_MODULES_DEPENDENCIES = c-icap
diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk
index d077a19..fafc434 100644
--- a/package/ca-certificates/ca-certificates.mk
+++ b/package/ca-certificates/ca-certificates.mk
@@ -12,7 +12,7 @@ CA_CERTIFICATES_DEPENDENCIES = host-openssl
# but it must be at least python 2.7
CA_CERTIFICATES_DEPENDENCIES += \
$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
-CA_CERTIFICATES_LICENSE = GPLv2+ (script), MPLv2.0 (data)
+CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPLv2.0 (data)
CA_CERTIFICATES_LICENSE_FILES = debian/copyright
define CA_CERTIFICATES_BUILD_CMDS
diff --git a/package/cannelloni/cannelloni.mk b/package/cannelloni/cannelloni.mk
index fffdb4b..cc99c54 100644
--- a/package/cannelloni/cannelloni.mk
+++ b/package/cannelloni/cannelloni.mk
@@ -6,7 +6,7 @@
CANNELLONI_VERSION = 20160414
CANNELLONI_SITE = $(call github,mguentner,cannelloni,$(CANNELLONI_VERSION))
-CANNELLONI_LICENSE = GPLv2
+CANNELLONI_LICENSE = GPL-2.0
CANNELLONI_LICENSE_FILES = gpl-2.0.txt
ifeq ($(BR2_PACKAGE_LKSCTP_TOOLS),y)
diff --git a/package/cbootimage/cbootimage.mk b/package/cbootimage/cbootimage.mk
index 1b5672d..22a6e53 100644
--- a/package/cbootimage/cbootimage.mk
+++ b/package/cbootimage/cbootimage.mk
@@ -6,7 +6,7 @@
CBOOTIMAGE_VERSION = v1.7
CBOOTIMAGE_SITE = $(call github,NVIDIA,cbootimage,$(CBOOTIMAGE_VERSION))
-CBOOTIMAGE_LICENSE = GPLv2
+CBOOTIMAGE_LICENSE = GPL-2.0
CBOOTIMAGE_LICENSE_FILES = COPYING
CBOOTIMAGE_AUTORECONF = YES
diff --git a/package/cc-tool/cc-tool.mk b/package/cc-tool/cc-tool.mk
index d8df041..b9209ce 100644
--- a/package/cc-tool/cc-tool.mk
+++ b/package/cc-tool/cc-tool.mk
@@ -7,7 +7,7 @@
CC_TOOL_VERSION = 0.26
CC_TOOL_SITE = http://downloads.sourceforge.net/project/cctool
CC_TOOL_SOURCE = cc-tool-$(CC_TOOL_VERSION)-src.tgz
-CC_TOOL_LICENSE = GPLv2
+CC_TOOL_LICENSE = GPL-2.0
CC_TOOL_LICENSE_FILES = COPYING
CC_TOOL_DEPENDENCIES = boost libusb
diff --git a/package/ccrypt/ccrypt.mk b/package/ccrypt/ccrypt.mk
index 3beff40..d27e346 100644
--- a/package/ccrypt/ccrypt.mk
+++ b/package/ccrypt/ccrypt.mk
@@ -7,7 +7,7 @@
CCRYPT_VERSION = 1.10
CCRYPT_SITE = http://ccrypt.sourceforge.net/download
-CCRYPT_LICENSE = GPLv2+
+CCRYPT_LICENSE = GPL-2.0+
CCRYPT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
index 10d118c..f49d515 100644
--- a/package/cdrkit/cdrkit.mk
+++ b/package/cdrkit/cdrkit.mk
@@ -9,7 +9,7 @@ CDRKIT_SOURCE = cdrkit_$(CDRKIT_VERSION).orig.tar.gz
CDRKIT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit
CDRKIT_DEPENDENCIES = libcap bzip2 zlib
HOST_CDRKIT_DEPENDENCIES = host-libcap host-bzip2 host-zlib
-CDRKIT_LICENSE = GPLv2
+CDRKIT_LICENSE = GPL-2.0
CDRKIT_LICENSE_FILES = COPYING
ifeq ($(BR2_ENDIAN),"BIG")
diff --git a/package/checkpolicy/checkpolicy.mk b/package/checkpolicy/checkpolicy.mk
index 8328b39..774d006 100644
--- a/package/checkpolicy/checkpolicy.mk
+++ b/package/checkpolicy/checkpolicy.mk
@@ -6,7 +6,7 @@
CHECKPOLICY_VERSION = 2.6
CHECKPOLICY_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
-CHECKPOLICY_LICENSE = GPLv2
+CHECKPOLICY_LICENSE = GPL-2.0
CHECKPOLICY_LICENSE_FILES = COPYING
HOST_CHECKPOLICY_DEPENDENCIES = host-libselinux host-flex host-bison
diff --git a/package/chocolate-doom/chocolate-doom.mk b/package/chocolate-doom/chocolate-doom.mk
index 7283092..54121c4 100644
--- a/package/chocolate-doom/chocolate-doom.mk
+++ b/package/chocolate-doom/chocolate-doom.mk
@@ -6,7 +6,7 @@
CHOCOLATE_DOOM_VERSION = 2.3.0
CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION)
-CHOCOLATE_DOOM_LICENSE = GPLv2+
+CHOCOLATE_DOOM_LICENSE = GPL-2.0+
CHOCOLATE_DOOM_LICENSE_FILES = COPYING
CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl sdl_mixer sdl_net
diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk
index c3d48a7..3b10c8c 100644
--- a/package/chrony/chrony.mk
+++ b/package/chrony/chrony.mk
@@ -6,7 +6,7 @@
CHRONY_VERSION = 3.1
CHRONY_SITE = http://download.tuxfamily.org/chrony
-CHRONY_LICENSE = GPLv2
+CHRONY_LICENSE = GPL-2.0
CHRONY_LICENSE_FILES = COPYING
CHRONY_CONF_OPTS = \
diff --git a/package/clamav/clamav.mk b/package/clamav/clamav.mk
index 5d57b8d..23dee0a 100644
--- a/package/clamav/clamav.mk
+++ b/package/clamav/clamav.mk
@@ -6,7 +6,7 @@
CLAMAV_VERSION = 0.99.2
CLAMAV_SITE = https://www.clamav.net/downloads/production
-CLAMAV_LICENSE = GPLv2
+CLAMAV_LICENSE = GPL-2.0
CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.pcre COPYING.regex \
COPYING.unrar COPYING.zlib
diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk
index 47658c2..6bba694 100644
--- a/package/classpath/classpath.mk
+++ b/package/classpath/classpath.mk
@@ -18,7 +18,7 @@ CLASSPATH_CONF_OPTS = \
# don't support qt4 on X11
CLASSPATH_CONF_OPTS += --disable-qt-peer
CLASSPATH_DEPENDENCIES = host-pkgconf
-CLASSPATH_LICENSE = GPLv2+ with exception
+CLASSPATH_LICENSE = GPL-2.0+ with exception
CLASSPATH_LICENSE_FILES = COPYING
# Needs ALSA pcm and sequencer (midi) support
diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk
index caed3f4..6a6e790 100644
--- a/package/cloop/cloop.mk
+++ b/package/cloop/cloop.mk
@@ -7,7 +7,7 @@
CLOOP_VERSION = 2.634-1
CLOOP_SOURCE = cloop_$(CLOOP_VERSION).tar.gz
CLOOP_SITE = http://debian-knoppix.alioth.debian.org/packages/sources/cloop
-CLOOP_LICENSE = GPLv2 (module), GPLv2+ (advancecomp)
+CLOOP_LICENSE = GPL-2.0 (module), GPL-2.0+ (advancecomp)
CLOOP_LICENSE_FILES = README advancecomp-1.15/COPYING
HOST_CLOOP_DEPENDENCIES = host-zlib
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index 38354ac..a3f3063 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -9,7 +9,7 @@ COLLECTD_SITE = http://collectd.org/files
COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2
COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
COLLECTD_INSTALL_STAGING = YES
-COLLECTD_LICENSE = GPLv2, LGPLv2.1
+COLLECTD_LICENSE = GPL-2.0, LGPLv2.1
COLLECTD_LICENSE_FILES = COPYING
# These require unmet dependencies, are fringe, pointless or deprecated
diff --git a/package/connman-gtk/connman-gtk.mk b/package/connman-gtk/connman-gtk.mk
index 2c9c131..9888fcd 100644
--- a/package/connman-gtk/connman-gtk.mk
+++ b/package/connman-gtk/connman-gtk.mk
@@ -9,7 +9,7 @@ CONNMAN_GTK_SITE = https://github.com/jgke/connman-gtk/releases/download/v$(CONN
CONNMAN_GTK_SOURCE = connman-gtk-$(CONNMAN_GTK_VERSION).tar.bz2
CONNMAN_GTK_INSTALL_STAGING = YES
CONNMAN_GTK_DEPENDENCIES = host-intltool connman libglib2 libgtk3
-CONNMAN_GTK_LICENSE = GPLv2+
+CONNMAN_GTK_LICENSE = GPL-2.0+
CONNMAN_GTK_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index f7c9f23..5c9a05f 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -9,7 +9,7 @@ CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
CONNMAN_DEPENDENCIES = libglib2 dbus iptables
CONNMAN_INSTALL_STAGING = YES
-CONNMAN_LICENSE = GPLv2
+CONNMAN_LICENSE = GPL-2.0
CONNMAN_LICENSE_FILES = COPYING
CONNMAN_CONF_OPTS += \
--with-dbusconfdir=/etc \
diff --git a/package/conntrack-tools/conntrack-tools.mk b/package/conntrack-tools/conntrack-tools.mk
index b73aa7f..2f4ea5f 100644
--- a/package/conntrack-tools/conntrack-tools.mk
+++ b/package/conntrack-tools/conntrack-tools.mk
@@ -10,7 +10,7 @@ CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout \
libnetfilter_queue host-bison host-flex
-CONNTRACK_TOOLS_LICENSE = GPLv2+
+CONNTRACK_TOOLS_LICENSE = GPL-2.0+
CONNTRACK_TOOLS_LICENSE_FILES = COPYING
CONNTRACK_TOOLS_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/cpuload/cpuload.mk b/package/cpuload/cpuload.mk
index 30c3db6..e792952 100644
--- a/package/cpuload/cpuload.mk
+++ b/package/cpuload/cpuload.mk
@@ -6,7 +6,7 @@
CPULOAD_VERSION = v0.3
CPULOAD_SITE = $(call github,kelvincheung,cpuload,$(CPULOAD_VERSION))
-CPULOAD_LICENSE = GPLv2
+CPULOAD_LICENSE = GPL-2.0
CPULOAD_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
index 3cbe274..2391b24 100644
--- a/package/cramfs/cramfs.mk
+++ b/package/cramfs/cramfs.mk
@@ -6,7 +6,7 @@
CRAMFS_VERSION = 1.1
CRAMFS_SITE = http://downloads.sourceforge.net/project/cramfs/cramfs/$(CRAMFS_VERSION)
-CRAMFS_LICENSE = GPLv2+
+CRAMFS_LICENSE = GPL-2.0+
CRAMFS_LICENSE_FILES = COPYING
CRAMFS_DEPENDENCIES = zlib
diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk
index 8fe3232..c03f55c 100644
--- a/package/crudini/crudini.mk
+++ b/package/crudini/crudini.mk
@@ -7,7 +7,7 @@
CRUDINI_VERSION = 0.9
CRUDINI_SITE = https://pypi.python.org/packages/b5/65/5588903472f30fa01ca4951be00c03a317b27bac4cd1e945bd16b2c1b6d3
CRUDINI_SETUP_TYPE = setuptools
-CRUDINI_LICENSE = GPLv2
+CRUDINI_LICENSE = GPL-2.0
CRUDINI_LICENSE_FILES = COPYING
$(eval $(python-package))
diff --git a/package/cryptodev-linux/cryptodev-linux.mk b/package/cryptodev-linux/cryptodev-linux.mk
index 709c6ed..91802a7 100644
--- a/package/cryptodev-linux/cryptodev-linux.mk
+++ b/package/cryptodev-linux/cryptodev-linux.mk
@@ -7,7 +7,7 @@
CRYPTODEV_LINUX_VERSION = 2b29be8ac41414ed19cb4f5d5626d9bd0d7b11a8
CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,$(CRYPTODEV_LINUX_VERSION))
CRYPTODEV_LINUX_INSTALL_STAGING = YES
-CRYPTODEV_LINUX_LICENSE = GPLv2+
+CRYPTODEV_LINUX_LICENSE = GPL-2.0+
CRYPTODEV_LINUX_LICENSE_FILES = COPYING
CRYPTODEV_LINUX_PROVIDES = cryptodev
diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 8337bed..6791f6f 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -10,7 +10,7 @@ CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-CRYPTSETUP_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library)
+CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (library)
CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
CRYPTSETUP_INSTALL_STAGING = YES
diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
index 55fc95e..959e543 100644
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -6,7 +6,7 @@
CTORRENT_VERSION = dnh3.3.2
CTORRENT_SITE = http://www.rahul.net/dholmes/ctorrent
-CTORRENT_LICENSE = GPLv2
+CTORRENT_LICENSE = GPL-2.0
CTORRENT_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index d58c78d..4ffe6f7 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -7,7 +7,7 @@
CUPS_VERSION = 2.2.3
CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
-CUPS_LICENSE = GPLv2, LGPLv2
+CUPS_LICENSE = GPL-2.0, LGPLv2
CUPS_LICENSE_FILES = LICENSE.txt
CUPS_INSTALL_STAGING = YES
CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
diff --git a/package/curlftpfs/curlftpfs.mk b/package/curlftpfs/curlftpfs.mk
index 8ec3e4c..585dbf2 100644
--- a/package/curlftpfs/curlftpfs.mk
+++ b/package/curlftpfs/curlftpfs.mk
@@ -7,7 +7,7 @@
CURLFTPFS_VERSION = 0.9.2
CURLFTPFS_SITE = http://downloads.sourceforge.net/project/curlftpfs/curlftpfs/$(CURLFTPFS_VERSION)
CURLFTPFS_CONF_ENV = ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config
-CURLFTPFS_LICENSE = GPLv2
+CURLFTPFS_LICENSE = GPL-2.0
CURLFTPFS_LICENSE_FILES = COPYING
CURLFTPFS_DEPENDENCIES = \
libglib2 libfuse openssl libcurl \
diff --git a/package/cwiid/cwiid.mk b/package/cwiid/cwiid.mk
index 36450c1..c092e40 100644
--- a/package/cwiid/cwiid.mk
+++ b/package/cwiid/cwiid.mk
@@ -6,7 +6,7 @@
CWIID_VERSION = fadf11e89b579bcc0336a0692ac15c93785f3f82
CWIID_SITE = $(call github,abstrakraft,cwiid,$(CWIID_VERSION))
-CWIID_LICENSE = GPLv2+
+CWIID_LICENSE = GPL-2.0+
CWIID_LICENSE_FILES = COPYING
CWIID_AUTORECONF = YES
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 4f2b6ed..26db5a8 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -8,7 +8,7 @@ DASH_VERSION = 0.5.8
DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz
DASH_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/d/dash
DASH_PATCH = dash_$(DASH_VERSION)-1.diff.gz
-DASH_LICENSE = BSD-3c, GPLv2+ (mksignames.c)
+DASH_LICENSE = BSD-3c, GPL-2.0+ (mksignames.c)
DASH_LICENSE_FILES = COPYING
# 0002-fix-parallel-build.patch
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index 5a6f5a0..e14a095 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -7,7 +7,7 @@
DBUS_GLIB_VERSION = 0.108
DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib
DBUS_GLIB_INSTALL_STAGING = YES
-DBUS_GLIB_LICENSE = AFLv2.1 or GPLv2+
+DBUS_GLIB_LICENSE = AFLv2.1 or GPL-2.0+
DBUS_GLIB_LICENSE_FILES = COPYING
DBUS_GLIB_CONF_ENV = \
diff --git a/package/dbus-triggerd/dbus-triggerd.mk b/package/dbus-triggerd/dbus-triggerd.mk
index 0d693b4..7d73a6c 100644
--- a/package/dbus-triggerd/dbus-triggerd.mk
+++ b/package/dbus-triggerd/dbus-triggerd.mk
@@ -6,7 +6,7 @@
DBUS_TRIGGERD_VERSION = ba3dbec805cb707c94c54de21666bf18b79bcc09
DBUS_TRIGGERD_SITE = git://rg42.org/dbustriggerd.git
-DBUS_TRIGGERD_LICENSE = GPLv2+
+DBUS_TRIGGERD_LICENSE = GPL-2.0+
DBUS_TRIGGERD_LICENSE_FILES = dbus-triggerd.c
DBUS_TRIGGERD_DEPENDENCIES = host-pkgconf dbus
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 2d1583e..ee8ffe1 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -6,7 +6,7 @@
DBUS_VERSION = 1.10.16
DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
-DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools)
+DBUS_LICENSE = AFLv2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools)
DBUS_LICENSE_FILES = COPYING
DBUS_INSTALL_STAGING = YES
diff --git a/package/ddrescue/ddrescue.mk b/package/ddrescue/ddrescue.mk
index 4e244e6..9432e7a 100644
--- a/package/ddrescue/ddrescue.mk
+++ b/package/ddrescue/ddrescue.mk
@@ -7,7 +7,7 @@
DDRESCUE_VERSION = 1.22
DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz
DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue
-DDRESCUE_LICENSE = GPLv2+
+DDRESCUE_LICENSE = GPL-2.0+
DDRESCUE_LICENSE_FILES = COPYING
define DDRESCUE_CONFIGURE_CMDS
diff --git a/package/debianutils/debianutils.mk b/package/debianutils/debianutils.mk
index 83cf744..86f201d 100644
--- a/package/debianutils/debianutils.mk
+++ b/package/debianutils/debianutils.mk
@@ -10,7 +10,7 @@ DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20161118T033019Z/po
DEBIANUTILS_CONF_OPTS = --exec-prefix=/
# Make sure we override the busybox tools, such as which
DEBIANUTILS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-DEBIANUTILS_LICENSE = GPLv2+, SMAIL (savelog)
+DEBIANUTILS_LICENSE = GPL-2.0+, SMAIL (savelog)
DEBIANUTILS_LICENSE_FILES = debian/copyright
$(eval $(autotools-package))
diff --git a/package/devmem2/devmem2.mk b/package/devmem2/devmem2.mk
index 7f0594e..45d3c99 100644
--- a/package/devmem2/devmem2.mk
+++ b/package/devmem2/devmem2.mk
@@ -7,7 +7,7 @@
DEVMEM2_SITE = http://free-electrons.com/pub/mirror
DEVMEM2_SOURCE = devmem2.c
DEVMEM2_VERSION = 1
-DEVMEM2_LICENSE = GPLv2+
+DEVMEM2_LICENSE = GPL-2.0+
DEVMEM2_LICENSE_FILES = devmem2.c
define DEVMEM2_EXTRACT_CMDS
diff --git a/package/dfu-util/dfu-util.mk b/package/dfu-util/dfu-util.mk
index 079f875..c494485 100644
--- a/package/dfu-util/dfu-util.mk
+++ b/package/dfu-util/dfu-util.mk
@@ -6,7 +6,7 @@
DFU_UTIL_VERSION = 0.9
DFU_UTIL_SITE = http://dfu-util.sourceforge.net/releases
-DFU_UTIL_LICENSE = GPLv2+
+DFU_UTIL_LICENSE = GPL-2.0+
DFU_UTIL_LICENSE_FILES = COPYING
HOST_DFU_UTIL_DEPENDENCIES = host-libusb
diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk
index cd30aa7..b6c59db 100644
--- a/package/dmidecode/dmidecode.mk
+++ b/package/dmidecode/dmidecode.mk
@@ -7,7 +7,7 @@
DMIDECODE_VERSION = 3.0
DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz
DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
-DMIDECODE_LICENSE = GPLv2+
+DMIDECODE_LICENSE = GPL-2.0+
DMIDECODE_LICENSE_FILES = LICENSE
define DMIDECODE_BUILD_CMDS
diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
index fbb2387..0382cd4 100644
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -11,7 +11,7 @@ DMRAID_SUBDIR = $(DMRAID_VERSION)/dmraid
# lib and tools race with parallel make
DMRAID_MAKE = $(MAKE1)
DMRAID_INSTALL_STAGING = YES
-DMRAID_LICENSE = GPLv2
+DMRAID_LICENSE = GPL-2.0
DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE
DMRAID_DEPENDENCIES = lvm2
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index e8240b9..53a69d5 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -11,7 +11,7 @@ DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
DNSMASQ_DEPENDENCIES = host-pkgconf
-DNSMASQ_LICENSE = GPLv2 or GPLv3
+DNSMASQ_LICENSE = GPL-2.0 or GPLv3
DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index 9a9d26b..4a8c6fc 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -8,7 +8,7 @@ DOCKER_VERSION = 1.5
DOCKER_SITE = http://icculus.org/openbox/2/docker
DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11
-DOCKER_LICENSE = GPLv2+
+DOCKER_LICENSE = GPL-2.0+
# The 'or later' is specified at the end of the README, so include that one too.
DOCKER_LICENSE_FILES = COPYING README
diff --git a/package/doxygen/doxygen.mk b/package/doxygen/doxygen.mk
index cf7dfee..428747b 100644
--- a/package/doxygen/doxygen.mk
+++ b/package/doxygen/doxygen.mk
@@ -7,7 +7,7 @@
DOXYGEN_VERSION = 1.8.9.1
DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz
DOXYGEN_SITE = http://ftp.stack.nl/pub/users/dimitri
-DOXYGEN_LICENSE = GPLv2
+DOXYGEN_LICENSE = GPL-2.0
DOXYGEN_LICENSE_FILES = LICENSE
HOST_DOXYGEN_DEPENDENCIES = host-flex host-bison
diff --git a/package/drbd-utils/drbd-utils.mk b/package/drbd-utils/drbd-utils.mk
index eb6042d..f71a4ae 100644
--- a/package/drbd-utils/drbd-utils.mk
+++ b/package/drbd-utils/drbd-utils.mk
@@ -6,7 +6,7 @@
DRBD_UTILS_VERSION = 8.9.4
DRBD_UTILS_SITE = http://oss.linbit.com/drbd
-DRBD_UTILS_LICENSE = GPLv2+
+DRBD_UTILS_LICENSE = GPL-2.0+
DRBD_UTILS_LICENSE_FILES = COPYING
DRBD_UTILS_DEPENDENCIES = host-flex
diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk
index 3565927..a037d3f 100644
--- a/package/dropwatch/dropwatch.mk
+++ b/package/dropwatch/dropwatch.mk
@@ -8,7 +8,7 @@ DROPWATCH_VERSION = 1.4
DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.xz
DROPWATCH_SITE = https://git.fedorahosted.org/cgit/dropwatch.git/snapshot
DROPWATCH_DEPENDENCIES = binutils libnl readline host-pkgconf
-DROPWATCH_LICENSE = GPLv2
+DROPWATCH_LICENSE = GPL-2.0
DROPWATCH_LICENSE_FILES = COPYING
# libbfd may be linked to libintl
diff --git a/package/dstat/dstat.mk b/package/dstat/dstat.mk
index 180031f..b535328 100644
--- a/package/dstat/dstat.mk
+++ b/package/dstat/dstat.mk
@@ -7,7 +7,7 @@
DSTAT_VERSION = 0.7.2
DSTAT_SOURCE = dstat-$(DSTAT_VERSION).tar.bz2
DSTAT_SITE = http://dag.wieers.com/home-made/dstat
-DSTAT_LICENSE = GPLv2
+DSTAT_LICENSE = GPL-2.0
DSTAT_LICENSE_FILES = COPYING
define DSTAT_INSTALL_TARGET_CMDS
diff --git a/package/dtach/dtach.mk b/package/dtach/dtach.mk
index 75c4434..571481c 100644
--- a/package/dtach/dtach.mk
+++ b/package/dtach/dtach.mk
@@ -6,7 +6,7 @@
DTACH_VERSION = v0.9
DTACH_SITE = $(call github,crigler,dtach,$(DTACH_VERSION))
-DTACH_LICENSE = GPLv2+
+DTACH_LICENSE = GPL-2.0+
DTACH_LICENSE_FILES = COPYING
# The Makefile does not have an install target.
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
index f6800f3..8643849 100644
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -7,7 +7,7 @@
DTC_VERSION = 1.4.1
DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz
DTC_SITE = https://www.kernel.org/pub/software/utils/dtc
-DTC_LICENSE = GPLv2+ or BSD-2c (library)
+DTC_LICENSE = GPL-2.0+ or BSD-2c (library)
DTC_LICENSE_FILES = README.license GPL
DTC_INSTALL_STAGING = YES
DTC_DEPENDENCIES = host-bison host-flex
@@ -19,7 +19,7 @@ endef
ifeq ($(BR2_PACKAGE_DTC_PROGRAMS),y)
-DTC_LICENSE := $(DTC_LICENSE), GPLv2+ (programs)
+DTC_LICENSE := $(DTC_LICENSE), GPL-2.0+ (programs)
DTC_INSTALL_GOAL = install
ifeq ($(BR2_PACKAGE_BASH),)
DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF
diff --git a/package/dtv-scan-tables/dtv-scan-tables.mk b/package/dtv-scan-tables/dtv-scan-tables.mk
index 8a782cb..57fa1cd 100644
--- a/package/dtv-scan-tables/dtv-scan-tables.mk
+++ b/package/dtv-scan-tables/dtv-scan-tables.mk
@@ -14,7 +14,7 @@ DTV_SCAN_TABLES_SITE_METHOD = git
# However, the package prominently contains the COPYING and COPYING.LIB
# license files (respectively for the GPLv2 and the LGPLv2.1), so we use
# that as the licensing information.
-DTV_SCAN_TABLES_LICENSE = GPLv2, LGPLv2.1
+DTV_SCAN_TABLES_LICENSE = GPL-2.0, LGPLv2.1
DTV_SCAN_TABLES_LICENSE_FILES = COPYING COPYING.LGPL
# In order to avoid issues with file name encodings, we rename the
diff --git a/package/duma/duma.mk b/package/duma/duma.mk
index cd7f33e..88d8b75 100644
--- a/package/duma/duma.mk
+++ b/package/duma/duma.mk
@@ -7,7 +7,7 @@
DUMA_VERSION = 2.5.15
DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz
DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION)
-DUMA_LICENSE = GPLv2+, LGPLv2.1+
+DUMA_LICENSE = GPL-2.0+, LGPLv2.1+
DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL
DUMA_INSTALL_STAGING = YES
diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index c52252c..ad38bb6 100644
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -7,7 +7,7 @@
DVB_APPS_VERSION = 3d43b280298c39a67d1d889e01e173f52c12da35
DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps
DVB_APPS_SITE_METHOD = hg
-DVB_APPS_LICENSE = GPLv2, GPLv2+, LGPLv2.1+
+DVB_APPS_LICENSE = GPL-2.0, GPL-2.0+, LGPLv2.1+
DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL
ifeq ($(BR2_ENABLE_LOCALE),)
diff --git a/package/dvblast/dvblast.mk b/package/dvblast/dvblast.mk
index ef9a666..1247276 100644
--- a/package/dvblast/dvblast.mk
+++ b/package/dvblast/dvblast.mk
@@ -7,7 +7,7 @@
DVBLAST_VERSION = 3.0
DVBLAST_SOURCE = dvblast-$(DVBLAST_VERSION).tar.bz2
DVBLAST_SITE = https://get.videolan.org/dvblast/$(DVBLAST_VERSION)
-DVBLAST_LICENSE = GPLv2+, WTFPL
+DVBLAST_LICENSE = GPL-2.0+, WTFPL
DVBLAST_LICENSE_FILES = COPYING COPYING.WTFPL
DVBLAST_DEPENDENCIES = bitstream libev
diff --git a/package/dvbsnoop/dvbsnoop.mk b/package/dvbsnoop/dvbsnoop.mk
index 3bd8f81..fdc483d 100644
--- a/package/dvbsnoop/dvbsnoop.mk
+++ b/package/dvbsnoop/dvbsnoop.mk
@@ -6,7 +6,7 @@
DVBSNOOP_VERSION = 1.4.50
DVBSNOOP_SITE = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION)
-DVBSNOOP_LICENSE = GPLv2
+DVBSNOOP_LICENSE = GPL-2.0
DVBSNOOP_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/dvdauthor/dvdauthor.mk b/package/dvdauthor/dvdauthor.mk
index e982a40..689367d 100644
--- a/package/dvdauthor/dvdauthor.mk
+++ b/package/dvdauthor/dvdauthor.mk
@@ -7,7 +7,7 @@
DVDAUTHOR_VERSION = 0.7.1
DVDAUTHOR_SITE = http://sourceforge.net/projects/dvdauthor/files/dvdauthor/$(DVDAUTHOR_VERSION)
DVDAUTHOR_DEPENDENCIES = host-pkgconf libxml2 freetype libpng
-DVDAUTHOR_LICENSE = GPLv2+
+DVDAUTHOR_LICENSE = GPL-2.0+
DVDAUTHOR_LICENSE_FILES = COPYING
DVDAUTHOR_CONF_ENV = \
ac_cv_prog_FREETYPECONFIG=$(STAGING_DIR)/usr/bin/freetype-config \
diff --git a/package/dvdrw-tools/dvdrw-tools.mk b/package/dvdrw-tools/dvdrw-tools.mk
index 24daac1..5dab546 100644
--- a/package/dvdrw-tools/dvdrw-tools.mk
+++ b/package/dvdrw-tools/dvdrw-tools.mk
@@ -7,7 +7,7 @@
DVDRW_TOOLS_VERSION = 7.1
DVDRW_TOOLS_SOURCE = dvd+rw-tools-$(DVDRW_TOOLS_VERSION).tar.gz
DVDRW_TOOLS_SITE = http://fy.chalmers.se/~appro/linux/DVD+RW/tools
-DVDRW_TOOLS_LICENSE = GPLv2
+DVDRW_TOOLS_LICENSE = GPL-2.0
DVDRW_TOOLS_LICENSE_FILES = LICENSE
DVDRW_TOOLS_DEPENDENCIES = host-m4
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 6659c16..04471c6 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -7,7 +7,7 @@
E2FSPROGS_VERSION = 1.43.4
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
-E2FSPROGS_LICENSE = GPLv2, BSD-3c (libuuid), MIT-like with advertising clause (libss and libet)
+E2FSPROGS_LICENSE = GPL-2.0, BSD-3c (libuuid), MIT-like with advertising clause (libss and libet)
E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
E2FSPROGS_INSTALL_STAGING = YES
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
diff --git a/package/e2tools/e2tools.mk b/package/e2tools/e2tools.mk
index 1f3bb5c..266d909 100644
--- a/package/e2tools/e2tools.mk
+++ b/package/e2tools/e2tools.mk
@@ -9,7 +9,7 @@ E2TOOLS_SITE = $(call github,ndim,e2tools,$(E2TOOLS_VERSION))
# Source coming from GitHub, no configure included.
E2TOOLS_AUTORECONF = YES
-E2TOOLS_LICENSE = GPLv2
+E2TOOLS_LICENSE = GPL-2.0
E2TOOLS_LICENSE_FILES = COPYING
E2TOOLS_DEPENDENCIES = e2fsprogs
E2TOOLS_CONF_ENV = LIBS="-lpthread"
diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk
index 6395930..aae0c91 100644
--- a/package/ebtables/ebtables.mk
+++ b/package/ebtables/ebtables.mk
@@ -7,7 +7,7 @@
EBTABLES_VERSION = 2.0.10-4
EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables
-EBTABLES_LICENSE = GPLv2+
+EBTABLES_LICENSE = GPL-2.0+
EBTABLES_LICENSE_FILES = COPYING
EBTABLES_STATIC = $(if $(BR2_STATIC_LIBS),static)
EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),-DKERNEL_64_USERSPACE_32)
diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk
index 81a4b4b..334e115 100644
--- a/package/ecryptfs-utils/ecryptfs-utils.mk
+++ b/package/ecryptfs-utils/ecryptfs-utils.mk
@@ -7,7 +7,7 @@
ECRYPTFS_UTILS_VERSION = 109
ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz
ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download
-ECRYPTFS_UTILS_LICENSE = GPLv2+
+ECRYPTFS_UTILS_LICENSE = GPL-2.0+
ECRYPTFS_UTILS_LICENSE_FILES = COPYING
ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool
diff --git a/package/eeprog/eeprog.mk b/package/eeprog/eeprog.mk
index 93aeb5e..0b0fcc6 100644
--- a/package/eeprog/eeprog.mk
+++ b/package/eeprog/eeprog.mk
@@ -6,7 +6,7 @@
EEPROG_VERSION = 0.7.6
EEPROG_SITE = http://www.codesink.org/download
-EEPROG_LICENSE = GPLv2+
+EEPROG_LICENSE = GPL-2.0+
EEPROG_LICENSE_FILES = eeprog.c
define EEPROG_BUILD_CMDS
diff --git a/package/efibootmgr/efibootmgr.mk b/package/efibootmgr/efibootmgr.mk
index 487c8ca..b9b520a 100644
--- a/package/efibootmgr/efibootmgr.mk
+++ b/package/efibootmgr/efibootmgr.mk
@@ -6,7 +6,7 @@
EFIBOOTMGR_VERSION = 14
EFIBOOTMGR_SITE = $(call github,rhinstaller,efibootmgr,$(EFIBOOTMGR_VERSION))
-EFIBOOTMGR_LICENSE = GPLv2+
+EFIBOOTMGR_LICENSE = GPL-2.0+
EFIBOOTMGR_LICENSE_FILES = COPYING
EFIBOOTMGR_DEPENDENCIES = efivar $(if $(BR2_NEEDS_GETTEXT),gettext)
EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(if $(BR2_NEEDS_GETTEXT),-lintl)
diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index e0ec6d6bc..ee6211d 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -7,7 +7,7 @@
EFL_VERSION = 1.18.4
EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
EFL_SITE = http://download.enlightenment.org/rel/libs/efl
-EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+
+EFL_LICENSE = BSD-2c, LGPLv2.1+, GPL-2.0+
EFL_LICENSE_FILES = \
COMPLIANCE \
COPYING \
diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk
index 1140eb1..6668661 100644
--- a/package/ejabberd/ejabberd.mk
+++ b/package/ejabberd/ejabberd.mk
@@ -7,7 +7,7 @@
EJABBERD_VERSION = 16.01
EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz
EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION)
-EJABBERD_LICENSE = GPLv2+ with OpenSSL exception
+EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception
EJABBERD_LICENSE_FILES = COPYING
EJABBERD_DEPENDENCIES = getent openssl host-erlang-lager erlang-lager \
erlang-p1-cache-tab erlang-p1-iconv erlang-p1-sip \
diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk
index bd15ea2..1829b10 100644
--- a/package/elf2flt/elf2flt.mk
+++ b/package/elf2flt/elf2flt.mk
@@ -6,7 +6,7 @@
ELF2FLT_VERSION = 9dbc458c6122c495bbdec8dc975a15c9d39e5ff2
ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,$(ELF2FLT_VERSION))
-ELF2FLT_LICENSE = GPLv2+
+ELF2FLT_LICENSE = GPL-2.0+
ELF2FLT_LICENSE_FILES = LICENSE.TXT
HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index 0bf105e..be6e626 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -8,7 +8,7 @@ ELFUTILS_VERSION = 0.166
ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION)
ELFUTILS_INSTALL_STAGING = YES
-ELFUTILS_LICENSE = GPLv2+ or LGPLv3+ (library)
+ELFUTILS_LICENSE = GPL-2.0+ or LGPLv3+ (library)
ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3
ELFUTILS_DEPENDENCIES = zlib
HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz
diff --git a/package/emlog/emlog.mk b/package/emlog/emlog.mk
index bf0bcf7..70d133a 100644
--- a/package/emlog/emlog.mk
+++ b/package/emlog/emlog.mk
@@ -6,7 +6,7 @@
EMLOG_VERSION = 576a6c0fcf76dfeff48124b2f5fc0b4207d88ca1
EMLOG_SITE = $(call github,nicupavel,emlog,$(EMLOG_VERSION))
-EMLOG_LICENSE = GPLv2
+EMLOG_LICENSE = GPL-2.0
EMLOG_LICENSE_FILES = COPYING
define EMLOG_BUILD_CMDS
diff --git a/package/erlang-p1-iconv/erlang-p1-iconv.mk b/package/erlang-p1-iconv/erlang-p1-iconv.mk
index d2d2626..64a6ad4 100644
--- a/package/erlang-p1-iconv/erlang-p1-iconv.mk
+++ b/package/erlang-p1-iconv/erlang-p1-iconv.mk
@@ -6,7 +6,7 @@
ERLANG_P1_ICONV_VERSION = 0.9.0
ERLANG_P1_ICONV_SITE = $(call github,processone,eiconv,$(ERLANG_P1_ICONV_VERSION))
-ERLANG_P1_ICONV_LICENSE = GPLv2+
+ERLANG_P1_ICONV_LICENSE = GPL-2.0+
ERLANG_P1_ICONV_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBICONV),y)
diff --git a/package/erlang-p1-sip/erlang-p1-sip.mk b/package/erlang-p1-sip/erlang-p1-sip.mk
index 24075a7..b589721 100644
--- a/package/erlang-p1-sip/erlang-p1-sip.mk
+++ b/package/erlang-p1-sip/erlang-p1-sip.mk
@@ -6,7 +6,7 @@
ERLANG_P1_SIP_VERSION = 1.0.0
ERLANG_P1_SIP_SITE = $(call github,processone,p1_sip,$(ERLANG_P1_SIP_VERSION))
-ERLANG_P1_SIP_LICENSE = GPLv2 with OpenSSL exception
+ERLANG_P1_SIP_LICENSE = GPL-2.0 with OpenSSL exception
ERLANG_P1_SIP_LICENSE_FILES = COPYING
ERLANG_P1_SIP_DEPENDENCIES = erlang-p1-stun erlang-p1-tls erlang-p1-utils
ERLANG_P1_SIP_INSTALL_STAGING = YES
diff --git a/package/erlang-p1-stun/erlang-p1-stun.mk b/package/erlang-p1-stun/erlang-p1-stun.mk
index 4d26f91..f9056f5 100644
--- a/package/erlang-p1-stun/erlang-p1-stun.mk
+++ b/package/erlang-p1-stun/erlang-p1-stun.mk
@@ -6,7 +6,7 @@
ERLANG_P1_STUN_VERSION = 0.9.0
ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION))
-ERLANG_P1_STUN_LICENSE = GPLv2+
+ERLANG_P1_STUN_LICENSE = GPL-2.0+
ERLANG_P1_STUN_LICENSE_FILES = COPYING
ERLANG_P1_STUN_DEPENDENCIES = erlang-p1-tls erlang-p1-utils
ERLANG_P1_STUN_INSTALL_STAGING = YES
diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk
index 77f06e6..b2451df 100644
--- a/package/erlang-p1-tls/erlang-p1-tls.mk
+++ b/package/erlang-p1-tls/erlang-p1-tls.mk
@@ -6,7 +6,7 @@
ERLANG_P1_TLS_VERSION = 1.0.0
ERLANG_P1_TLS_SITE = $(call github,processone,tls,$(ERLANG_P1_TLS_VERSION))
-ERLANG_P1_TLS_LICENSE = GPLv2+ with OpenSSL exception
+ERLANG_P1_TLS_LICENSE = GPL-2.0+ with OpenSSL exception
ERLANG_P1_TLS_LICENSE_FILES = COPYING
ERLANG_P1_TLS_INSTALL_STAGING = YES
ERLANG_P1_TLS_DEPENDENCIES = openssl
diff --git a/package/erlang-p1-utils/erlang-p1-utils.mk b/package/erlang-p1-utils/erlang-p1-utils.mk
index 733cf87..c9d9299 100644
--- a/package/erlang-p1-utils/erlang-p1-utils.mk
+++ b/package/erlang-p1-utils/erlang-p1-utils.mk
@@ -6,7 +6,7 @@
ERLANG_P1_UTILS_VERSION = 1.0.3
ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION))
-ERLANG_P1_UTILS_LICENSE = GPLv2+
+ERLANG_P1_UTILS_LICENSE = GPL-2.0+
ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt
ERLANG_P1_UTILS_INSTALL_STAGING = YES
diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.mk b/package/erlang-p1-zlib/erlang-p1-zlib.mk
index 1f8ae00..89574b8 100644
--- a/package/erlang-p1-zlib/erlang-p1-zlib.mk
+++ b/package/erlang-p1-zlib/erlang-p1-zlib.mk
@@ -6,7 +6,7 @@
ERLANG_P1_ZLIB_VERSION = 1.0.0
ERLANG_P1_ZLIB_SITE = $(call github,processone,zlib,$(ERLANG_P1_ZLIB_VERSION))
-ERLANG_P1_ZLIB_LICENSE = GPLv2+
+ERLANG_P1_ZLIB_LICENSE = GPL-2.0+
ERLANG_P1_ZLIB_LICENSE_FILES = COPYING
ERLANG_P1_ZLIB_DEPENDENCIES = zlib
diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk
index bb3ed92..53cdaba 100644
--- a/package/ethtool/ethtool.mk
+++ b/package/ethtool/ethtool.mk
@@ -7,7 +7,7 @@
ETHTOOL_VERSION = 4.8
ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz
ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
-ETHTOOL_LICENSE = GPLv2
+ETHTOOL_LICENSE = GPL-2.0
ETHTOOL_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk
index 2f5bd6c..82c11d3 100644
--- a/package/eudev/eudev.mk
+++ b/package/eudev/eudev.mk
@@ -6,7 +6,7 @@
EUDEV_VERSION = 3.2.1
EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
-EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
+EUDEV_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (libraries)
EUDEV_LICENSE_FILES = COPYING
EUDEV_INSTALL_STAGING = YES
diff --git a/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk b/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk
index 55e26f0..92e8927 100644
--- a/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk
+++ b/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk
@@ -6,6 +6,6 @@
EV3DEV_LINUX_DRIVERS_VERSION = 0e551eb25ae8600c1f178814781bfb42dc835496
EV3DEV_LINUX_DRIVERS_SITE = $(call github,ev3dev,lego-linux-drivers,$(EV3DEV_LINUX_DRIVERS_VERSION))
-EV3DEV_LINUX_DRIVERS_LICENSE = GPLv2
+EV3DEV_LINUX_DRIVERS_LICENSE = GPL-2.0
$(eval $(generic-package))
diff --git a/package/evtest/evtest.mk b/package/evtest/evtest.mk
index 5ff2bf3..d00d4cb 100644
--- a/package/evtest/evtest.mk
+++ b/package/evtest/evtest.mk
@@ -6,7 +6,7 @@
EVTEST_VERSION = 1.33
EVTEST_SITE = http://cgit.freedesktop.org/evtest/snapshot
-EVTEST_LICENSE = GPLv2+
+EVTEST_LICENSE = GPL-2.0+
EVTEST_LICENSE_FILES = COPYING
EVTEST_DEPENDENCIES = host-pkgconf
# needed because source package contains no generated files
diff --git a/package/exim/exim.mk b/package/exim/exim.mk
index 8638388..45cb57d 100644
--- a/package/exim/exim.mk
+++ b/package/exim/exim.mk
@@ -7,7 +7,7 @@
EXIM_VERSION = 4.89
EXIM_SOURCE = exim-$(EXIM_VERSION).tar.bz2
EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4
-EXIM_LICENSE = GPLv2+
+EXIM_LICENSE = GPL-2.0+
EXIM_LICENSE_FILES = LICENCE
EXIM_DEPENDENCIES = pcre berkeleydb host-pkgconf
diff --git a/package/exiv2/exiv2.mk b/package/exiv2/exiv2.mk
index 45f9289..95d03cf 100644
--- a/package/exiv2/exiv2.mk
+++ b/package/exiv2/exiv2.mk
@@ -20,7 +20,7 @@ EXIV2_LICENSE = commercial
# of the translated texts.
EXIV2_CONF_OPTS += -DEXIV2_ENABLE_COMMERCIAL=ON -DEXIV2_ENABLE_NLS=OFF
else
-EXIV2_LICENSE = GPLv2+
+EXIV2_LICENSE = GPL-2.0+
EXIV2_LICENSE_FILES = COPYING
endif
diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk
index ac8bd39..9b827df 100644
--- a/package/f2fs-tools/f2fs-tools.mk
+++ b/package/f2fs-tools/f2fs-tools.mk
@@ -12,7 +12,7 @@ F2FS_TOOLS_DEPENDENCIES = host-pkgconf util-linux
# GIT version, shipped without configure
F2FS_TOOLS_AUTORECONF = YES
F2FS_TOOLS_INSTALL_STAGING = YES
-F2FS_TOOLS_LICENSE = GPLv2
+F2FS_TOOLS_LICENSE = GPL-2.0
F2FS_TOOLS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/faad2/faad2.mk b/package/faad2/faad2.mk
index 8c4fc1a..d7b55d3 100644
--- a/package/faad2/faad2.mk
+++ b/package/faad2/faad2.mk
@@ -6,7 +6,7 @@
FAAD2_VERSION = 2.7
FAAD2_SITE = http://downloads.sourceforge.net/project/faac/faad2-src/faad2-$(FAAD2_VERSION)
-FAAD2_LICENSE = GPLv2
+FAAD2_LICENSE = GPL-2.0
FAAD2_LICENSE_FILES = COPYING
# frontend/faad calls frexp()
FAAD2_CONF_ENV = LIBS=-lm
diff --git a/package/fakedate/fakedate.mk b/package/fakedate/fakedate.mk
index 61d4bd7..f47a5ee 100644
--- a/package/fakedate/fakedate.mk
+++ b/package/fakedate/fakedate.mk
@@ -5,7 +5,7 @@
################################################################################
# source included in buildroot
-HOST_FAKEDATE_LICENSE = GPLv2+
+HOST_FAKEDATE_LICENSE = GPL-2.0+
define HOST_FAKEDATE_INSTALL_CMDS
$(INSTALL) -D -m 755 package/fakedate/fakedate $(HOST_DIR)/usr/bin/fakedate
diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk
index 292fe17..03879ea 100644
--- a/package/faketime/faketime.mk
+++ b/package/faketime/faketime.mk
@@ -6,7 +6,7 @@
FAKETIME_VERSION = v0.9.6
FAKETIME_SITE = $(call github,wolfcw,libfaketime,$(FAKETIME_VERSION))
-FAKETIME_LICENSE = GPLv2
+FAKETIME_LICENSE = GPL-2.0
FAKETIME_LICENSE_FILES = COPYING
define HOST_FAKETIME_BUILD_CMDS
diff --git a/package/fan-ctrl/fan-ctrl.mk b/package/fan-ctrl/fan-ctrl.mk
index 4232286..53533a8 100644
--- a/package/fan-ctrl/fan-ctrl.mk
+++ b/package/fan-ctrl/fan-ctrl.mk
@@ -8,7 +8,7 @@
FAN_CTRL_VERSION = 1.3
FAN_CTRL_SOURCE = fan-ctrl.c?revision=$(FAN_CTRL_VERSION)
FAN_CTRL_SITE = http://fan-ctrl.cvs.sourceforge.net/viewvc/fan-ctrl/fan-ctrl
-FAN_CTRL_LICENSE = GPLv2+
+FAN_CTRL_LICENSE = GPL-2.0+
FAN_CTRL_LICENSE_FILES = fan-ctrl.c
define FAN_CTRL_EXTRACT_CMDS
diff --git a/package/fb-test-app/fb-test-app.mk b/package/fb-test-app/fb-test-app.mk
index 9cd0aec..1ab7b2f 100644
--- a/package/fb-test-app/fb-test-app.mk
+++ b/package/fb-test-app/fb-test-app.mk
@@ -6,7 +6,7 @@
FB_TEST_APP_VERSION = rosetta-1.1.0
FB_TEST_APP_SITE = $(call github,prpplague,fb-test-app,$(FB_TEST_APP_VERSION))
-FB_TEST_APP_LICENSE = GPLv2
+FB_TEST_APP_LICENSE = GPL-2.0
FB_TEST_APP_LICENSE_FILES = COPYING
define FB_TEST_APP_BUILD_CMDS
diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
index 9295acd..301dd4f 100644
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -6,7 +6,7 @@
FBDUMP_VERSION = 0.4.2
FBDUMP_SITE = http://www.rcdrummond.net/fbdump
-FBDUMP_LICENSE = GPLv2
+FBDUMP_LICENSE = GPL-2.0
FBDUMP_LICENSE_FILES = COPYING
# The VGA16 specific feature of fbdump doesn't make much sense outside
diff --git a/package/fbgrab/fbgrab.mk b/package/fbgrab/fbgrab.mk
index 4455423..15e0a95 100644
--- a/package/fbgrab/fbgrab.mk
+++ b/package/fbgrab/fbgrab.mk
@@ -7,7 +7,7 @@
FBGRAB_VERSION = 1.3
FBGRAB_SITE = http://fbgrab.monells.se
FBGRAB_DEPENDENCIES = libpng
-FBGRAB_LICENSE = GPLv2
+FBGRAB_LICENSE = GPL-2.0
FBGRAB_LICENSE_FILES = COPYING
define FBGRAB_BUILD_CMDS
diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk
index 16581c4..d6ee104 100644
--- a/package/fbset/fbset.mk
+++ b/package/fbset/fbset.mk
@@ -7,7 +7,7 @@
FBSET_VERSION = 2.1
FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
FBSET_DEPENDENCIES = host-bison host-flex
-FBSET_LICENSE = GPLv2
+FBSET_LICENSE = GPL-2.0
# Make sure full fbset wins over busybox fbset
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
diff --git a/package/fbterm/fbterm.mk b/package/fbterm/fbterm.mk
index be3cbe2..712d4f9 100644
--- a/package/fbterm/fbterm.mk
+++ b/package/fbterm/fbterm.mk
@@ -6,7 +6,7 @@
FBTERM_VERSION = 1.7.0
FBTERM_SITE = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm
-FBTERM_LICENSE = GPLv2+
+FBTERM_LICENSE = GPL-2.0+
FBTERM_LICENSE_FILES = COPYING
FBTERM_DEPENDENCIES = fontconfig liberation
diff --git a/package/fbtft/fbtft.mk b/package/fbtft/fbtft.mk
index 913627d..b935e74 100644
--- a/package/fbtft/fbtft.mk
+++ b/package/fbtft/fbtft.mk
@@ -6,6 +6,6 @@
FBTFT_VERSION = 274035404701245e7491c0c6471c5b72ade4d491
FBTFT_SITE = $(call github,notro,fbtft,$(FBTFT_VERSION))
-FBTFT_LICENSE = GPLv2
+FBTFT_LICENSE = GPL-2.0
$(eval $(generic-package))
diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk
index d12b9f4..a69e4ad 100644
--- a/package/fbv/fbv.mk
+++ b/package/fbv/fbv.mk
@@ -7,7 +7,7 @@
FBV_VERSION = 1.0b
FBV_SITE = http://s-tech.elsat.net.pl/fbv
-FBV_LICENSE = GPLv2
+FBV_LICENSE = GPL-2.0
FBV_LICENSE_FILES = COPYING
### image format dependencies and configure options
diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk
index 509fc2c..1e6fbb4 100644
--- a/package/fconfig/fconfig.mk
+++ b/package/fconfig/fconfig.mk
@@ -8,7 +8,7 @@ FCONFIG_VERSION = 20080329
# Real upstream location has been disabled
# FCONFIG_SITE = http://andrzejekiert.ovh.org/software/fconfig
FCONFIG_SITE = http://sources.buildroot.net
-FCONFIG_LICENSE = GPLv2+
+FCONFIG_LICENSE = GPL-2.0+
FCONFIG_LICENSE_FILES = fconfig.c
define FCONFIG_BUILD_CMDS
diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk
index 6aa0a2c..2c3786f 100644
--- a/package/fetchmail/fetchmail.mk
+++ b/package/fetchmail/fetchmail.mk
@@ -8,7 +8,7 @@ FETCHMAIL_VERSION_MAJOR = 6.3
FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).26
FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz
FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR)
-FETCHMAIL_LICENSE = GPLv2; some exceptions are mentioned in COPYING
+FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING
FETCHMAIL_LICENSE_FILES = COPYING
FETCHMAIL_AUTORECONF = YES
FETCHMAIL_GETTEXTIZE = YES
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 449cca2..c181dfa 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -12,7 +12,7 @@ FFMPEG_INSTALL_STAGING = YES
FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
FFMPEG_LICENSE_FILES = LICENSE.md COPYING.LGPLv2.1
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
-FFMPEG_LICENSE += and GPLv2+
+FFMPEG_LICENSE += and GPL-2.0+
FFMPEG_LICENSE_FILES += COPYING.GPLv2
endif
diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
index 5bd39a8..671c99b 100644
--- a/package/fftw/fftw.mk
+++ b/package/fftw/fftw.mk
@@ -7,7 +7,7 @@
FFTW_VERSION = 3.3.4
FFTW_SITE = http://www.fftw.org
FFTW_INSTALL_STAGING = YES
-FFTW_LICENSE = GPLv2+
+FFTW_LICENSE = GPL-2.0+
FFTW_LICENSE_FILES = COPYING
# fortran support only enables generation and installation of fortran sources
diff --git a/package/fio/fio.mk b/package/fio/fio.mk
index 5c02bc9..e7e9fbe 100644
--- a/package/fio/fio.mk
+++ b/package/fio/fio.mk
@@ -6,7 +6,7 @@
FIO_VERSION = fio-2.13
FIO_SITE = git://git.kernel.dk/fio.git
-FIO_LICENSE = GPLv2 + special obligations
+FIO_LICENSE = GPL-2.0 + special obligations
FIO_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBAIO),y)
diff --git a/package/firejail/firejail.mk b/package/firejail/firejail.mk
index c1fab29..858f547 100644
--- a/package/firejail/firejail.mk
+++ b/package/firejail/firejail.mk
@@ -7,7 +7,7 @@
FIREJAIL_VERSION = 0.9.44.8
FIREJAIL_SITE = http://download.sourceforge.net/firejail
FIREJAIL_SOURCE = firejail-$(FIREJAIL_VERSION).tar.xz
-FIREJAIL_LICENSE = GPLv2+
+FIREJAIL_LICENSE = GPL-2.0+
FIREJAIL_LICENSE_FILES = COPYING
FIREJAIL_CONF_OPTS = \
diff --git a/package/fis/fis.mk b/package/fis/fis.mk
index 876b127..6d3a227 100644
--- a/package/fis/fis.mk
+++ b/package/fis/fis.mk
@@ -7,7 +7,7 @@
FIS_SITE = http://svn.chezphil.org/utils/trunk
FIS_SITE_METHOD = svn
FIS_VERSION = 2892
-FIS_LICENSE = GPLv2+
+FIS_LICENSE = GPL-2.0+
FIS_LICENSE_FILES = fis.c
define FIS_BUILD_CMDS
diff --git a/package/flac/flac.mk b/package/flac/flac.mk
index 43e0410..639636e 100644
--- a/package/flac/flac.mk
+++ b/package/flac/flac.mk
@@ -9,7 +9,7 @@ FLAC_SITE = http://downloads.xiph.org/releases/flac
FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz
FLAC_INSTALL_STAGING = YES
FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-FLAC_LICENSE = Xiph BSD-like (libFLAC), GPLv2+ (tools), LGPLv2.1+ (other libraries)
+FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPLv2.1+ (other libraries)
FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL
# 0001-configure.ac-relax-linux-OS-detection.patch patches configure.ac
FLAC_AUTORECONF = YES
diff --git a/package/flashbench/flashbench.mk b/package/flashbench/flashbench.mk
index 6759338..cbcf9ea 100644
--- a/package/flashbench/flashbench.mk
+++ b/package/flashbench/flashbench.mk
@@ -6,7 +6,7 @@
FLASHBENCH_VERSION = 2e30b1968a66147412f21002ea844122a0d5e2f0
FLASHBENCH_SITE = git://git.linaro.org/people/arnd/flashbench.git
-FLASHBENCH_LICENSE = GPLv2
+FLASHBENCH_LICENSE = GPL-2.0
FLASHBENCH_LICENSE_FILES = COPYING
FLASHBENCH_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk
index 7e0fcf2..0b89bf3 100644
--- a/package/flashrom/flashrom.mk
+++ b/package/flashrom/flashrom.mk
@@ -8,7 +8,7 @@ FLASHROM_VERSION = 0.9.8
FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2
FLASHROM_SITE = http://download.flashrom.org/releases
FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf
-FLASHROM_LICENSE = GPLv2+
+FLASHROM_LICENSE = GPL-2.0+
FLASHROM_LICENSE_FILES = COPYING
define FLASHROM_BUILD_CMDS
diff --git a/package/flickcurl/flickcurl.mk b/package/flickcurl/flickcurl.mk
index ce836f7..87af8f4 100644
--- a/package/flickcurl/flickcurl.mk
+++ b/package/flickcurl/flickcurl.mk
@@ -6,7 +6,7 @@
FLICKCURL_VERSION = 1.26
FLICKCURL_SITE = http://download.dajobe.org/flickcurl
-FLICKCURL_LICENSE = LGPLv2.1+ or GPLv2+ or Apache 2.0+
+FLICKCURL_LICENSE = LGPLv2.1+ or GPL-2.0+ or Apache 2.0+
FLICKCURL_LICENSE_FILES = COPYING COPYING.LIB LICENSE-2.0.txt LICENSE.html
FLICKCURL_INSTALL_STAGING = YES
FLICKCURL_CONFIG_SCRIPTS = flickcurl-config
diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk
index 16e8176..e75eeff 100644
--- a/package/fmlib/fmlib.mk
+++ b/package/fmlib/fmlib.mk
@@ -6,7 +6,7 @@
FMLIB_VERSION = fsl-sdk-v2.0
FMLIB_SITE = git://git.freescale.com/ppc/sdk/fmlib.git
-FMLIB_LICENSE = BSD-3c, GPLv2+
+FMLIB_LICENSE = BSD-3c, GPL-2.0+
FMLIB_LICENSE_FILES = COPYING
FMLIB_DEPENDENCIES = linux
FMLIB_INSTALL_STAGING = YES
diff --git a/package/fmtools/fmtools.mk b/package/fmtools/fmtools.mk
index 4b1b64f..890fae1 100644
--- a/package/fmtools/fmtools.mk
+++ b/package/fmtools/fmtools.mk
@@ -6,7 +6,7 @@
FMTOOLS_VERSION = 2.0.7
FMTOOLS_SITE = http://benpfaff.org/fmtools
-FMTOOLS_LICENSE = GPLv2+
+FMTOOLS_LICENSE = GPL-2.0+
FMTOOLS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/freescale-imx/imx-kobs/imx-kobs.mk b/package/freescale-imx/imx-kobs/imx-kobs.mk
index 8f490c2..897820d 100644
--- a/package/freescale-imx/imx-kobs/imx-kobs.mk
+++ b/package/freescale-imx/imx-kobs/imx-kobs.mk
@@ -6,7 +6,7 @@
IMX_KOBS_VERSION = b402243a04e5a6760a860445e5ff6a931d86f794
IMX_KOBS_SITE = $(call github,NXPmicro,imx-kobs,$(IMX_KOBS_VERSION))
-IMX_KOBS_LICENSE = GPLv2+
+IMX_KOBS_LICENSE = GPL-2.0+
IMX_KOBS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/freescale-imx/imx-uuc/imx-uuc.mk b/package/freescale-imx/imx-uuc/imx-uuc.mk
index 12d9312..c05cee3 100644
--- a/package/freescale-imx/imx-uuc/imx-uuc.mk
+++ b/package/freescale-imx/imx-uuc/imx-uuc.mk
@@ -6,7 +6,7 @@
IMX_UUC_VERSION = 3440b1108373e79669cc17ba1d2be91a123a2053
IMX_UUC_SITE = $(call github,NXPmicro,imx-uuc,$(IMX_UUC_VERSION))
-IMX_UUC_LICENSE = GPLv2+
+IMX_UUC_LICENSE = GPL-2.0+
IMX_UUC_LICENSE_FILES = COPYING
# mkfs.vfat is needed to create a FAT partition used by g_mass_storage
diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
index bcbd8d2..d232134 100644
--- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
+++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
@@ -7,7 +7,7 @@
KERNEL_MODULE_IMX_GPU_VIV_VERSION = bfa78b095a892705a09afe9514fc5d236b3124d2
KERNEL_MODULE_IMX_GPU_VIV_SITE = \
$(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION))
-KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPLv2
+KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0
KERNEL_MODULE_IMX_GPU_VIV_LICENSE_FILES = COPYING
KERNEL_MODULE_IMX_GPU_VIV_MODULE_MAKE_OPTS = \
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index 9484758..da9e900 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -9,7 +9,7 @@ FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype
FREETYPE_INSTALL_STAGING = YES
FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)"
-FREETYPE_LICENSE = Dual FTL/GPLv2+
+FREETYPE_LICENSE = Dual FTL/GPL-2.0+
FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT
FREETYPE_DEPENDENCIES = host-pkgconf
FREETYPE_CONFIG_SCRIPTS = freetype-config
diff --git a/package/fswebcam/fswebcam.mk b/package/fswebcam/fswebcam.mk
index 8cb40d6..4b47b3e 100644
--- a/package/fswebcam/fswebcam.mk
+++ b/package/fswebcam/fswebcam.mk
@@ -6,7 +6,7 @@
FSWEBCAM_VERSION = 20140113
FSWEBCAM_SITE = http://www.firestorm.cx/fswebcam/files
-FSWEBCAM_LICENSE = GPLv2
+FSWEBCAM_LICENSE = GPL-2.0
FSWEBCAM_LICENSE_FILES = LICENSE
FSWEBCAM_DEPENDENCIES += freetype jpeg libpng gd
diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk
index 984e368..550536e 100644
--- a/package/fwts/fwts.mk
+++ b/package/fwts/fwts.mk
@@ -7,7 +7,7 @@
FWTS_VERSION = V16.11.00
FWTS_SITE = http://fwts.ubuntu.com/release
FWTS_STRIP_COMPONENTS = 0
-FWTS_LICENSE = GPLv2, LGPLv2.1, Custom
+FWTS_LICENSE = GPL-2.0, LGPLv2.1, Custom
FWTS_LICENSE_FILES = debian/copyright
FWTS_AUTORECONF = YES
FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf json-c libglib2 \
diff --git a/package/fxload/fxload.mk b/package/fxload/fxload.mk
index b34dccd..94b11d0 100644
--- a/package/fxload/fxload.mk
+++ b/package/fxload/fxload.mk
@@ -6,7 +6,7 @@
FXLOAD_VERSION = 2008_10_13
FXLOAD_SITE = http://downloads.sourceforge.net/project/linux-hotplug/fxload/$(FXLOAD_VERSION)
-FXLOAD_LICENSE = GPLv2+
+FXLOAD_LICENSE = GPL-2.0+
FXLOAD_LICENSE_FILES = COPYING
define FXLOAD_BUILD_CMDS
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 1218f11..8067b63 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -20,7 +20,7 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
GDB_FROM_GIT = y
endif
-GDB_LICENSE = GPLv2+, LGPLv2+, GPLv3+, LGPLv3+
+GDB_LICENSE = GPL-2.0+, LGPLv2+, GPLv3+, LGPLv3+
GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB
# We only want gdbserver and not the entire debugger.
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
index 528912e..dd907c8 100644
--- a/package/genext2fs/genext2fs.mk
+++ b/package/genext2fs/genext2fs.mk
@@ -6,7 +6,7 @@
GENEXT2FS_VERSION = 1.4.1
GENEXT2FS_SITE = http://downloads.sourceforge.net/project/genext2fs/genext2fs/$(GENEXT2FS_VERSION)
-GENEXT2FS_LICENSE = GPLv2
+GENEXT2FS_LICENSE = GPL-2.0
GENEXT2FS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk
index 4343d14..2e7aad2 100644
--- a/package/genimage/genimage.mk
+++ b/package/genimage/genimage.mk
@@ -8,7 +8,7 @@ GENIMAGE_VERSION = 9
GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
GENIMAGE_SITE = http://www.pengutronix.de/software/genimage/download
HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse
-GENIMAGE_LICENSE = GPLv2
+GENIMAGE_LICENSE = GPL-2.0
GENIMAGE_LICENSE_FILES = COPYING
$(eval $(host-autotools-package))
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
index 8db0899..3025550 100644
--- a/package/genromfs/genromfs.mk
+++ b/package/genromfs/genromfs.mk
@@ -6,7 +6,7 @@
GENROMFS_VERSION = 0.5.2
GENROMFS_SITE = http://downloads.sourceforge.net/project/romfs/genromfs/$(GENROMFS_VERSION)
-GENROMFS_LICENSE = GPLv2+
+GENROMFS_LICENSE = GPL-2.0+
GENROMFS_LICENSE_FILES = COPYING
define GENROMFS_BUILD_CMDS
diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk
index 25c947a..27a1ec3 100644
--- a/package/gesftpserver/gesftpserver.mk
+++ b/package/gesftpserver/gesftpserver.mk
@@ -7,7 +7,7 @@
GESFTPSERVER_VERSION = 0.2.1
GESFTPSERVER_SOURCE = sftpserver-$(GESFTPSERVER_VERSION).tar.gz
GESFTPSERVER_SITE = http://www.greenend.org.uk/rjk/sftpserver
-GESFTPSERVER_LICENSE = GPLv2+
+GESFTPSERVER_LICENSE = GPL-2.0+
GESFTPSERVER_LICENSE_FILES = COPYING
# forgets to link against pthread when cross compiling
GESFTPSERVER_CONF_ENV = LIBS=-lpthread
diff --git a/package/ghostscript-fonts/ghostscript-fonts.mk b/package/ghostscript-fonts/ghostscript-fonts.mk
index fa5c4b7..156eb4c 100644
--- a/package/ghostscript-fonts/ghostscript-fonts.mk
+++ b/package/ghostscript-fonts/ghostscript-fonts.mk
@@ -7,7 +7,7 @@
GHOSTSCRIPT_FONTS_VERSION = 8.11
GHOSTSCRIPT_FONTS_SITE = http://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29
GHOSTSCRIPT_FONTS_SOURCE = ghostscript-fonts-std-$(GHOSTSCRIPT_FONTS_VERSION).tar.gz
-GHOSTSCRIPT_FONTS_LICENSE = GPLv2
+GHOSTSCRIPT_FONTS_LICENSE = GPL-2.0
GHOSTSCRIPT_FONTS_LICENSE_FILES = COPYING
GHOSTSCRIPT_FONTS_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/gs
diff --git a/package/git/git.mk b/package/git/git.mk
index b49ddd5..9a14fdc 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -7,7 +7,7 @@
GIT_VERSION = 2.12.2
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
GIT_SITE = https://www.kernel.org/pub/software/scm/git
-GIT_LICENSE = GPLv2, LGPLv2.1+
+GIT_LICENSE = GPL-2.0, LGPLv2.1+
GIT_LICENSE_FILES = COPYING LGPL-2.1
GIT_DEPENDENCIES = zlib host-gettext
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index ee52539..44e7459 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -9,7 +9,7 @@ GLIBC_SITE = $(BR2_GNU_MIRROR)/libc
GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz
GLIBC_SRC_SUBDIR = .
-GLIBC_LICENSE = GPLv2+ (programs), LGPLv2.1+, BSD-3c, MIT (library)
+GLIBC_LICENSE = GPL-2.0+ (programs), LGPLv2.1+, BSD-3c, MIT (library)
GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES)
# glibc is part of the toolchain so disable the toolchain dependency
diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk
index 0daca58..d579a0c 100644
--- a/package/glibmm/glibmm.mk
+++ b/package/glibmm/glibmm.mk
@@ -6,7 +6,7 @@
GLIBMM_VERSION_MAJOR = 2.50
GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).0
-GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
+GLIBMM_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (tools)
GLIBMM_LICENSE_FILES = COPYING COPYING.tools
GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz
GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJOR)
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 33b5d54..d85ab81 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -8,7 +8,7 @@ GMP_VERSION = 6.1.2
GMP_SITE = $(BR2_GNU_MIRROR)/gmp
GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz
GMP_INSTALL_STAGING = YES
-GMP_LICENSE = LGPLv3+ or GPLv2+
+GMP_LICENSE = LGPLv3+ or GPL-2.0+
GMP_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2
GMP_DEPENDENCIES = host-m4
HOST_GMP_DEPENDENCIES = host-m4
diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
index 03d95d4..7ba86a7 100644
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -8,7 +8,7 @@ GMPC_VERSION = 11.8.16
GMPC_SITE = http://download.sarine.nl/Programs/gmpc/$(GMPC_VERSION)
GMPC_CONF_ENV = ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
GMPC_CONF_OPTS = --disable-mmkeys --disable-unique
-GMPC_LICENSE = GPLv2+
+GMPC_LICENSE = GPL-2.0+
GMPC_LICENSE_FILES = COPYING
GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkgconf host-vala \
libglib2 libgtk2 libmpd libsoup sqlite \
diff --git a/package/gmrender-resurrect/gmrender-resurrect.mk b/package/gmrender-resurrect/gmrender-resurrect.mk
index 24608a1..98d5e0b 100644
--- a/package/gmrender-resurrect/gmrender-resurrect.mk
+++ b/package/gmrender-resurrect/gmrender-resurrect.mk
@@ -9,7 +9,7 @@ GMRENDER_RESURRECT_SITE = $(call github,hzeller,gmrender-resurrect,$(GMRENDER_RE
# Original distribution does not have default configure,
# so we need to autoreconf:
GMRENDER_RESURRECT_AUTORECONF = YES
-GMRENDER_RESURRECT_LICENSE = GPLv2+
+GMRENDER_RESURRECT_LICENSE = GPL-2.0+
GMRENDER_RESURRECT_LICENSE_FILES = COPYING
GMRENDER_RESURRECT_DEPENDENCIES = gstreamer1 libupnp
diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk
index a11ff81..5ac615e 100644
--- a/package/gnu-efi/gnu-efi.mk
+++ b/package/gnu-efi/gnu-efi.mk
@@ -8,7 +8,7 @@ GNU_EFI_VERSION = 3.0.1
GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2
GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi
GNU_EFI_INSTALL_STAGING = YES
-GNU_EFI_LICENSE = BSD-3c and/or GPLv2+ (gnuefi), BSD-3c (efilib)
+GNU_EFI_LICENSE = BSD-3c and/or GPL-2.0+ (gnuefi), BSD-3c (efilib)
GNU_EFI_LICENSE_FILES = README.efilib
# gnu-efi is a set of library and header files used to build
diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk
index e066b01..0103367 100644
--- a/package/gnuchess/gnuchess.mk
+++ b/package/gnuchess/gnuchess.mk
@@ -6,7 +6,7 @@
GNUCHESS_VERSION = 6.2.4
GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
-GNUCHESS_LICENSE = GPLv2+
+GNUCHESS_LICENSE = GPL-2.0+
GNUCHESS_LICENSE_FILES = COPYING
GNUCHESS_DEPENDENCIES = host-flex flex
diff --git a/package/gpm/gpm.mk b/package/gpm/gpm.mk
index ed4c1fd..f59d059 100644
--- a/package/gpm/gpm.mk
+++ b/package/gpm/gpm.mk
@@ -7,7 +7,7 @@
GPM_VERSION = 1.20.7
GPM_SOURCE = gpm-$(GPM_VERSION).tar.lzma
GPM_SITE = http://www.nico.schottelius.org/software/gpm/archives
-GPM_LICENSE = GPLv2+
+GPM_LICENSE = GPL-2.0+
GPM_LICENSE_FILES = COPYING
GPM_INSTALL_STAGING = YES
GPM_DEPENDENCIES = host-bison
diff --git a/package/gptfdisk/gptfdisk.mk b/package/gptfdisk/gptfdisk.mk
index 274591c..56be765 100644
--- a/package/gptfdisk/gptfdisk.mk
+++ b/package/gptfdisk/gptfdisk.mk
@@ -6,7 +6,7 @@
GPTFDISK_VERSION = 1.0.0
GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
-GPTFDISK_LICENSE = GPLv2+
+GPTFDISK_LICENSE = GPL-2.0+
GPTFDISK_LICENSE_FILES = COPYING
GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk
diff --git a/package/gqview/gqview.mk b/package/gqview/gqview.mk
index 8962025..0837630 100644
--- a/package/gqview/gqview.mk
+++ b/package/gqview/gqview.mk
@@ -8,7 +8,7 @@ GQVIEW_VERSION = 2.1.5
GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
GQVIEW_DEPENDENCIES = host-pkgconf libgtk2
GQVIEW_CONF_ENV = LIBS="-lm"
-GQVIEW_LICENSE = GPLv2
+GQVIEW_LICENSE = GPL-2.0
GQVIEW_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index b1d8f8b..e178dbc 100644
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -12,7 +12,7 @@ GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base
ifeq ($(BR2_PACKAGE_GST_FFMPEG_GPL),y)
GST_FFMPEG_CONF_OPTS += --disable-lgpl
-GST_FFMPEG_LICENSE = GPLv2+ (gst-ffmpeg), GPLv2+/GPLv3+ (libav)
+GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPLv3+ (libav)
GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3
else
GST_FFMPEG_CONF_OPTS += --enable-lgpl
diff --git a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
index 98e5c1c..9296dab 100644
--- a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
@@ -8,7 +8,7 @@ GST_PLUGINS_BAD_VERSION = 0.10.23
GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz
GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
# COPYING.LIB is in fact v2, but most of the code is v2.1+
-GST_PLUGINS_BAD_LICENSE = LGPLv2.1+, GPLv2+
+GST_PLUGINS_BAD_LICENSE = LGPLv2.1+, GPL-2.0+
GST_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB COPYING
GST_PLUGINS_BAD_CONF_OPTS = \
diff --git a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
index 51c22a9..d1738c5 100644
--- a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
+++ b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
@@ -8,7 +8,7 @@ GST_PLUGINS_BASE_VERSION = 0.10.36
GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.xz
GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
GST_PLUGINS_BASE_INSTALL_STAGING = YES
-GST_PLUGINS_BASE_LICENSE = GPLv2+, LGPLv2+
+GST_PLUGINS_BASE_LICENSE = GPL-2.0+, LGPLv2+
GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB
# freetype is only used by examples, but if it is not found
diff --git a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
index 0f56164..d145430 100644
--- a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -10,7 +10,7 @@ GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
GST_PLUGINS_UGLY_PATCH = http://git.alpinelinux.org/cgit/aports/plain/main/gst-plugins-ugly0.10/cdio-cd-text-api.patch
# COPYING is in fact LGPLv2.1, but all of the code is v2+
# (except for one test, xingmux)
-GST_PLUGINS_UGLY_LICENSE = LGPLv2+, GPLv2+ (synaesthesia)
+GST_PLUGINS_UGLY_LICENSE = LGPLv2+, GPL-2.0+ (synaesthesia)
GST_PLUGINS_UGLY_LICENSE_FILES = COPYING
GST_PLUGINS_UGLY_CONF_OPTS = \
diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk
index 5726bb5..41c19d1 100644
--- a/package/gstreamer1/gst1-libav/gst1-libav.mk
+++ b/package/gstreamer1/gst1-libav/gst1-libav.mk
@@ -12,7 +12,7 @@ GST1_LIBAV_DEPENDENCIES = \
host-pkgconf ffmpeg gstreamer1 gst1-plugins-base \
$(if $(BR2_PACKAGE_BZIP2),bzip2) \
$(if $(BR2_PACKAGE_XZ),xz)
-GST1_LIBAV_LICENSE = GPLv2+
+GST1_LIBAV_LICENSE = GPL-2.0+
GST1_LIBAV_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
index d503555..16ba229 100644
--- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -110,7 +110,7 @@ endif
# Add GPL license if GPL plugins enabled.
ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y)
-GST1_PLUGINS_UGLY_LICENSE += GPLv2
+GST1_PLUGINS_UGLY_LICENSE += GPL-2.0
endif
# Use the following command to extract license info for plugins.
diff --git a/package/gtkmm3/gtkmm3.mk b/package/gtkmm3/gtkmm3.mk
index 57b9b1f..81a933b 100644
--- a/package/gtkmm3/gtkmm3.mk
+++ b/package/gtkmm3/gtkmm3.mk
@@ -8,7 +8,7 @@ GTKMM3_VERSION_MAJOR = 3.22
GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).0
GTKMM3_SOURCE = gtkmm-$(GTKMM3_VERSION).tar.xz
GTKMM3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(GTKMM3_VERSION_MAJOR)
-GTKMM3_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
+GTKMM3_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (tools)
GTKMM3_LICENSE_FILES = COPYING COPYING.tools
GTKMM3_INSTALL_STAGING = YES
GTKMM3_DEPENDENCIES = atkmm cairomm glibmm libgtk3 libsigc pangomm host-pkgconf
diff --git a/package/gtkperf/gtkperf.mk b/package/gtkperf/gtkperf.mk
index 0542a26..1d1230f 100644
--- a/package/gtkperf/gtkperf.mk
+++ b/package/gtkperf/gtkperf.mk
@@ -8,7 +8,7 @@ GTKPERF_VERSION = 0.40
GTKPERF_SOURCE = gtkperf_$(GTKPERF_VERSION).tar.gz
GTKPERF_SITE = http://downloads.sourceforge.net/project/gtkperf/gtkperf/$(GTKPERF_VERSION)
GTKPERF_DEPENDENCIES = libgtk2
-GTKPERF_LICENSE = GPLv2
+GTKPERF_LICENSE = GPL-2.0
GTKPERF_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/gupnp-tools/gupnp-tools.mk b/package/gupnp-tools/gupnp-tools.mk
index 07b5d3c..b64a138 100644
--- a/package/gupnp-tools/gupnp-tools.mk
+++ b/package/gupnp-tools/gupnp-tools.mk
@@ -9,7 +9,7 @@ GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).13
GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz
GUPNP_TOOLS_SITE = \
http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR)
-GUPNP_TOOLS_LICENSE = GPLv2+
+GUPNP_TOOLS_LICENSE = GPL-2.0+
GUPNP_TOOLS_LICENSE_FILES = COPYING
GUPNP_TOOLS_INSTALL_STAGING = YES
GUPNP_TOOLS_DEPENDENCIES = \
diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
index 8ee2406..99d1f43 100644
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -8,7 +8,7 @@ GUTENPRINT_VERSION_MAJOR = 5.2
GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).11
GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-$(GUTENPRINT_VERSION_MAJOR)/$(GUTENPRINT_VERSION)
GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
-GUTENPRINT_LICENSE = GPLv2+
+GUTENPRINT_LICENSE = GPL-2.0+
GUTENPRINT_LICENSE_FILES = COPYING
# Needed, as we touch Makefile.am and configure.ac
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index 93d64c8..4c24b9b 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -6,7 +6,7 @@
HASERL_VERSION = 0.9.35
HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel
-HASERL_LICENSE = GPLv2
+HASERL_LICENSE = GPL-2.0
HASERL_LICENSE_FILES = COPYING
HASERL_DEPENDENCIES = host-pkgconf
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index abe57b7..f5bdf4b 100644
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -7,7 +7,7 @@
HIAWATHA_VERSION = 10.5
HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
HIAWATHA_DEPENDENCIES = zlib
-HIAWATHA_LICENSE = GPLv2
+HIAWATHA_LICENSE = GPL-2.0
HIAWATHA_LICENSE_FILES = LICENSE
ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
diff --git a/package/hicolor-icon-theme/hicolor-icon-theme.mk b/package/hicolor-icon-theme/hicolor-icon-theme.mk
index 5e00074..dec75c1 100644
--- a/package/hicolor-icon-theme/hicolor-icon-theme.mk
+++ b/package/hicolor-icon-theme/hicolor-icon-theme.mk
@@ -7,7 +7,7 @@
HICOLOR_ICON_THEME_VERSION = 0.15
HICOLOR_ICON_THEME_SITE = http://icon-theme.freedesktop.org/releases
HICOLOR_ICON_THEME_SOURCE = hicolor-icon-theme-$(HICOLOR_ICON_THEME_VERSION).tar.xz
-HICOLOR_ICON_THEME_LICENSE = GPLv2
+HICOLOR_ICON_THEME_LICENSE = GPL-2.0
HICOLOR_ICON_THEME_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
index cd1be04..5f9aa6f 100644
--- a/package/hplip/hplip.mk
+++ b/package/hplip/hplip.mk
@@ -8,7 +8,7 @@ HPLIP_VERSION = 3.16.11
HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
HPLIP_AUTORECONF = YES
HPLIP_DEPENDENCIES = cups libusb jpeg host-pkgconf
-HPLIP_LICENSE = GPLv2, BSD-3c, MIT
+HPLIP_LICENSE = GPL-2.0, BSD-3c, MIT
HPLIP_LICENSE_FILES = COPYING
HPLIP_CONF_OPTS = \
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
index dd3bed4..d06e4a5 100644
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -9,7 +9,7 @@ HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION)
HTOP_DEPENDENCIES = ncurses
# Prevent htop build system from searching the host paths
HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
-HTOP_LICENSE = GPLv2
+HTOP_LICENSE = GPL-2.0
HTOP_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
diff --git a/package/httping/httping.mk b/package/httping/httping.mk
index 3418ffa..e1c686f 100644
--- a/package/httping/httping.mk
+++ b/package/httping/httping.mk
@@ -7,7 +7,7 @@
HTTPING_VERSION = 2.5
HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz
HTTPING_SITE = http://www.vanheusden.com/httping
-HTTPING_LICENSE = GPLv2
+HTTPING_LICENSE = GPL-2.0
HTTPING_LICENSE_FILES = license.txt
HTTPING_LDFLAGS = $(TARGET_LDFLAGS) \
$(if $(BR2_NEEDS_GETTEXT),-lintl) \
diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk
index f8cffcd..4ad8d42 100644
--- a/package/hwdata/hwdata.mk
+++ b/package/hwdata/hwdata.mk
@@ -8,7 +8,7 @@ HWDATA_VERSION = 0.267
HWDATA_SOURCE = hwdata_$(HWDATA_VERSION).orig.tar.gz
HWDATA_PATCH = hwdata_$(HWDATA_VERSION)-1.diff.gz
HWDATA_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/hwdata
-HWDATA_LICENSE = GPLv2+ or XFree86 1.0 license
+HWDATA_LICENSE = GPL-2.0+ or XFree86 1.0 license
HWDATA_LICENSE_FILES = COPYING LICENSE
define HWDATA_INSTALL_TARGET_CMDS
diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk
index e16b940..1995ca2 100644
--- a/package/i2c-tools/i2c-tools.mk
+++ b/package/i2c-tools/i2c-tools.mk
@@ -6,7 +6,7 @@
I2C_TOOLS_VERSION = v3.1.2
I2C_TOOLS_SITE = git://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git
-I2C_TOOLS_LICENSE = GPLv2+, GPLv2 (py-smbus)
+I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus)
I2C_TOOLS_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_PYTHON),y)
diff --git a/package/i7z/i7z.mk b/package/i7z/i7z.mk
index e21fd9f..9c2c673 100644
--- a/package/i7z/i7z.mk
+++ b/package/i7z/i7z.mk
@@ -6,7 +6,7 @@
I7Z_VERSION = 5023138d7c35c4667c938b853e5ea89737334e92
I7Z_SITE = $(call github,ajaiantilal,i7z,$(I7Z_VERSION))
-I7Z_LICENSE = GPLv2
+I7Z_LICENSE = GPL-2.0
I7Z_LICENSE_FILES = COPYING
I7Z_DEPENDENCIES = ncurses
diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index 9f0feba..b569320 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -6,7 +6,7 @@
IFPLUGD_VERSION = 0.28
IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd
-IFPLUGD_LICENSE = GPLv2
+IFPLUGD_LICENSE = GPL-2.0
IFPLUGD_LICENSE_FILES = LICENSE
IFPLUGD_AUTORECONF = YES
diff --git a/package/iftop/iftop.mk b/package/iftop/iftop.mk
index 042f2b2..664c725 100644
--- a/package/iftop/iftop.mk
+++ b/package/iftop/iftop.mk
@@ -7,7 +7,7 @@
IFTOP_VERSION = 1.0pre4
IFTOP_SITE = http://www.ex-parrot.com/pdw/iftop/download
IFTOP_DEPENDENCIES = ncurses libpcap
-IFTOP_LICENSE = GPLv2+
+IFTOP_LICENSE = GPL-2.0+
IFTOP_LICENSE_FILES = COPYING
IFTOP_LIBS = -lpcap
diff --git a/package/ifupdown/ifupdown.mk b/package/ifupdown/ifupdown.mk
index ad0e513..dfc3f3c 100644
--- a/package/ifupdown/ifupdown.mk
+++ b/package/ifupdown/ifupdown.mk
@@ -8,7 +8,7 @@ IFUPDOWN_VERSION = 0.8.16
IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz
IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown
IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-IFUPDOWN_LICENSE = GPLv2+
+IFUPDOWN_LICENSE = GPL-2.0+
IFUPDOWN_LICENSE_FILES = COPYING
define IFUPDOWN_BUILD_CMDS
diff --git a/package/igd2-for-linux/igd2-for-linux.mk b/package/igd2-for-linux/igd2-for-linux.mk
index 8944c05..68b64f1 100644
--- a/package/igd2-for-linux/igd2-for-linux.mk
+++ b/package/igd2-for-linux/igd2-for-linux.mk
@@ -7,7 +7,7 @@
IGD2_FOR_LINUX_VERSION = v1.2
IGD2_FOR_LINUX_SITE = $(call github,ffontaine,igd2-for-linux,$(IGD2_FOR_LINUX_VERSION))
-IGD2_FOR_LINUX_LICENSE = GPLv2
+IGD2_FOR_LINUX_LICENSE = GPL-2.0
IGD2_FOR_LINUX_LICENSE_FILES = linuxigd2/doc/LICENSE
IGD2_FOR_LINUX_DEPENDENCIES = libupnp
diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
index 32c49a3..075ce97 100644
--- a/package/igh-ethercat/igh-ethercat.mk
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -7,7 +7,7 @@
IGH_ETHERCAT_VERSION = 1.5.2
IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat
IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
-IGH_ETHERCAT_LICENSE = GPLv2 (IgH EtherCAT master), LGPLv2.1 (libraries)
+IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPLv2.1 (libraries)
IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER
IGH_ETHERCAT_INSTALL_STAGING = YES
diff --git a/package/igmpproxy/igmpproxy.mk b/package/igmpproxy/igmpproxy.mk
index 9816872..545a17e 100644
--- a/package/igmpproxy/igmpproxy.mk
+++ b/package/igmpproxy/igmpproxy.mk
@@ -7,7 +7,7 @@
IGMPPROXY_VERSION = a731683d1a65956fa05024b0597b105fe6a3a122
IGMPPROXY_SITE = $(call github,pali,igmpproxy,$(IGMPPROXY_VERSION))
IGMPPROXY_AUTORECONF = YES
-IGMPPROXY_LICENSE = GPLv2+
+IGMPPROXY_LICENSE = GPL-2.0+
IGMPPROXY_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
index f23955b..5e26785 100644
--- a/package/inadyn/inadyn.mk
+++ b/package/inadyn/inadyn.mk
@@ -6,7 +6,7 @@
INADYN_VERSION = v2.0
INADYN_SITE = $(call github,troglobit,inadyn,$(INADYN_VERSION))
-INADYN_LICENSE = GPLv2+
+INADYN_LICENSE = GPL-2.0+
INADYN_LICENSE_FILES = COPYING
INADYN_AUTORECONF = YES
INADYN_DEPENDENCIES = host-pkgconf libconfuse libite
diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
index 81e913d..6189b3e 100644
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -8,7 +8,7 @@ INPUT_TOOLS_VERSION = 20051019
INPUT_TOOLS_SOURCE = joystick_$(INPUT_TOOLS_VERSION).orig.tar.gz
INPUT_TOOLS_PATCH = joystick_$(INPUT_TOOLS_VERSION)-5.diff.gz
INPUT_TOOLS_SITE = http://snapshot.debian.org/archive/debian/20101023T043132Z/pool/main/j/joystick
-INPUT_TOOLS_LICENSE = GPLv2+
+INPUT_TOOLS_LICENSE = GPL-2.0+
INPUT_TOOLS_LICENSE_FILES = utils/Makefile
INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach
diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
index dbef80f..8595544 100644
--- a/package/intltool/intltool.mk
+++ b/package/intltool/intltool.mk
@@ -6,7 +6,7 @@
INTLTOOL_VERSION = 0.51.0
INTLTOOL_SITE = https://launchpad.net/intltool/trunk/$(INTLTOOL_VERSION)/+download
-INTLTOOL_LICENSE = GPLv2+
+INTLTOOL_LICENSE = GPL-2.0+
INTLTOOL_LICENSE_FILES = COPYING
HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl
diff --git a/package/iotop/iotop.mk b/package/iotop/iotop.mk
index 31787c5..8b55649 100644
--- a/package/iotop/iotop.mk
+++ b/package/iotop/iotop.mk
@@ -6,7 +6,7 @@
IOTOP_VERSION = 0.6
IOTOP_SITE = http://guichaz.free.fr/iotop/files
-IOTOP_LICENSE = GPLv2+
+IOTOP_LICENSE = GPL-2.0+
IOTOP_LICENSE_FILES = COPYING
IOTOP_SETUP_TYPE = distutils
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 5ea5299..6ecfc09 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -9,7 +9,7 @@ IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
$(if $(BR2_PACKAGE_LIBMNL),libmnl)
-IPROUTE2_LICENSE = GPLv2
+IPROUTE2_LICENSE = GPL-2.0
IPROUTE2_LICENSE_FILES = COPYING
# If both iproute2 and busybox are selected, make certain we win
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index d4b01d9..88415f6 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -9,7 +9,7 @@ IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
IPSET_SITE = http://ipset.netfilter.org
IPSET_DEPENDENCIES = libmnl host-pkgconf
IPSET_CONF_OPTS = --with-kmod=no
-IPSET_LICENSE = GPLv2
+IPSET_LICENSE = GPL-2.0
IPSET_LICENSE_FILES = COPYING
IPSET_INSTALL_STAGING = YES
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 90fab34..44cfde2 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -10,7 +10,7 @@ IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
IPTABLES_INSTALL_STAGING = YES
IPTABLES_DEPENDENCIES = host-pkgconf \
$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
-IPTABLES_LICENSE = GPLv2
+IPTABLES_LICENSE = GPL-2.0
IPTABLES_LICENSE_FILES = COPYING
# Building static causes ugly warnings on some plugins
IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \
diff --git a/package/iptraf-ng/iptraf-ng.mk b/package/iptraf-ng/iptraf-ng.mk
index a36c708..ac572b9 100644
--- a/package/iptraf-ng/iptraf-ng.mk
+++ b/package/iptraf-ng/iptraf-ng.mk
@@ -6,7 +6,7 @@
IPTRAF_NG_VERSION = 1.1.4
IPTRAF_NG_SITE = https://fedorahosted.org/releases/i/p/iptraf-ng
-IPTRAF_NG_LICENSE = GPLv2+
+IPTRAF_NG_LICENSE = GPL-2.0+
IPTRAF_NG_LICENSE_FILES = LICENSE
IPTRAF_NG_DEPENDENCIES = ncurses
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 21f5dcb..34c0a27 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -13,7 +13,7 @@
IPUTILS_VERSION = 55828d1fef3fed7f07abcbf7be9282a9662e78c7
IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))
-IPUTILS_LICENSE = GPLv2+, BSD-3c, BSD-4c
+IPUTILS_LICENSE = GPL-2.0+, BSD-3c, BSD-4c
# Only includes a license file for BSD
IPUTILS_LICENSE_FILES = ninfod/COPYING
diff --git a/package/iqvlinux/iqvlinux.mk b/package/iqvlinux/iqvlinux.mk
index b3981fa..5ceaaf4 100644
--- a/package/iqvlinux/iqvlinux.mk
+++ b/package/iqvlinux/iqvlinux.mk
@@ -8,7 +8,7 @@ IQVLINUX_VERSION = 1.1.5.3
IQVLINUX_SITE = http://sourceforge.net/projects/e1000/files/iqvlinux/$(IQVLINUX_VERSION)
IQVLINUX_SOURCE = iqvlinux.tar.gz
-IQVLINUX_LICENSE = GPLv2, BSD-3c
+IQVLINUX_LICENSE = GPL-2.0, BSD-3c
IQVLINUX_LICENSE_FILES = \
COPYING src/linux/driver/files.txt \
inc/linux/files.txt inc/files.txt
diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
index 4b17007..18a3e58 100644
--- a/package/irda-utils/irda-utils.mk
+++ b/package/irda-utils/irda-utils.mk
@@ -6,7 +6,7 @@
IRDA_UTILS_VERSION = 0.9.18
IRDA_UTILS_SITE = http://downloads.sourceforge.net/project/irda/irda-utils/$(IRDA_UTILS_VERSION)
-IRDA_UTILS_LICENSE = GPLv2+
+IRDA_UTILS_LICENSE = GPL-2.0+
IRDA_UTILS_LICENSE_FILES = man/COPYING
IRDA_UTILS_CFLAGS = $(TARGET_CFLAGS) -I.
diff --git a/package/irqbalance/irqbalance.mk b/package/irqbalance/irqbalance.mk
index 1872c88..e4e6078 100644
--- a/package/irqbalance/irqbalance.mk
+++ b/package/irqbalance/irqbalance.mk
@@ -6,7 +6,7 @@
IRQBALANCE_VERSION = v1.0.9
IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,$(IRQBALANCE_VERSION))
-IRQBALANCE_LICENSE = GPLv2
+IRQBALANCE_LICENSE = GPL-2.0
IRQBALANCE_LICENSE_FILES = COPYING
IRQBALANCE_DEPENDENCIES = host-pkgconf
# Autoreconf needed because package is distributed without a configure script
--git a/package/irssi/irssi.mk b/package/irssi/irssi.mk
index dfb1e28..1fe4de8 100644
--- a/package/irssi/irssi.mk
+++ b/package/irssi/irssi.mk
@@ -9,7 +9,7 @@ IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz
# Do not use the github helper here. The generated tarball is *NOT* the
# same as the one uploaded by upstream for the release.
IRSSI_SITE = https://github.com/irssi/irssi/releases/download/$(IRSSI_VERSION)
-IRSSI_LICENSE = GPLv2+
+IRSSI_LICENSE = GPL-2.0+
IRSSI_LICENSE_FILES = COPYING
IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses openssl
diff --git a/package/iucode-tool/iucode-tool.mk b/package/iucode-tool/iucode-tool.mk
index cee0572..f28698b 100644
--- a/package/iucode-tool/iucode-tool.mk
+++ b/package/iucode-tool/iucode-tool.mk
@@ -11,7 +11,7 @@ ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
IUCODE_TOOL_CONF_ENV = LIBS="-largp"
IUCODE_TOOL_DEPENDENCIES = argp-standalone
endif
-IUCODE_TOOL_LICENSE = GPLv2+
+IUCODE_TOOL_LICENSE = GPL-2.0+
IUCODE_TOOL_LICENSE_FILES = COPYING
define IUCODE_TOOL_INSTALL_INIT_SYSV
diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk
index 23c9723..c877528 100644
--- a/package/jack2/jack2.mk
+++ b/package/jack2/jack2.mk
@@ -6,7 +6,7 @@
JACK2_VERSION = v1.9.10
JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION))
-JACK2_LICENSE = GPLv2+ (jack server), LGPLv2.1+ (jack library)
+JACK2_LICENSE = GPL-2.0+ (jack server), LGPLv2.1+ (jack library)
JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python
JACK2_INSTALL_STAGING = YES
JACK2_PATCH = https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch
diff --git a/package/jamvm/jamvm.mk b/package/jamvm/jamvm.mk
index ee80c80..3fcf460 100644
--- a/package/jamvm/jamvm.mk
+++ b/package/jamvm/jamvm.mk
@@ -6,7 +6,7 @@
JAMVM_VERSION = 2.0.0
JAMVM_SITE = http://downloads.sourceforge.net/project/jamvm/jamvm/JamVM%20$(JAMVM_VERSION)
-JAMVM_LICENSE = GPLv2+
+JAMVM_LICENSE = GPL-2.0+
JAMVM_LICENSE_FILES = COPYING
JAMVM_DEPENDENCIES = zlib classpath
# For 0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch
diff --git a/package/jo/jo.mk b/package/jo/jo.mk
index 5529f55..c325c5c 100644
--- a/package/jo/jo.mk
+++ b/package/jo/jo.mk
@@ -6,7 +6,7 @@
JO_VERSION = 1.0
JO_SITE = https://github.com/jpmens/jo/releases/download/v$(JO_VERSION)
-JO_LICENSE = MIT (json.[ch]), GPLv2+ (rest)
+JO_LICENSE = MIT (json.[ch]), GPL-2.0+ (rest)
JO_LICENSE_FILES = COPYING
# don't build man pages
JO_CONF_ENV = ac_cv_path_PANDOC=''
diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk
index 0243c53..175a237 100644
--- a/package/kbd/kbd.mk
+++ b/package/kbd/kbd.mk
@@ -13,7 +13,7 @@ KBD_CONF_OPTS = \
KBD_DEPENDENCIES = \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
host-pkgconf
-KBD_LICENSE = GPLv2+
+KBD_LICENSE = GPL-2.0+
KBD_LICENSE_FILES = COPYING
KBD_AUTORECONF = YES
diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk
index 35e666a..59d3cb5 100644
--- a/package/keepalived/keepalived.mk
+++ b/package/keepalived/keepalived.mk
@@ -7,7 +7,7 @@
KEEPALIVED_VERSION = 1.3.5
KEEPALIVED_SITE = http://www.keepalived.org/software
KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt
-KEEPALIVED_LICENSE = GPLv2+
+KEEPALIVED_LICENSE = GPL-2.0+
KEEPALIVED_LICENSE_FILES = COPYING
KEEPALIVED_CONF_OPTS += --disable-dbus
diff --git a/package/kexec-lite/kexec-lite.mk b/package/kexec-lite/kexec-lite.mk
index b1b66fd..76b6819 100644
--- a/package/kexec-lite/kexec-lite.mk
+++ b/package/kexec-lite/kexec-lite.mk
@@ -6,7 +6,7 @@
KEXEC_LITE_VERSION = 86e45a47e8cc1f598ccfa9b873a23067f4ecc36f
KEXEC_LITE_SITE = $(call github,antonblanchard,kexec-lite,$(KEXEC_LITE_VERSION))
-KEXEC_LITE_LICENSE = GPLv2+
+KEXEC_LITE_LICENSE = GPL-2.0+
KEXEC_LITE_LICENSE_FILES = COPYING
KEXEC_LITE_DEPENDENCIES = elfutils dtc
diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
index 0a8e9f0..7564103 100644
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -7,7 +7,7 @@
KEXEC_VERSION = 2.0.14
KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz
KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
-KEXEC_LICENSE = GPLv2
+KEXEC_LICENSE = GPL-2.0
KEXEC_LICENSE_FILES = COPYING
# Makefile expects $STRIP -o to work, so needed for BR2_STRIP_none
diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
index 4a8dbac..b7f08ce 100644
--- a/package/keyutils/keyutils.mk
+++ b/package/keyutils/keyutils.mk
@@ -7,7 +7,7 @@
KEYUTILS_VERSION = 1.5.9
KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
-KEYUTILS_LICENSE = GPLv2+, LGPLv2.1+
+KEYUTILS_LICENSE = GPL-2.0+, LGPLv2.1+
KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
KEYUTILS_INSTALL_STAGING = YES
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
index f4a28b8..8abf712 100644
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -9,7 +9,7 @@ KISMET_SITE = http://www.kismetwireless.net/kismet.git
KISMET_SITE_METHOD = git
KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses libnl
KISMET_CONF_OPTS += --with-netlink-version=3
-KISMET_LICENSE = GPLv2+
+KISMET_LICENSE = GPL-2.0+
KISMET_LICENSE_FILES = debian/copyright
# We touch configure.in:
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index b6553bd..e2fbfa8 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -46,7 +46,7 @@ endif
ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y)
# add license info for kmod tools
-KMOD_LICENSE := $(KMOD_LICENSE), GPLv2+ (tools)
+KMOD_LICENSE := $(KMOD_LICENSE), GPL-2.0+ (tools)
KMOD_LICENSE_FILES += COPYING
# take precedence over busybox implementation
diff --git a/package/knock/knock.mk b/package/knock/knock.mk
index 2ab8d1b..55f5bfd 100644
--- a/package/knock/knock.mk
+++ b/package/knock/knock.mk
@@ -7,7 +7,7 @@
KNOCK_VERSION = 258a27e5a47809f97c2b9f2751a88c2f94aae891
KNOCK_SITE = $(call github,jvinet,knock,$(KNOCK_VERSION))
KNOCK_AUTORECONF = YES
-KNOCK_LICENSE = GPLv2+
+KNOCK_LICENSE = GPL-2.0+
KNOCK_LICENSE_FILES = COPYING
KNOCK_DEPENDENCIES = libpcap
diff --git a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
index 581223c..d29e07c 100644
--- a/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
+++ b/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
@@ -6,7 +6,7 @@
KODI_AUDIODECODER_MODPLUG_VERSION = 03b772da7ea44ff3c34b322989254cd1e4732443
KODI_AUDIODECODER_MODPLUG_SITE = $(call github,notspiff,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION))
-KODI_AUDIODECODER_MODPLUG_LICENSE = GPLv2+
+KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+
KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = src/ModplugCodec.cpp
KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi-platform libmodplug
diff --git a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
index 49688a4..6aa268e 100644
--- a/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
+++ b/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
@@ -6,7 +6,7 @@
KODI_AUDIODECODER_NOSEFART_VERSION = bfab543bae0d9855538cf03e78ea9cd5e3b9750e
KODI_AUDIODECODER_NOSEFART_SITE = $(call github,notspiff,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION))
-KODI_AUDIODECODER_NOSEFART_LICENSE = GPLv2+
+KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+
KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = src/NSFCodec.cpp
KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk b/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk
index efe17f3..828b9f0 100644
--- a/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk
+++ b/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk
@@ -6,7 +6,7 @@
KODI_AUDIODECODER_OPUS_VERSION = 0bd11e35e6ed8b6480e4100ac8927113cb085eda
KODI_AUDIODECODER_OPUS_SITE = $(call github,notspiff,audiodecoder.opus,$(KODI_AUDIODECODER_OPUS_VERSION))
-KODI_AUDIODECODER_OPUS_LICENSE = GPLv2+
+KODI_AUDIODECODER_OPUS_LICENSE = GPL-2.0+
KODI_AUDIODECODER_OPUS_LICENSE_FILES = src/OpusCodec.cpp
KODI_AUDIODECODER_OPUS_DEPENDENCIES = kodi-platform libogg opus opusfile
diff --git a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
index d8cf438..54df9a1 100644
--- a/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
+++ b/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
@@ -6,7 +6,7 @@
KODI_AUDIODECODER_SIDPLAY_VERSION = d832f050211b4e5f085a8b09bc7d26ce32098169
KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,notspiff,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION))
-KODI_AUDIODECODER_SIDPLAY_LICENSE = GPLv2+
+KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+
KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = src/SIDCodec.cpp
KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi-platform libsidplay2
diff --git a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
index f9f398c..9ffb004 100644
--- a/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
+++ b/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
@@ -6,7 +6,7 @@
KODI_AUDIODECODER_SNESAPU_VERSION = db62e88e568994a0496d7026a10e044d70b3aa2b
KODI_AUDIODECODER_SNESAPU_SITE = $(call github,notspiff,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION))
-KODI_AUDIODECODER_SNESAPU_LICENSE = GPLv2+
+KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+
KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = src/SPCCodec.cpp
KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
index 7601089..5fcfe71 100644
--- a/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
+++ b/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
@@ -6,7 +6,7 @@
KODI_AUDIODECODER_STSOUND_VERSION = 759ae7eadb94adfde8533a2a42d949c321718625
KODI_AUDIODECODER_STSOUND_SITE = $(call github,notspiff,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION))
-KODI_AUDIODECODER_STSOUND_LICENSE = GPLv2+
+KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+
KODI_AUDIODECODER_STSOUND_LICENSE_FILES = src/YMCodec.cpp
KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
index fb680d1..0d5f6ef 100644
--- a/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
+++ b/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
@@ -6,7 +6,7 @@
KODI_AUDIODECODER_TIMIDITY_VERSION = a84559da92aa67744069fc9e9dc885732588c8ce
KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,notspiff,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION))
-KODI_AUDIODECODER_TIMIDITY_LICENSE = GPLv2+
+KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+
KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = src/TimidityCodec.cpp
KODI_AUDIODECODER_TIMIDITY_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
index 447d837..68f5884 100644
--- a/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
+++ b/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
@@ -6,7 +6,7 @@
KODI_AUDIODECODER_VGMSTREAM_VERSION = cb2892ac0465b0563ee45f532323198a6f722b62
KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,notspiff,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION))
-KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPLv2+
+KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+
KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = src/VGMCodec.cpp
KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
index ca48826..402db10 100644
--- a/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
+++ b/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
@@ -6,7 +6,7 @@
KODI_AUDIOENCODER_FLAC_VERSION = v1.0.0
KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION))
-KODI_AUDIOENCODER_FLAC_LICENSE = GPLv2+
+KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+
KODI_AUDIOENCODER_FLAC_LICENSE_FILES = src/EncoderFlac.cpp
KODI_AUDIOENCODER_FLAC_DEPENDENCIES = flac kodi libogg host-pkgconf
diff --git a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
index 3e1836f..1edefa4 100644
--- a/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
+++ b/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
@@ -6,7 +6,7 @@
KODI_AUDIOENCODER_LAME_VERSION = v1.0.0
KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION))
-KODI_AUDIOENCODER_LAME_LICENSE = GPLv2+
+KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+
KODI_AUDIOENCODER_LAME_LICENSE_FILES = src/EncoderLame.cpp
KODI_AUDIOENCODER_LAME_DEPENDENCIES = kodi lame
KODI_AUDIOENCODER_LAME_CONF_OPTS += \
diff --git a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
index 749ea8e..f6db818 100644
--- a/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
+++ b/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
@@ -6,7 +6,7 @@
KODI_AUDIOENCODER_VORBIS_VERSION = v1.0.0
KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION))
-KODI_AUDIOENCODER_VORBIS_LICENSE = GPLv2+
+KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+
KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = src/EncoderVorbis.cpp
KODI_AUDIOENCODER_VORBIS_DEPENDENCIES = kodi libogg libvorbis host-pkgconf
diff --git a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
index 661ab44..9005bf3 100644
--- a/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
+++ b/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
@@ -6,7 +6,7 @@
KODI_AUDIOENCODER_WAV_VERSION = v1.0.0
KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION))
-KODI_AUDIOENCODER_WAV_LICENSE = GPLv2+
+KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+
KODI_AUDIOENCODER_WAV_LICENSE_FILES = src/EncoderWav.cpp
KODI_AUDIOENCODER_WAV_DEPENDENCIES = kodi
diff --git a/package/kodi-platform/kodi-platform.mk b/package/kodi-platform/kodi-platform.mk
index 4b642f9..9658918 100644
--- a/package/kodi-platform/kodi-platform.mk
+++ b/package/kodi-platform/kodi-platform.mk
@@ -6,7 +6,7 @@
KODI_PLATFORM_VERSION = 45d6ad1984fdb1dc855076ff18484dbec33939d1
KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION))
-KODI_PLATFORM_LICENSE = GPLv2+
+KODI_PLATFORM_LICENSE = GPL-2.0+
KODI_PLATFORM_LICENSE_FILES = src/util/XMLUtils.h
KODI_PLATFORM_INSTALL_STAGING = YES
KODI_PLATFORM_DEPENDENCIES = libplatform kodi
diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
index 3c0f40a..2250511 100644
--- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
+++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_ARGUSTV_VERSION = 2aca01c6db28fe3145b57eb5bf5841895c618507
KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION))
-KODI_PVR_ARGUSTV_LICENSE = GPLv2+
+KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+
KODI_PVR_ARGUSTV_LICENSE_FILES = src/client.h
KODI_PVR_ARGUSTV_DEPENDENCIES = jsoncpp kodi-platform
diff --git a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
index 75ce621..59c8926 100644
--- a/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
+++ b/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_DVBLINK_VERSION = 06c4e5603e4db0bda3f35e80344a308f486ae0f9
KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION))
-KODI_PVR_DVBLINK_LICENSE = GPLv2+
+KODI_PVR_DVBLINK_LICENSE = GPL-2.0+
KODI_PVR_DVBLINK_LICENSE_FILES = src/client.h
KODI_PVR_DVBLINK_DEPENDENCIES = kodi-platform tinyxml2
diff --git a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
index b2fae52..66a7496 100644
--- a/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
+++ b/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_DVBVIEWER_VERSION = 26286604635a170eeea68df9b7eb52fea0056cfe
KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION))
-KODI_PVR_DVBVIEWER_LICENSE = GPLv2+
+KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+
KODI_PVR_DVBVIEWER_LICENSE_FILES = src/client.h
KODI_PVR_DVBVIEWER_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
index 0174aa4..fcf8a28 100644
--- a/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
+++ b/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_FILMON_VERSION = 4b34b41999b86e675f794ec8e5a63c85b78c001e
KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION))
-KODI_PVR_FILMON_LICENSE = GPLv2+
+KODI_PVR_FILMON_LICENSE = GPL-2.0+
KODI_PVR_FILMON_LICENSE_FILES = src/client.h
KODI_PVR_FILMON_DEPENDENCIES = jsoncpp kodi-platform
diff --git a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
index 67980fb..821ab36 100644
--- a/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
+++ b/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_HDHOMERUN_VERSION = aa4324eaa5f738394f21d3f54667e346eb65038e
KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION))
-KODI_PVR_HDHOMERUN_LICENSE = GPLv2+
+KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+
KODI_PVR_HDHOMERUN_LICENSE_FILES = src/client.h
KODI_PVR_HDHOMERUN_DEPENDENCIES = jsoncpp kodi-platform libhdhomerun
diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk
index 4ca5a31..5a6a36c 100644
--- a/package/kodi-pvr-hts/kodi-pvr-hts.mk
+++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_HTS_VERSION = 3c673b5b29fc26c203c79f7df58680af50a1afa7
KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION))
-KODI_PVR_HTS_LICENSE = GPLv2+
+KODI_PVR_HTS_LICENSE = GPL-2.0+
KODI_PVR_HTS_LICENSE_FILES = src/client.h
KODI_PVR_HTS_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
index 85039dd..fd1e053 100644
--- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
+++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_IPTVSIMPLE_VERSION = ae9bc1d94e97c5381b2fa59adac70a57146016cd
KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION))
-KODI_PVR_IPTVSIMPLE_LICENSE = GPLv2+
+KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+
KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h
KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
index e3a4df4..36b5227 100644
--- a/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
+++ b/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = a3dd464379a56131bae61b94275c14a3abcf2869
KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION))
-KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPLv2+
+KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+
KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = src/client.h
KODI_PVR_MEDIAPORTAL_TVSERVER_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
index a8a1a6d..2c5d07a 100644
--- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
+++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_MYTHTV_VERSION = 84b0b6b122ca779588de5c895ef77b6bc454e859
KODI_PVR_MYTHTV_SITE = $(call github,kodi-pvr,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION))
-KODI_PVR_MYTHTV_LICENSE = GPLv2+
+KODI_PVR_MYTHTV_LICENSE = GPL-2.0+
KODI_PVR_MYTHTV_LICENSE_FILES = src/client.h
KODI_PVR_MYTHTV_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
index a8b8235..a4df90e 100644
--- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
+++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_NEXTPVR_VERSION = 2055105c93e18e04e73c87578bece3edf7525e14
KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION))
-KODI_PVR_NEXTPVR_LICENSE = GPLv2+
+KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+
KODI_PVR_NEXTPVR_LICENSE_FILES = src/client.h
KODI_PVR_NEXTPVR_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
index 0f2eecd..9e4a783 100644
--- a/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
+++ b/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_NJOY_VERSION = 480c1591d486c6166746fb8b5efc68a7aca3d0f0
KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION))
-KODI_PVR_NJOY_LICENSE = GPLv2+
+KODI_PVR_NJOY_LICENSE = GPL-2.0+
KODI_PVR_NJOY_LICENSE_FILES = src/client.h
KODI_PVR_NJOY_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
index a9824d5..fabfee9 100644
--- a/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
+++ b/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_PCTV_VERSION = 0096770e96f84c46f444e159b9b737ac8b4238dc
KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION))
-KODI_PVR_PCTV_LICENSE = GPLv2+
+KODI_PVR_PCTV_LICENSE = GPL-2.0+
KODI_PVR_PCTV_LICENSE_FILES = src/client.h
KODI_PVR_PCTV_DEPENDENCIES = jsoncpp kodi-platform
diff --git a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
index d1fa8a0..ba39152 100644
--- a/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
+++ b/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_STALKER_VERSION = 5e588330c453141ae0a2f4fd9c02d909ac9d199e
KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION))
-KODI_PVR_STALKER_LICENSE = GPLv2+
+KODI_PVR_STALKER_LICENSE = GPL-2.0+
KODI_PVR_STALKER_LICENSE_FILES = src/client.h
KODI_PVR_STALKER_DEPENDENCIES = jsoncpp kodi-platform
diff --git a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
index 593c1e7..8da35a4 100644
--- a/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
+++ b/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_VBOX_VERSION = 15e864d160da5a051e18aef06f3a53e49808be02
KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION))
-KODI_PVR_VBOX_LICENSE = GPLv2+
+KODI_PVR_VBOX_LICENSE = GPL-2.0+
KODI_PVR_VBOX_LICENSE_FILES = src/client.h
KODI_PVR_VBOX_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
index f8e1e92..36bba66 100644
--- a/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
+++ b/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_VDR_VNSI_VERSION = 7e11b853637ec436e30e4ac826de6ee87c303482
KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION))
-KODI_PVR_VDR_VNSI_LICENSE = GPLv2+
+KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+
KODI_PVR_VDR_VNSI_LICENSE_FILES = src/client.h
KODI_PVR_VDR_VNSI_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
index e839bcc..7ac2a13 100644
--- a/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
+++ b/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_VUPLUS_VERSION = 815ea2f303dbe7dd19f87c53965dfdf2358fcdc8
KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION))
-KODI_PVR_VUPLUS_LICENSE = GPLv2+
+KODI_PVR_VUPLUS_LICENSE = GPL-2.0+
KODI_PVR_VUPLUS_LICENSE_FILES = src/client.h
KODI_PVR_VUPLUS_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
index 194bd1f..031df6a 100644
--- a/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
+++ b/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
@@ -8,7 +8,7 @@
# When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_WMC_VERSION = 949fcd162206b569af15942180e6c133ad61e336
KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION))
-KODI_PVR_WMC_LICENSE = GPLv2+
+KODI_PVR_WMC_LICENSE = GPL-2.0+
KODI_PVR_WMC_LICENSE_FILES = src/client.h
KODI_PVR_WMC_DEPENDENCIES = kodi-platform
diff --git a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
index 1af1f2e..b2eac1b 100644
--- a/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
+++ b/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
@@ -6,7 +6,7 @@
KODI_SCREENSAVER_ASTEROIDS_VERSION = c7ae05f1881b9abda6a1ac6beaca8d64a164c4fa
KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,notspiff,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION))
-KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPLv2+
+KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+
KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = src/main.cpp
KODI_SCREENSAVER_ASTEROIDS_DEPENDENCIES = kodi
diff --git a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
index dce6968..8e10a57 100644
--- a/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
+++ b/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
@@ -6,7 +6,7 @@
KODI_SCREENSAVER_BIOGENESIS_VERSION = 39928eef56ed639085d401dd97bf18f44b1f3e8b
KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,notspiff,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION))
-KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPLv2+
+KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPL-2.0+
KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = src/Life.cpp
KODI_SCREENSAVER_BIOGENESIS_DEPENDENCIES = kodi
diff --git a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
index bf67ea0..0fc5c53 100644
--- a/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
+++ b/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
@@ -6,7 +6,7 @@
KODI_SCREENSAVER_CPBLOBS_VERSION = 87a3abfbe6e4fd1089548eab77a84902d0e1af60
KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,notspiff,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION))
-KODI_SCREENSAVER_CPBLOBS_LICENSE = GPLv2
+KODI_SCREENSAVER_CPBLOBS_LICENSE = GPL-2.0
KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE
KODI_SCREENSAVER_CPBLOBS_DEPENDENCIES = kodi libsoil
diff --git a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
index 49ddb43..2e0209f 100644
--- a/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
+++ b/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
@@ -6,7 +6,7 @@
KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 2e7c10e3543f5aaab6fd2f5aa9d05b976a43ba68
KODI_SCREENSAVER_CRYSTALMORPH_SITE = $(call github,notspiff,screensaver.crystalmorph,$(KODI_SCREENSAVER_CRYSTALMORPH_VERSION))
-KODI_SCREENSAVER_CRYSTALMORPH_LICENSE = GPLv2+
+KODI_SCREENSAVER_CRYSTALMORPH_LICENSE = GPL-2.0+
KODI_SCREENSAVER_CRYSTALMORPH_LICENSE_FILES = src/Fractal.cpp
KODI_SCREENSAVER_CRYSTALMORPH_DEPENDENCIES = kodi
diff --git a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
index 9773bac..7b00012 100644
--- a/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
+++ b/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
@@ -6,7 +6,7 @@
KODI_SCREENSAVER_GREYNETIC_VERSION = 80e850eb3cbc7ee2c937fcab666dc45d2b2ee0bb
KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,notspiff,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION))
-KODI_SCREENSAVER_GREYNETIC_LICENSE = GPLv2+
+KODI_SCREENSAVER_GREYNETIC_LICENSE = GPL-2.0+
KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = src/GreyNetic.cpp
KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = kodi
diff --git a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
index 5ecacdf..b67ee4a 100644
--- a/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
+++ b/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
@@ -6,7 +6,7 @@
KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 16057e7195f930109f0a4aea999296ca315700e5
KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,notspiff,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION))
-KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPLv2+
+KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+
KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = src/matrixtrails.cpp
KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi libsoil
diff --git a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
index 2adf960..db8e275 100644
--- a/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
+++ b/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
@@ -6,7 +6,7 @@
KODI_SCREENSAVER_PINGPONG_VERSION = 5c7cf6fd9f9ff1468f620bb891e66bebd3a5fe17
KODI_SCREENSAVER_PINGPONG_SITE = $(call github,notspiff,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION))
-KODI_SCREENSAVER_PINGPONG_LICENSE = GPLv2+
+KODI_SCREENSAVER_PINGPONG_LICENSE = GPL-2.0+
KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = src/readme.txt
KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = kodi
diff --git a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
index f904052..25c2bbd 100644
--- a/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
+++ b/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
@@ -6,7 +6,7 @@
KODI_SCREENSAVER_PYRO_VERSION = 2476b77d9954980a27e07eb8eb0727e2af226351
KODI_SCREENSAVER_PYRO_SITE = $(call github,notspiff,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION))
-KODI_SCREENSAVER_PYRO_LICENSE = GPLv2+
+KODI_SCREENSAVER_PYRO_LICENSE = GPL-2.0+
KODI_SCREENSAVER_PYRO_LICENSE_FILES = src/Pyro.cpp
KODI_SCREENSAVER_PYRO_DEPENDENCIES = kodi
diff --git a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
index b5b5206..da5fb5c 100644
--- a/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
+++ b/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
@@ -6,7 +6,7 @@
KODI_SCREENSAVER_STARS_VERSION = 28bf79d4dce040e9fbdc25f51007e13950cab937
KODI_SCREENSAVER_STARS_SITE = $(call github,notspiff,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION))
-KODI_SCREENSAVER_STARS_LICENSE = GPLv2+
+KODI_SCREENSAVER_STARS_LICENSE = GPL-2.0+
KODI_SCREENSAVER_STARS_LICENSE_FILES = src/StarField.cpp
KODI_SCREENSAVER_STARS_DEPENDENCIES = kodi
diff --git a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
index 1e07774..92c9190 100644
--- a/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
+++ b/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
@@ -6,7 +6,7 @@
KODI_VISUALISATION_FISHBMC_VERSION = 50c38c296a62e096a2216e43b86d864ee265c506
KODI_VISUALISATION_FISHBMC_SITE = $(call github,notspiff,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION))
-KODI_VISUALISATION_FISHBMC_LICENSE = GPLv2+
+KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+
KODI_VISUALISATION_FISHBMC_LICENSE_FILES = visualization.fishbmc/LICENSE
KODI_VISUALISATION_FISHBMC_DEPENDENCIES = kodi
diff --git a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
index 89f2bab..e769505 100644
--- a/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
+++ b/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
@@ -6,7 +6,7 @@
KODI_VISUALISATION_GOOM_VERSION = 16747b7dba9cbdcfdc8df44e849eaf09450fc86f
KODI_VISUALISATION_GOOM_SITE = $(call github,notspiff,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION))
-KODI_VISUALISATION_GOOM_LICENSE = GPLv2+
+KODI_VISUALISATION_GOOM_LICENSE = GPL-2.0+
KODI_VISUALISATION_GOOM_LICENSE_FILES = src/Main.cpp
KODI_VISUALISATION_GOOM_DEPENDENCIES = kodi
diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
index e5f2d91..527c5e4 100644
--- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
+++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
@@ -6,7 +6,7 @@
KODI_VISUALISATION_SHADERTOY_VERSION = f9988007681bf37e6c03d6992bae30133b020608
KODI_VISUALISATION_SHADERTOY_SITE = $(call github,notspiff,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION))
-KODI_VISUALISATION_SHADERTOY_LICENSE = GPLv2+
+KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+
KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = src/main.cpp
KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = kodi libplatform
diff --git a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
index de197eb..ebc7577 100644
--- a/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
+++ b/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
@@ -6,7 +6,7 @@
KODI_VISUALISATION_SPECTRUM_VERSION = 9dbe53a0db73f00ee22e9ca235c98f8137b7bb9e
KODI_VISUALISATION_SPECTRUM_SITE = $(call github,notspiff,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION))
-KODI_VISUALISATION_SPECTRUM_LICENSE = GPLv2+
+KODI_VISUALISATION_SPECTRUM_LICENSE = GPL-2.0+
KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = COPYING
KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = kodi
diff --git a/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk b/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk
index 28eeb4d..ce0fc18 100644
--- a/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk
+++ b/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk
@@ -6,7 +6,7 @@
KODI_VISUALISATION_WAVEFORHUE_VERSION = e87d5c7d7e7504036b80af8bc89f4cf6489085fe
KODI_VISUALISATION_WAVEFORHUE_SITE = $(call github,notspiff,visualization.waveforhue,$(KODI_VISUALISATION_WAVEFORHUE_VERSION))
-KODI_VISUALISATION_WAVEFORHUE_LICENSE = GPLv2+
+KODI_VISUALISATION_WAVEFORHUE_LICENSE = GPL-2.0+
KODI_VISUALISATION_WAVEFORHUE_LICENSE_FILES = COPYING
KODI_VISUALISATION_WAVEFORHUE_DEPENDENCIES = kodi
diff --git a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
index 81e880b..2263b71 100644
--- a/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
+++ b/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
@@ -6,7 +6,7 @@
KODI_VISUALISATION_WAVEFORM_VERSION = 89aec48e2975f820004df5a1a53801339a5b3064
KODI_VISUALISATION_WAVEFORM_SITE = $(call github,notspiff,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION))
-KODI_VISUALISATION_WAVEFORM_LICENSE = GPLv2+
+KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+
KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING
KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = kodi
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index de4d308..ebce84d 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -6,7 +6,7 @@
KODI_VERSION = 16.1-Jarvis
KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
-KODI_LICENSE = GPLv2
+KODI_LICENSE = GPL-2.0
KODI_LICENSE_FILES = LICENSE.GPL
# needed for binary addons
KODI_INSTALL_STAGING = YES
diff --git a/package/ktap/ktap.mk b/package/ktap/ktap.mk
index 966b51c..b9b3dbc 100644
--- a/package/ktap/ktap.mk
+++ b/package/ktap/ktap.mk
@@ -6,7 +6,7 @@
KTAP_VERSION = eb66d40310c93dc82bc8eac889744c1ed1f01f7b
KTAP_SITE = $(call github,ktap,ktap,$(KTAP_VERSION))
-KTAP_LICENSE = GPLv2
+KTAP_LICENSE = GPL-2.0
KTAP_LICENSE_FILES = LICENSE-GPL
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
diff --git a/package/kvmtool/kvmtool.mk b/package/kvmtool/kvmtool.mk
index 12454e1..2789a6e 100644
--- a/package/kvmtool/kvmtool.mk
+++ b/package/kvmtool/kvmtool.mk
@@ -15,7 +15,7 @@ KVMTOOL_DEPENDENCIES = \
$(if $(BR2_PACKAGE_LIBVNCSERVER),libvncserver) \
$(if $(BR2_PACKAGE_SDL),sdl) \
$(if $(BR2_PACKAGE_ZLIB),zlib)
-KVMTOOL_LICENSE = GPLv2
+KVMTOOL_LICENSE = GPL-2.0
KVMTOOL_LICENSE_FILES = COPYING
# This is required to convert a static binary (init helper) back into
diff --git a/package/latencytop/latencytop.mk b/package/latencytop/latencytop.mk
index 644a84f..56afe86 100644
--- a/package/latencytop/latencytop.mk
+++ b/package/latencytop/latencytop.mk
@@ -7,7 +7,7 @@
LATENCYTOP_VERSION = 0.5
LATENCYTOP_SITE = http://www.latencytop.org/download
LATENCYTOP_DEPENDENCIES = libglib2 ncurses
-LATENCYTOP_LICENSE = GPLv2
+LATENCYTOP_LICENSE = GPL-2.0
LATENCYTOP_LICENSE_FILES = latencytop.c
# NOTE: GTK is heavy weight, we intentionally build the text (ncurses)
diff --git a/package/lbreakout2/lbreakout2.mk b/package/lbreakout2/lbreakout2.mk
index 5dc4c71..017d562 100644
--- a/package/lbreakout2/lbreakout2.mk
+++ b/package/lbreakout2/lbreakout2.mk
@@ -7,7 +7,7 @@
LBREAKOUT2_VERSION_MAJOR = 2.6
LBREAKOUT2_VERSION = $(LBREAKOUT2_VERSION_MAJOR).4
LBREAKOUT2_SITE = http://downloads.sourceforge.net/lgames/lbreakout2/$(LBREAKOUT2_VERSION_MAJOR)
-LBREAKOUT2_LICENSE = GPLv2+
+LBREAKOUT2_LICENSE = GPL-2.0+
LBREAKOUT2_LICENSE_FILES = COPYING
LBREAKOUT2_DEPENDENCIES = sdl libpng
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
index 4fbeca1..bd37b7a 100644
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -6,7 +6,7 @@
LCDPROC_VERSION = 0.5.7
LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
-LCDPROC_LICENSE = GPLv2+
+LCDPROC_LICENSE = GPL-2.0+
LCDPROC_LICENSE_FILES = COPYING
LCDPROC_MAKE = $(MAKE1)
diff --git a/package/leafpad/leafpad.mk b/package/leafpad/leafpad.mk
index 9551a75..c6c28d1 100644
--- a/package/leafpad/leafpad.mk
+++ b/package/leafpad/leafpad.mk
@@ -7,7 +7,7 @@
LEAFPAD_VERSION = 0.8.18.1
LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
LEAFPAD_DEPENDENCIES = libgtk2 host-intltool
-LEAFPAD_LICENSE = GPLv2+
+LEAFPAD_LICENSE = GPL-2.0+
LEAFPAD_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libao/libao.mk b/package/libao/libao.mk
index a314c08..501ea0c 100644
--- a/package/libao/libao.mk
+++ b/package/libao/libao.mk
@@ -8,7 +8,7 @@ LIBAO_VERSION = 1.2.0
LIBAO_SITE = http://downloads.xiph.org/releases/ao
LIBAO_DEPENDENCIES = host-pkgconf
LIBAO_INSTALL_STAGING = YES
-LIBAO_LICENSE = GPLv2+
+LIBAO_LICENSE = GPL-2.0+
LIBAO_LICENSE_FILES = COPYING
LIBAO_CONF_OPTS = \
--disable-esd \
diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk
index b5e2172..52d2745 100644
--- a/package/libatomic_ops/libatomic_ops.mk
+++ b/package/libatomic_ops/libatomic_ops.mk
@@ -14,7 +14,7 @@ LIBATOMIC_OPS_AUTORECONF = YES
# covered by an MIT-style license. A few library routines are covered
# by the GNU General Public License. These are put into a separate
# library, libatomic_ops_gpl.a."
-LIBATOMIC_OPS_LICENSE = MIT (main library) / GPLv2+ (gpl extension)
+LIBATOMIC_OPS_LICENSE = MIT (main library) / GPL-2.0+ (gpl extension)
LIBATOMIC_OPS_LICENSE_FILES = doc/LICENSING.txt COPYING
LIBATOMIC_OPS_INSTALL_STAGING = YES
diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk
index 19cc27d..372dc92 100644
--- a/package/libcap-ng/libcap-ng.mk
+++ b/package/libcap-ng/libcap-ng.mk
@@ -6,7 +6,7 @@
LIBCAP_NG_VERSION = 0.7.8
LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng
-LIBCAP_NG_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library)
+LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (library)
LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB
LIBCAP_NG_INSTALL_STAGING = YES
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index bcb5d8c..508f67a 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -7,7 +7,7 @@
LIBCAP_VERSION = 2.25
LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz
-LIBCAP_LICENSE = GPLv2 or BSD-3c
+LIBCAP_LICENSE = GPL-2.0 or BSD-3c
LIBCAP_LICENSE_FILES = License
LIBCAP_DEPENDENCIES = host-libcap host-gperf
diff --git a/package/libcdaudio/libcdaudio.mk b/package/libcdaudio/libcdaudio.mk
index bee1fe3..5d421eb 100644
--- a/package/libcdaudio/libcdaudio.mk
+++ b/package/libcdaudio/libcdaudio.mk
@@ -8,7 +8,7 @@ LIBCDAUDIO_VERSION = 0.99.12p2
LIBCDAUDIO_SITE = http://downloads.sourceforge.net/project/libcdaudio/libcdaudio/$(LIBCDAUDIO_VERSION)
LIBCDAUDIO_INSTALL_STAGING = YES
LIBCDAUDIO_CONFIG_SCRIPTS = libcdaudio-config
-LIBCDAUDIO_LICENSE = GPLv2+
+LIBCDAUDIO_LICENSE = GPL-2.0+
LIBCDAUDIO_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
index c9a05a5..e2b5c1f 100644
--- a/package/libcec/libcec.mk
+++ b/package/libcec/libcec.mk
@@ -6,7 +6,7 @@
LIBCEC_VERSION = 2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd
LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION))
-LIBCEC_LICENSE = GPLv2+
+LIBCEC_LICENSE = GPL-2.0+
LIBCEC_LICENSE_FILES = COPYING
LIBCEC_INSTALL_STAGING = YES
diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk
index ef9b731..03aabec 100644
--- a/package/libcoap/libcoap.mk
+++ b/package/libcoap/libcoap.mk
@@ -7,7 +7,7 @@
LIBCOAP_VERSION = c909bf802034b7762a2182848304b2530e58444f
LIBCOAP_SITE = $(call github,obgm,libcoap,$(LIBCOAP_VERSION))
LIBCOAP_INSTALL_STAGING = YES
-LIBCOAP_LICENSE = GPLv2+ or BSD-2c
+LIBCOAP_LICENSE = GPL-2.0+ or BSD-2c
LIBCOAP_LICENSE_FILES = COPYING LICENSE.GPL LICENSE.BSD
LIBCOAP_CONF_OPTS = --disable-examples
LIBCOAP_AUTORECONF = YES
diff --git a/package/libcue/libcue.mk b/package/libcue/libcue.mk
index 7012453..e6ee7fe 100644
--- a/package/libcue/libcue.mk
+++ b/package/libcue/libcue.mk
@@ -6,7 +6,7 @@
LIBCUE_VERSION = v1.4.0
LIBCUE_SITE = $(call github,lipnitsk,libcue,$(LIBCUE_VERSION))
-LIBCUE_LICENSE = GPLv2, BSD-2c (rem.c)
+LIBCUE_LICENSE = GPL-2.0, BSD-2c (rem.c)
LIBCUE_LICENSE_FILES = COPYING
LIBCUE_DEPENDENCIES = host-bison host-flex flex
LIBCUE_INSTALL_STAGING = YES
diff --git a/package/libcuefile/libcuefile.mk b/package/libcuefile/libcuefile.mk
index d1f2448..66b589b 100644
--- a/package/libcuefile/libcuefile.mk
+++ b/package/libcuefile/libcuefile.mk
@@ -8,7 +8,7 @@ LIBCUEFILE_VERSION = r475
LIBCUEFILE_SITE = http://files.musepack.net/source
LIBCUEFILE_SOURCE = libcuefile_$(LIBCUEFILE_VERSION).tar.gz
LIBCUEFILE_INSTALL_STAGING = YES
-LIBCUEFILE_LICENSE = GPLv2+
+LIBCUEFILE_LICENSE = GPL-2.0+
LIBCUEFILE_LICENSE_FILES = COPYING
define LIBCUEFILE_INSTALL_STAGING_INCLUDES
diff --git a/package/libdvbcsa/libdvbcsa.mk b/package/libdvbcsa/libdvbcsa.mk
index dfbb4c2..8b733e7 100644
--- a/package/libdvbcsa/libdvbcsa.mk
+++ b/package/libdvbcsa/libdvbcsa.mk
@@ -6,7 +6,7 @@
LIBDVBCSA_VERSION = 1.1.0
LIBDVBCSA_SITE = http://get.videolan.org/libdvbcsa/$(LIBDVBCSA_VERSION)
-LIBDVBCSA_LICENSE = GPLv2+
+LIBDVBCSA_LICENSE = GPL-2.0+
LIBDVBCSA_LICENSE_FILES = COPYING
LIBDVBCSA_INSTALL_STAGING = YES
diff --git a/package/libdvdcss/libdvdcss.mk b/package/libdvdcss/libdvdcss.mk
index 8e1c929..e5ba3af 100644
--- a/package/libdvdcss/libdvdcss.mk
+++ b/package/libdvdcss/libdvdcss.mk
@@ -8,7 +8,7 @@ LIBDVDCSS_VERSION = 1.4.0
LIBDVDCSS_SOURCE = libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
LIBDVDCSS_SITE = http://www.videolan.org/pub/videolan/libdvdcss/$(LIBDVDCSS_VERSION)
LIBDVDCSS_INSTALL_STAGING = YES
-LIBDVDCSS_LICENSE = GPLv2+
+LIBDVDCSS_LICENSE = GPL-2.0+
LIBDVDCSS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk
index b53f0c8..5cb47ab 100644
--- a/package/libdvdnav/libdvdnav.mk
+++ b/package/libdvdnav/libdvdnav.mk
@@ -9,7 +9,7 @@ LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
LIBDVDNAV_SITE = http://www.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION)
LIBDVDNAV_INSTALL_STAGING = YES
LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf
-LIBDVDNAV_LICENSE = GPLv2+
+LIBDVDNAV_LICENSE = GPL-2.0+
LIBDVDNAV_LICENSE_FILES = COPYING
# 0001-do-not-match-nios2-as-os2.patch
LIBDVDNAV_AUTORECONF = YES
diff --git a/package/libdvdread/libdvdread.mk b/package/libdvdread/libdvdread.mk
index adf79d8..0e335e5 100644
--- a/package/libdvdread/libdvdread.mk
+++ b/package/libdvdread/libdvdread.mk
@@ -8,7 +8,7 @@ LIBDVDREAD_VERSION = 5.0.3
LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
LIBDVDREAD_SITE = http://www.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION)
LIBDVDREAD_INSTALL_STAGING = YES
-LIBDVDREAD_LICENSE = GPLv2+
+LIBDVDREAD_LICENSE = GPL-2.0+
LIBDVDREAD_LICENSE_FILES = COPYING
LIBDVDREAD_CONF_OPTS = --with-libdvdcss
LIBDVDREAD_DEPENDENCIES = libdvdcss host-pkgconf
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index d101f95..04f8672 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -7,7 +7,7 @@
LIBEXOSIP2_VERSION = 3.6.0
LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip
LIBEXOSIP2_INSTALL_STAGING = YES
-LIBEXOSIP2_LICENSE = GPLv2+
+LIBEXOSIP2_LICENSE = GPL-2.0+
LIBEXOSIP2_LICENSE_FILES = COPYING
LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
diff --git a/package/libenca/libenca.mk b/package/libenca/libenca.mk
index b87427a..63b6895 100644
--- a/package/libenca/libenca.mk
+++ b/package/libenca/libenca.mk
@@ -8,7 +8,7 @@ LIBENCA_VERSION = 1.19
LIBENCA_SITE = http://dl.cihar.com/enca
LIBENCA_SOURCE = enca-$(LIBENCA_VERSION).tar.xz
LIBENCA_INSTALL_STAGING = YES
-LIBENCA_LICENSE = GPLv2
+LIBENCA_LICENSE = GPL-2.0
LIBENCA_LICENSE_FILES = COPYING
LIBENCA_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk
index cad2e27..a00d371 100644
--- a/package/libesmtp/libesmtp.mk
+++ b/package/libesmtp/libesmtp.mk
@@ -10,7 +10,7 @@ LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp
LIBESMTP_INSTALL_STAGING = YES
LIBESMTP_CONFIG_SCRIPTS = libesmtp-config
LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
-LIBESMTP_LICENSE = GPLv2+ (examples), LGPLv2.1+ (library)
+LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPLv2.1+ (library)
LIBESMTP_LICENSE_FILES = COPYING COPYING.LIB
$(eval $(autotools-package))
diff --git a/package/libev/libev.mk b/package/libev/libev.mk
index 02bc72c..390cc83 100644
--- a/package/libev/libev.mk
+++ b/package/libev/libev.mk
@@ -7,7 +7,7 @@
LIBEV_VERSION = 4.22
LIBEV_SITE = http://dist.schmorp.de/libev
LIBEV_INSTALL_STAGING = YES
-LIBEV_LICENSE = BSD-2c or GPLv2+
+LIBEV_LICENSE = BSD-2c or GPL-2.0+
LIBEV_LICENSE_FILES = LICENSE
# The 'compatibility' event.h header conflicts with libevent
--git a/package/libfm-extra/libfm-extra.mk b/package/libfm-extra/libfm-extra.mk
index 0e7a7dc..e5ef2f7 100644
--- a/package/libfm-extra/libfm-extra.mk
+++ b/package/libfm-extra/libfm-extra.mk
@@ -8,7 +8,7 @@ LIBFM_EXTRA_VERSION = 1.2.4
LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz
LIBFM_EXTRA_SITE = http://sourceforge.net/projects/pcmanfm/files
LIBFM_EXTRA_DEPENDENCIES = libglib2 host-intltool
-LIBFM_EXTRA_LICENSE = GPLv2+, LGPLv2.1+
+LIBFM_EXTRA_LICENSE = GPL-2.0+, LGPLv2.1+
LIBFM_EXTRA_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
LIBFM_EXTRA_INSTALL_STAGING = YES
LIBFM_EXTRA_CONF_OPTS = --with-extra-only --with-gtk=no
diff --git a/package/libfm/libfm.mk b/package/libfm/libfm.mk
index 633a844..a6c0e74 100644
--- a/package/libfm/libfm.mk
+++ b/package/libfm/libfm.mk
@@ -8,7 +8,7 @@ LIBFM_VERSION = 1.2.4
LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
LIBFM_DEPENDENCIES = menu-cache libglib2 cairo
-LIBFM_LICENSE = GPLv2+, LGPLv2.1+
+LIBFM_LICENSE = GPL-2.0+, LGPLv2.1+
LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
LIBFM_INSTALL_STAGING = YES
diff --git a/package/libfreeimage/libfreeimage.mk b/package/libfreeimage/libfreeimage.mk
index fe79689..e6790b1 100644
--- a/package/libfreeimage/libfreeimage.mk
+++ b/package/libfreeimage/libfreeimage.mk
@@ -7,7 +7,7 @@
LIBFREEIMAGE_VERSION = 3.17.0
LIBFREEIMAGE_SITE = http://downloads.sourceforge.net/freeimage
LIBFREEIMAGE_SOURCE = FreeImage$(subst .,,$(LIBFREEIMAGE_VERSION)).zip
-LIBFREEIMAGE_LICENSE = GPLv2 or GPLv3 or FreeImage Public License
+LIBFREEIMAGE_LICENSE = GPL-2.0 or GPLv3 or FreeImage Public License
LIBFREEIMAGE_LICENSE_FILES = license-gplv2.txt license-gplv3.txt license-fi.txt
LIBFREEIMAGE_INSTALL_STAGING = YES
diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk
index 26aa293..1f058bd 100644
--- a/package/libftdi1/libftdi1.mk
+++ b/package/libftdi1/libftdi1.mk
@@ -9,7 +9,7 @@ LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2
LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download
LIBFTDI1_INSTALL_STAGING = YES
LIBFTDI1_DEPENDENCIES = libusb
-LIBFTDI1_LICENSE = LGPLv2 (libftdi1), GPLv2 with exception (ftdipp1)
+LIBFTDI1_LICENSE = LGPLv2 (libftdi1), GPL-2.0 with exception (ftdipp1)
LIBFTDI1_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LIB
LIBFTDI1_CONF_OPTS = -DDOCUMENTATION=OFF -DEXAMPLES=OFF
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index 57aabcd..cf6912c 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -7,7 +7,7 @@
LIBFUSE_VERSION = 2.9.7
LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION)
-LIBFUSE_LICENSE = GPLv2, LGPLv2.1
+LIBFUSE_LICENSE = GPL-2.0, LGPLv2.1
LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
LIBFUSE_INSTALL_STAGING = YES
LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 074ebb7..8f25491 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -6,7 +6,7 @@
LIBGPG_ERROR_VERSION = 1.27
LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
-LIBGPG_ERROR_LICENSE = GPLv2+, LGPLv2.1+
+LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPLv2.1+
LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB
LIBGPG_ERROR_INSTALL_STAGING = YES
LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk
index 8b3cb2a..b2e890c 100644
--- a/package/libhid/libhid.mk
+++ b/package/libhid/libhid.mk
@@ -9,7 +9,7 @@ LIBHID_SITE = http://sources.buildroot.net
LIBHID_DEPENDENCIES = libusb-compat libusb
LIBHID_INSTALL_STAGING = YES
LIBHID_AUTORECONF = YES
-LIBHID_LICENSE = GPLv2
+LIBHID_LICENSE = GPL-2.0
LIBHID_LICENSE_FILES = COPYING
# configure runs libusb-config for cflags/ldflags. Ensure it picks up
# the target version
diff --git a/package/libid3tag/libid3tag.mk b/package/libid3tag/libid3tag.mk
index 2cd7820..951ae09 100644
--- a/package/libid3tag/libid3tag.mk
+++ b/package/libid3tag/libid3tag.mk
@@ -6,7 +6,7 @@
LIBID3TAG_VERSION = 0.15.1b
LIBID3TAG_SITE = http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION)
-LIBID3TAG_LICENSE = GPLv2+
+LIBID3TAG_LICENSE = GPL-2.0+
LIBID3TAG_LICENSE_FILES = COPYING COPYRIGHT
LIBID3TAG_INSTALL_STAGING = YES
LIBID3TAG_DEPENDENCIES = zlib
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 99c9e2c..d348665 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -10,7 +10,7 @@ LIBIDN_INSTALL_STAGING = YES
LIBIDN_CONF_ENV = EMACS="no"
LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no
LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-LIBIDN_LICENSE = GPLv2+, GPLv3+, LGPLv3+
+LIBIDN_LICENSE = GPL-2.0+, GPLv3+, LGPLv3+
LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3
define LIBIDN_REMOVE_BINARY
diff --git a/package/libiscsi/libiscsi.mk b/package/libiscsi/libiscsi.mk
index 4c8a229..7ce6a47 100644
--- a/package/libiscsi/libiscsi.mk
+++ b/package/libiscsi/libiscsi.mk
@@ -6,7 +6,7 @@
LIBISCSI_VERSION = 1.18.0
LIBISCSI_SITE = $(call github,sahlberg,libiscsi,$(LIBISCSI_VERSION))
-LIBISCSI_LICENSE = GPLv2+, LGPLv2.1+
+LIBISCSI_LICENSE = GPL-2.0+, LGPLv2.1+
LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt
LIBISCSI_INSTALL_STAGING = YES
LIBISCSI_AUTORECONF = YES
diff --git a/package/libkcapi/libkcapi.mk b/package/libkcapi/libkcapi.mk
index 74edf2c..7e518e7 100644
--- a/package/libkcapi/libkcapi.mk
+++ b/package/libkcapi/libkcapi.mk
@@ -8,7 +8,7 @@ LIBKCAPI_VERSION = 79cb80714ebcbae2b9de9bb5aca9a6a546f2f121
LIBKCAPI_SITE = $(call github,smuellerDD,libkcapi,$(LIBKCAPI_VERSION))
LIBKCAPI_AUTORECONF = YES
LIBKCAPI_INSTALL_STAGING = YES
-LIBKCAPI_LICENSE = BSD-3c (library), BSD-3c or GPLv2 (programs)
+LIBKCAPI_LICENSE = BSD-3c (library), BSD-3c or GPL-2.0 (programs)
LIBKCAPI_LICENSE_FILES = COPYING COPYING.gplv2 COPYING.bsd
ifeq ($(BR2_PACKAGE_LIBKCAPI_APPS),y)
diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk
index e29b6ae..58d0ff3 100644
--- a/package/libksba/libksba.mk
+++ b/package/libksba/libksba.mk
@@ -7,7 +7,7 @@
LIBKSBA_VERSION = 1.3.5
LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2
LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba
-LIBKSBA_LICENSE = LGPLv3+ or GPLv2+ (library, headers), GPLv3+ (manual, tests, build system)
+LIBKSBA_LICENSE = LGPLv3+ or GPL-2.0+ (library, headers), GPLv3+ (manual, tests, build system)
LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
LIBKSBA_INSTALL_STAGING = YES
LIBKSBA_DEPENDENCIES = libgpg-error
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 59fced6..a940f21 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -9,7 +9,7 @@ LIBLOCKFILE_SOURCE = liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz
LIBLOCKFILE_SITE = http://snapshot.debian.org/archive/debian/20151026T153523Z/pool/main/libl/liblockfile
LIBLOCKFILE_PATCH = liblockfile_$(LIBLOCKFILE_VERSION)-6.debian.tar.bz2
-LIBLOCKFILE_LICENSE = LGPLv2+, GPLv2+ (dotlockfile)
+LIBLOCKFILE_LICENSE = LGPLv2+, GPL-2.0+ (dotlockfile)
LIBLOCKFILE_LICENSE_FILES = COPYRIGHT
LIBLOCKFILE_INSTALL_STAGING = YES
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
index 9c152f9..0bb64da 100644
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -8,7 +8,7 @@ LIBMAD_VERSION = 0.15.1b
LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION)
LIBMAD_INSTALL_STAGING = YES
LIBMAD_LIBTOOL_PATCH = NO
-LIBMAD_LICENSE = GPLv2+
+LIBMAD_LICENSE = GPL-2.0+
LIBMAD_LICENSE_FILES = COPYING
define LIBMAD_PREVENT_AUTOMAKE
diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk
index 0f757c0..733722f 100644
--- a/package/libmbim/libmbim.mk
+++ b/package/libmbim/libmbim.mk
@@ -7,7 +7,7 @@
LIBMBIM_VERSION = 1.14.0
LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
-LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
+LIBMBIM_LICENSE = LGPLv2+ (library), GPL-2.0+ (programs)
LIBMBIM_LICENSE_FILES = COPYING
LIBMBIM_INSTALL_STAGING = YES
diff --git a/package/libmpd/libmpd.mk b/package/libmpd/libmpd.mk
index 882210c..2aa7ff7 100644
--- a/package/libmpd/libmpd.mk
+++ b/package/libmpd/libmpd.mk
@@ -9,7 +9,7 @@ LIBMPD_VERSION = $(LIBMPD_VERSION_MAJOR).17
LIBMPD_SITE = http://download.sarine.nl/Programs/gmpc/$(LIBMPD_VERSION_MAJOR)
LIBMPD_INSTALL_STAGING = YES
LIBMPD_DEPENDENCIES = libglib2
-LIBMPD_LICENSE = GPLv2+
+LIBMPD_LICENSE = GPL-2.0+
LIBMPD_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libmpeg2/libmpeg2.mk b/package/libmpeg2/libmpeg2.mk
index 124c749..db9b2f8 100644
--- a/package/libmpeg2/libmpeg2.mk
+++ b/package/libmpeg2/libmpeg2.mk
@@ -6,7 +6,7 @@
LIBMPEG2_VERSION = 0.5.1
LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files
-LIBMPEG2_LICENSE = GPLv2+
+LIBMPEG2_LICENSE = GPL-2.0+
LIBMPEG2_LICENSE_FILES = COPYING
LIBMPEG2_INSTALL_STAGING = YES
LIBMPEG2_AUTORECONF = YES
diff --git a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
index ec05f6d..2e9f6b7 100644
--- a/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
+++ b/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
@@ -9,7 +9,7 @@ LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_
LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
-LIBNETFILTER_CONNTRACK_LICENSE = GPLv2+
+LIBNETFILTER_CONNTRACK_LICENSE = GPL-2.0+
LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libnetfilter_cthelper/libnetfilter_cthelper.mk b/package/libnetfilter_cthelper/libnetfilter_cthelper.mk
index 00388a5..61d6acd 100644
--- a/package/libnetfilter_cthelper/libnetfilter_cthelper.mk
+++ b/package/libnetfilter_cthelper/libnetfilter_cthelper.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_CTHELPER_SITE = http://www.netfilter.org/projects/libnetfilter_cthe
LIBNETFILTER_CTHELPER_INSTALL_STAGING = YES
LIBNETFILTER_CTHELPER_DEPENDENCIES = host-pkgconf libmnl
LIBNETFILTER_CTHELPER_AUTORECONF = YES
-LIBNETFILTER_CTHELPER_LICENSE = GPLv2+
+LIBNETFILTER_CTHELPER_LICENSE = GPL-2.0+
LIBNETFILTER_CTHELPER_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
index d85a8d2..9c4c951 100644
--- a/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
+++ b/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_ctt
LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES
LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl
LIBNETFILTER_CTTIMEOUT_AUTORECONF = YES
-LIBNETFILTER_CTTIMEOUT_LICENSE = GPLv2+
+LIBNETFILTER_CTTIMEOUT_LICENSE = GPL-2.0+
LIBNETFILTER_CTTIMEOUT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libnetfilter_log/libnetfilter_log.mk b/package/libnetfilter_log/libnetfilter_log.mk
index a448c54..bcf755e 100644
--- a/package/libnetfilter_log/libnetfilter_log.mk
+++ b/package/libnetfilter_log/libnetfilter_log.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files
LIBNETFILTER_LOG_INSTALL_STAGING = YES
LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libnfnetlink
LIBNETFILTER_LOG_AUTORECONF = YES
-LIBNETFILTER_LOG_LICENSE = GPLv2+
+LIBNETFILTER_LOG_LICENSE = GPL-2.0+
LIBNETFILTER_LOG_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libnetfilter_queue/libnetfilter_queue.mk b/package/libnetfilter_queue/libnetfilter_queue.mk
index d788fd1..75910c5 100644
--- a/package/libnetfilter_queue/libnetfilter_queue.mk
+++ b/package/libnetfilter_queue/libnetfilter_queue.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_QUEUE_SITE = http://www.netfilter.org/projects/libnetfilter_queue/f
LIBNETFILTER_QUEUE_INSTALL_STAGING = YES
LIBNETFILTER_QUEUE_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
LIBNETFILTER_QUEUE_AUTORECONF = YES
-LIBNETFILTER_QUEUE_LICENSE = GPLv2+
+LIBNETFILTER_QUEUE_LICENSE = GPL-2.0+
LIBNETFILTER_QUEUE_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libnfnetlink/libnfnetlink.mk b/package/libnfnetlink/libnfnetlink.mk
index 6f69a81..13f5d72 100644
--- a/package/libnfnetlink/libnfnetlink.mk
+++ b/package/libnfnetlink/libnfnetlink.mk
@@ -9,7 +9,7 @@ LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
LIBNFNETLINK_AUTORECONF = YES
LIBNFNETLINK_INSTALL_STAGING = YES
-LIBNFNETLINK_LICENSE = GPLv2
+LIBNFNETLINK_LICENSE = GPL-2.0
LIBNFNETLINK_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk
index 0e1ddf8..bde3ee4 100644
--- a/package/libnftnl/libnftnl.mk
+++ b/package/libnftnl/libnftnl.mk
@@ -7,7 +7,7 @@
LIBNFTNL_VERSION = 1.0.7
LIBNFTNL_SITE = http://netfilter.org/projects/libnftnl/files
LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2
-LIBNFTNL_LICENSE = GPLv2+
+LIBNFTNL_LICENSE = GPL-2.0+
LIBNFTNL_LICENSE_FILES = COPYING
LIBNFTNL_INSTALL_STAGING = YES
LIBNFTNL_DEPENDENCIES = host-pkgconf libmnl
diff --git a/package/libnpth/libnpth.mk b/package/libnpth/libnpth.mk
index c97099b..51bdc51 100644
--- a/package/libnpth/libnpth.mk
+++ b/package/libnpth/libnpth.mk
@@ -7,7 +7,7 @@
LIBNPTH_VERSION = 1.3
LIBNPTH_SOURCE = npth-$(LIBNPTH_VERSION).tar.bz2
LIBNPTH_SITE = ftp://ftp.gnupg.org/gcrypt/npth
-LIBNPTH_LICENSE = LGPLv3+ or GPLv2+
+LIBNPTH_LICENSE = LGPLv3+ or GPL-2.0+
LIBNPTH_LICENSE_FILES = COPYING COPYING.LESSER
LIBNPTH_INSTALL_STAGING = YES
diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk
index dd70387..aa478a4 100644
--- a/package/liboping/liboping.mk
+++ b/package/liboping/liboping.mk
@@ -10,7 +10,7 @@ LIBOPING_SOURCE = liboping-$(LIBOPING_VERSION).tar.bz2
LIBOPING_INSTALL_STAGING = YES
LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses)
LIBOPING_CONF_OPTS = --without-perl-bindings
-LIBOPING_LICENSE = LGPLv2.1+, GPLv2
+LIBOPING_LICENSE = LGPLv2.1+, GPL-2.0
LIBOPING_LICENSE_FILES = COPYING
LIBOPING_AUTORECONF = YES
diff --git a/package/libpam-radius-auth/libpam-radius-auth.mk b/package/libpam-radius-auth/libpam-radius-auth.mk
index 5ed5953..184e48d 100644
--- a/package/libpam-radius-auth/libpam-radius-auth.mk
+++ b/package/libpam-radius-auth/libpam-radius-auth.mk
@@ -9,7 +9,7 @@ LIBPAM_RADIUS_AUTH_SITE = ftp://ftp.freeradius.org/pub/radius
LIBPAM_RADIUS_AUTH_SOURCE = pam_radius-$(LIBPAM_RADIUS_AUTH_VERSION).tar.gz
LIBPAM_RADIUS_AUTH_DEPENDENCIES = linux-pam
LIBPAM_RADIUS_AUTH_INSTALL_STAGING = YES
-LIBPAM_RADIUS_AUTH_LICENSE = GPLv2+
+LIBPAM_RADIUS_AUTH_LICENSE = GPL-2.0+
LIBPAM_RADIUS_AUTH_LICENSE_FILES = LICENSE
# While autoconf is used for configuration, the Makefile is
# hand-written, so we need to pass CC, LD, CFLAGS at build time.
diff --git a/package/libpam-tacplus/libpam-tacplus.mk b/package/libpam-tacplus/libpam-tacplus.mk
index 6696d89..f43e2b9 100644
--- a/package/libpam-tacplus/libpam-tacplus.mk
+++ b/package/libpam-tacplus/libpam-tacplus.mk
@@ -6,7 +6,7 @@
LIBPAM_TACPLUS_VERSION = 1.3.9
LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,$(LIBPAM_TACPLUS_VERSION))
-LIBPAM_TACPLUS_LICENSE = GPLv2+
+LIBPAM_TACPLUS_LICENSE = GPL-2.0+
LIBPAM_TACPLUS_LICENSE_FILES = COPYING
LIBPAM_TACPLUS_DEPENDENCIES = linux-pam
# Fetching from github, we need to generate the configure script
diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk
index b0d0609..4e2da7d 100644
--- a/package/libpjsip/libpjsip.mk
+++ b/package/libpjsip/libpjsip.mk
@@ -8,7 +8,7 @@ LIBPJSIP_VERSION = 2.6
LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.bz2
LIBPJSIP_SITE = http://www.pjsip.org/release/$(LIBPJSIP_VERSION)
LIBPJSIP_DEPENDENCIES = libsrtp
-LIBPJSIP_LICENSE = GPLv2+
+LIBPJSIP_LICENSE = GPL-2.0+
LIBPJSIP_LICENSE_FILES = COPYING
LIBPJSIP_INSTALL_STAGING = YES
LIBPJSIP_MAKE = $(MAKE1)
diff --git a/package/libplatform/libplatform.mk b/package/libplatform/libplatform.mk
index 6d54915..b253028 100644
--- a/package/libplatform/libplatform.mk
+++ b/package/libplatform/libplatform.mk
@@ -6,7 +6,7 @@
LIBPLATFORM_VERSION = feafe68e3e0b02c3261aefb3d711863ef6fadd38
LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION))
-LIBPLATFORM_LICENSE = GPLv2+, PHP license v3.01
+LIBPLATFORM_LICENSE = GPL-2.0+, PHP license v3.01
LIBPLATFORM_LICENSE_FILES = src/os.h src/util/fstrcmp.c
LIBPLATFORM_INSTALL_STAGING = YES
diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
index 825493e..9151d6d 100644
--- a/package/libqmi/libqmi.mk
+++ b/package/libqmi/libqmi.mk
@@ -7,7 +7,7 @@
LIBQMI_VERSION = 1.16.0
LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
-LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
+LIBQMI_LICENSE = LGPLv2+ (library), GPL-2.0+ (programs)
LIBQMI_LICENSE_FILES = COPYING
LIBQMI_INSTALL_STAGING = YES
diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk
index 51ecabe..ca0a438 100644
--- a/package/librtlsdr/librtlsdr.mk
+++ b/package/librtlsdr/librtlsdr.mk
@@ -6,7 +6,7 @@
LIBRTLSDR_VERSION = v0.5.3
LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION))
-LIBRTLSDR_LICENSE = GPLv2+
+LIBRTLSDR_LICENSE = GPL-2.0+
LIBRTLSDR_LICENSE_FILES = COPYING
LIBRTLSDR_INSTALL_STAGING = YES
LIBRTLSDR_DEPENDENCIES = libusb
diff --git a/package/libserial/libserial.mk b/package/libserial/libserial.mk
index 11f1874..b73d4c7 100644
--- a/package/libserial/libserial.mk
+++ b/package/libserial/libserial.mk
@@ -7,7 +7,7 @@
LIBSERIAL_VERSION = 0.6.0rc2
LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial
LIBSERIAL_INSTALL_STAGING = YES
-LIBSERIAL_LICENSE = GPLv2+
+LIBSERIAL_LICENSE = GPL-2.0+
LIBSERIAL_LICENSE_FILES = COPYING
LIBSERIAL_DEPENDENCIES = boost
diff --git a/package/libsidplay2/libsidplay2.mk b/package/libsidplay2/libsidplay2.mk
index cf44068..20af772 100644
--- a/package/libsidplay2/libsidplay2.mk
+++ b/package/libsidplay2/libsidplay2.mk
@@ -7,7 +7,7 @@
LIBSIDPLAY2_VERSION = 2.1.1
LIBSIDPLAY2_SOURCE = sidplay-libs-$(LIBSIDPLAY2_VERSION).tar.gz
LIBSIDPLAY2_SITE = http://downloads.sourceforge.net/project/sidplay2/sidplay2/sidplay-libs-$(LIBSIDPLAY2_VERSION)
-LIBSIDPLAY2_LICENSE = GPLv2+
+LIBSIDPLAY2_LICENSE = GPL-2.0+
LIBSIDPLAY2_LICENSE_FILES = libsidplay/COPYING
LIBSIDPLAY2_INSTALL_STAGING = YES
diff --git a/package/libsigsegv/libsigsegv.mk b/package/libsigsegv/libsigsegv.mk
index 1473369..d252497 100644
--- a/package/libsigsegv/libsigsegv.mk
+++ b/package/libsigsegv/libsigsegv.mk
@@ -8,7 +8,7 @@ LIBSIGSEGV_VERSION = 2.11
LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv
LIBSIGSEGV_INSTALL_STAGING = YES
LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes
-LIBSIGSEGV_LICENSE = GPLv2+
+LIBSIGSEGV_LICENSE = GPL-2.0+
LIBSIGSEGV_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index fb0310f..e019583 100644
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -8,7 +8,7 @@ LIBSYSFS_VERSION = 2.1.0
LIBSYSFS_SITE = http://downloads.sourceforge.net/project/linux-diag/sysfsutils/$(LIBSYSFS_VERSION)
LIBSYSFS_SOURCE = sysfsutils-$(LIBSYSFS_VERSION).tar.gz
LIBSYSFS_INSTALL_STAGING = YES
-LIBSYSFS_LICENSE = GPLv2 (utilities), LGPLv2.1+ (library)
+LIBSYSFS_LICENSE = GPL-2.0 (utilities), LGPLv2.1+ (library)
LIBSYSFS_LICENSE_FILES = cmd/GPL lib/LGPL
$(eval $(autotools-package))
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index 1d066bd..b1a4f48 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -11,7 +11,7 @@ LIBTOOL_INSTALL_STAGING = YES
LIBTOOL_CONF_ENV = HELP2MAN=true
LIBTOOL_DEPENDENCIES = host-m4
HOST_LIBTOOL_DEPENDENCIES = host-m4
-LIBTOOL_LICENSE = GPLv2+
+LIBTOOL_LICENSE = GPL-2.0+
LIBTOOL_LICENSE_FILES = COPYING
HOST_LIBTOOL_CONF_ENV = MAKEINFO=true
diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk
index ef1c75f..fbd332e 100644
--- a/package/libtorrent/libtorrent.mk
+++ b/package/libtorrent/libtorrent.mk
@@ -14,7 +14,7 @@ LIBTORRENT_CONF_OPTS = --enable-aligned \
$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
LIBTORRENT_INSTALL_STAGING = YES
LIBTORRENT_AUTORECONF = YES
-LIBTORRENT_LICENSE = GPLv2
+LIBTORRENT_LICENSE = GPL-2.0
LIBTORRENT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk
index 9161be9..f1a359b 100644
--- a/package/libuci/libuci.mk
+++ b/package/libuci/libuci.mk
@@ -6,7 +6,7 @@
LIBUCI_VERSION = 49ec6efbdac4819033d34f08927d795f83a3932d
LIBUCI_SITE = git://git.openwrt.org/project/uci.git
-LIBUCI_LICENSE = LGPLv2.1, GPLv2 (tools)
+LIBUCI_LICENSE = LGPLv2.1, GPL-2.0 (tools)
LIBUCI_INSTALL_STAGING = YES
LIBUCI_DEPENDENCIES = libubox
@@ -15,7 +15,7 @@ LIBUCI_DEPENDENCIES += lua
LIBUCI_CONF_OPTS += -DBUILD_LUA=ON \
-DLUAPATH=/usr/lib/lua/5.1 \
-DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
-LIBUCI_LICENSE := $(LIBUCI_LICENSE), GPLv2 (lua bindings)
+LIBUCI_LICENSE := $(LIBUCI_LICENSE), GPL-2.0 (lua bindings)
else
LIBUCI_CONF_OPTS += -DBUILD_LUA=OFF
endif
diff --git a/package/libuio/libuio.mk b/package/libuio/libuio.mk
index 6d07f1f..9e7ad6f 100644
--- a/package/libuio/libuio.mk
+++ b/package/libuio/libuio.mk
@@ -7,7 +7,7 @@
# v0.2.7
LIBUIO_VERSION = 940861de278cb794bf9d775b76a4d1d4f9108607
LIBUIO_SITE = $(call github,Linutronix,libuio,$(LIBUIO_VERSION))
-LIBUIO_LICENSE = LGPLv2.1 (library), GPLv2 (programs)
+LIBUIO_LICENSE = LGPLv2.1 (library), GPL-2.0 (programs)
LIBUIO_LICENSE_FILES = COPYING
LIBUIO_CONF_OPTS = --with-glib=no --without-werror
LIBUIO_INSTALL_STAGING = YES
diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk
index ce58b47..fc47ae4 100644
--- a/package/libunistring/libunistring.mk
+++ b/package/libunistring/libunistring.mk
@@ -8,7 +8,7 @@ LIBUNISTRING_VERSION = 0.9.7
LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring
LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz
LIBUNISTRING_INSTALL_STAGING = YES
-LIBUNISTRING_LICENSE = LGPLv3+ or GPLv2
+LIBUNISTRING_LICENSE = LGPLv3+ or GPL-2.0
LIBUNISTRING_LICENSE_FILES = COPYING.LIB
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/package/libupnpp/libupnpp.mk b/package/libupnpp/libupnpp.mk
index 0cb3eae..52753cf 100644
--- a/package/libupnpp/libupnpp.mk
+++ b/package/libupnpp/libupnpp.mk
@@ -6,7 +6,7 @@
LIBUPNPP_VERSION = 0.15.1
LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
-LIBUPNPP_LICENSE = GPLv2+
+LIBUPNPP_LICENSE = GPL-2.0+
LIBUPNPP_LICENSE_FILES = COPYING
LIBUPNPP_INSTALL_STAGING = YES
LIBUPNPP_DEPENDENCIES = expat libcurl libupnp
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index c21c210..9092c79 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -7,7 +7,7 @@
LIBURCU_VERSION = 0.9.2
LIBURCU_SITE = http://lttng.org/files/urcu
LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
-LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPLv2+ (test), GPLv3 (few *.m4 files)
+LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPLv3 (few *.m4 files)
LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE
LIBURCU_INSTALL_STAGING = YES
diff --git a/package/libusbgx/libusbgx.mk b/package/libusbgx/libusbgx.mk
index 1340d2d..721245f 100644
--- a/package/libusbgx/libusbgx.mk
+++ b/package/libusbgx/libusbgx.mk
@@ -6,7 +6,7 @@
LIBUSBGX_VERSION = 2e3d43ee098ed928d1baa61ce791ce9ff4788c5a
LIBUSBGX_SITE = $(call github,libusbgx,libusbgx,$(LIBUSBGX_VERSION))
-LIBUSBGX_LICENSE = GPLv2+ (examples), LGPLv2.1+ (library)
+LIBUSBGX_LICENSE = GPL-2.0+ (examples), LGPLv2.1+ (library)
LIBUSBGX_LICENSE_FILES = COPYING COPYING.LGPL
LIBUSBGX_DEPENDENCIES = host-pkgconf libconfig
LIBUSBGX_AUTORECONF = YES
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index c14bedb..4fe7048 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -15,7 +15,7 @@ LIBV4L_CONF_OPTS = --disable-doxygen-doc
LIBV4L_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
# v4l-utils components have different licences, see v4l-utils.spec for details
-LIBV4L_LICENSE = GPLv2+ (utilities), LGPLv2.1+ (libraries)
+LIBV4L_LICENSE = GPL-2.0+ (utilities), LGPLv2.1+ (libraries)
LIBV4L_LICENSE_FILES = COPYING COPYING.libv4l lib/libv4l1/libv4l1-kernelcode-license.txt
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index d3f0657..8063570 100644
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -7,7 +7,7 @@
LIBVNCSERVER_VERSION = 0.9.11
LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz
LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive
-LIBVNCSERVER_LICENSE = GPLv2+
+LIBVNCSERVER_LICENSE = GPL-2.0+
LIBVNCSERVER_LICENSE_FILES = COPYING
LIBVNCSERVER_INSTALL_STAGING = YES
LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config
diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk
index 5dc8bb2..b9fa5fc 100644
--- a/package/linknx/linknx.mk
+++ b/package/linknx/linknx.mk
@@ -6,7 +6,7 @@
LINKNX_VERSION = 0.0.1.32
LINKNX_SITE = http://downloads.sourceforge.net/project/linknx/linknx/linknx-$(LINKNX_VERSION)
-LINKNX_LICENSE = GPLv2+
+LINKNX_LICENSE = GPL-2.0+
LINKNX_INSTALL_STAGING = YES
# Patching acinclude.m4
LINKNX_AUTORECONF = YES
diff --git a/package/links/links.mk b/package/links/links.mk
index ce0e638..dd6adb2 100644
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -8,7 +8,7 @@ LINKS_VERSION = 2.14
LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2
LINKS_SITE = http://links.twibright.com/download
LINKS_DEPENDENCIES = host-pkgconf
-LINKS_LICENSE = GPLv2+
+LINKS_LICENSE = GPL-2.0+
LINKS_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)
diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
index df80490..fb5e18d 100644
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -13,7 +13,7 @@ LINPHONE_CONF_OPTS = \
LINPHONE_AUTORECONF = YES
LINPHONE_INSTALL_STAGING = YES
LINPHONE_DEPENDENCIES = host-pkgconf libeXosip2 speex
-LINPHONE_LICENSE = GPLv2+
+LINPHONE_LICENSE = GPL-2.0+
LINPHONE_LICENSE_FILES = COPYING
LINPHONE_PATCH = \
https://sources.debian.net/data/main/l/linphone/3.6.1-2.5/debian/patches/libav9.patch \
diff --git a/package/linux-backports/linux-backports.mk b/package/linux-backports/linux-backports.mk
index 6f599a8..1d7d6e7 100644
--- a/package/linux-backports/linux-backports.mk
+++ b/package/linux-backports/linux-backports.mk
@@ -8,7 +8,7 @@ LINUX_BACKPORTS_VERSION_MAJOR = 4.4.2
LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1
LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz
LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR)
-LINUX_BACKPORTS_LICENSE = GPLv2
+LINUX_BACKPORTS_LICENSE = GPL-2.0
LINUX_BACKPORTS_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG),y)
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
index 35ed28e..f30a07a 100644
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -9,7 +9,7 @@ LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.xz
LINUX_FUSION_INSTALL_STAGING = YES
LINUX_FUSION_DEPENDENCIES = linux
-LINUX_FUSION_LICENSE = GPLv2+
+LINUX_FUSION_LICENSE = GPL-2.0+
LINUX_FUSION_LICENSE_FILES = debian/copyright
LINUX_FUSION_ETC_DIR = $(TARGET_DIR)/etc/udev/rules.d
--git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk
index 8f339cf..5660439 100644
--- a/package/linux-headers/linux-headers.mk
+++ b/package/linux-headers/linux-headers.mk
@@ -82,7 +82,7 @@ LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
endif # ! BR2_KERNEL_HEADERS_AS_KERNEL
-LINUX_HEADERS_LICENSE = GPLv2
+LINUX_HEADERS_LICENSE = GPL-2.0
LINUX_HEADERS_LICENSE_FILES = COPYING
LINUX_HEADERS_INSTALL_STAGING = YES
diff --git a/package/linux-zigbee/linux-zigbee.mk b/package/linux-zigbee/linux-zigbee.mk
index 1f4197f..9450ca4 100644
--- a/package/linux-zigbee/linux-zigbee.mk
+++ b/package/linux-zigbee/linux-zigbee.mk
@@ -6,7 +6,7 @@
LINUX_ZIGBEE_VERSION = v0.3.1
LINUX_ZIGBEE_SITE = git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee
-LINUX_ZIGBEE_LICENSE = GPLv2
+LINUX_ZIGBEE_LICENSE = GPL-2.0
LINUX_ZIGBEE_LICENSE_FILES = COPYING
LINUX_ZIGBEE_DEPENDENCIES = libnl host-pkgconf host-flex host-bison
diff --git a/package/lirc-tools/lirc-tools.mk b/package/lirc-tools/lirc-tools.mk
index bd0f96f..6fd6434 100644
--- a/package/lirc-tools/lirc-tools.mk
+++ b/package/lirc-tools/lirc-tools.mk
@@ -7,7 +7,7 @@
LIRC_TOOLS_VERSION = 0.9.4b
LIRC_TOOLS_SOURCE = lirc-$(LIRC_TOOLS_VERSION).tar.bz2
LIRC_TOOLS_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(LIRC_TOOLS_VERSION)
-LIRC_TOOLS_LICENSE = GPLv2+
+LIRC_TOOLS_LICENSE = GPL-2.0+
LIRC_TOOLS_LICENSE_FILES = COPYING
LIRC_TOOLS_DEPENDENCIES = host-libxslt host-pkgconf host-python3
LIRC_TOOLS_INSTALL_STAGING = YES
diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk
index a36d6ca..20776a7 100644
--- a/package/lksctp-tools/lksctp-tools.mk
+++ b/package/lksctp-tools/lksctp-tools.mk
@@ -9,7 +9,7 @@ LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools
LKSCTP_TOOLS_INSTALL_STAGING = YES
# configure not shipped
LKSCTP_TOOLS_AUTORECONF = YES
-LKSCTP_TOOLS_LICENSE = LGPLv2.1 (library), GPLv2+ (programs)
+LKSCTP_TOOLS_LICENSE = LGPLv2.1 (library), GPL-2.0+ (programs)
LKSCTP_TOOLS_LICENSE_FILES = COPYING.lib COPYING
LKSCTP_TOOLS_CONF_OPTS = --disable-tests
diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index c198817..89419bc 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -9,7 +9,7 @@ LM_SENSORS_SOURCE = lm-sensors_$(LM_SENSORS_VERSION).orig.tar.bz2
LM_SENSORS_SITE = http://snapshot.debian.org/archive/debian/20170208T211941Z/pool/main/l/lm-sensors
LM_SENSORS_INSTALL_STAGING = YES
LM_SENSORS_DEPENDENCIES = host-bison host-flex
-LM_SENSORS_LICENSE = LGPLv2.1+ (libsensors), GPLv2+ (programs)
+LM_SENSORS_LICENSE = LGPLv2.1+ (libsensors), GPL-2.0+ (programs)
LM_SENSORS_LICENSE_FILES = COPYING.LGPL COPYING
LM_SENSORS_BINS_ = bin/sensors-conf-convert
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
index b62096d..c52d6a5 100644
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -7,7 +7,7 @@
LMBENCH_VERSION = 3.0-a9
LMBENCH_SOURCE = lmbench-$(LMBENCH_VERSION).tgz
LMBENCH_SITE = http://downloads.sourceforge.net/project/lmbench/development/lmbench-$(LMBENCH_VERSION)
-LMBENCH_LICENSE = lmbench license (based on GPLv2)
+LMBENCH_LICENSE = lmbench license (based on GPL-2.0)
LMBENCH_LICENSE_FILES = COPYING COPYING-2
LMBENCH_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk
index deb9f90..57df573 100644
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -8,7 +8,7 @@ LOCKFILE_PROGS_VERSION = 0.1.17
LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz
LOCKFILE_PROGS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockfile-progs
LOCKFILE_PROGS_DEPENDENCIES = liblockfile
-LOCKFILE_PROGS_LICENSE = GPLv2
+LOCKFILE_PROGS_LICENSE = GPL-2.0
LOCKFILE_PROGS_LICENSE_FILES = COPYING
LOCKFILE_BINS = \
diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk
index 5fd779e..b11fc88 100644
--- a/package/logrotate/logrotate.mk
+++ b/package/logrotate/logrotate.mk
@@ -6,7 +6,7 @@
LOGROTATE_VERSION = 3.11.0
LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION))
-LOGROTATE_LICENSE = GPLv2+
+LOGROTATE_LICENSE = GPL-2.0+
LOGROTATE_LICENSE_FILES = COPYING
LOGROTATE_DEPENDENCIES = popt host-pkgconf
# tarball does not have a generated configure script
diff --git a/package/lpc3250loader/lpc3250loader.mk b/package/lpc3250loader/lpc3250loader.mk
index 042e364..1a02235 100644
--- a/package/lpc3250loader/lpc3250loader.mk
+++ b/package/lpc3250loader/lpc3250loader.mk
@@ -6,7 +6,7 @@
HOST_LPC3250LOADER_VERSION = 1.0
HOST_LPC3250LOADER_SITE = $(call github,alexandrebelloni,lpc3250loader,$(HOST_LPC3250LOADER_VERSION))
-LPC3250LOADER_LICENSE = GPLv2+
+LPC3250LOADER_LICENSE = GPL-2.0+
LPC3250LOADER_LICENSE_FILES = LPC3250loader.py
define HOST_LPC3250LOADER_INSTALL_CMDS
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
index a283dd1..5dac07a 100644
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -7,7 +7,7 @@
LRZSZ_VERSION = 0.12.20
LRZSZ_SITE = http://www.ohse.de/uwe/releases
LRZSZ_CONF_OPTS = --disable-timesync
-LRZSZ_LICENSE = GPLv2+
+LRZSZ_LICENSE = GPL-2.0+
LRZSZ_LICENSE_FILES = COPYING
define LRZSZ_POST_CONFIGURE_HOOKS
diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index 32c0bc0..eb39611 100644
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -6,7 +6,7 @@
LSHW_VERSION = B.02.18
LSHW_SITE = http://ezix.org/software/files
-LSHW_LICENSE = GPLv2
+LSHW_LICENSE = GPL-2.0
LSHW_LICENSE_FILES = COPYING
LSHW_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/lsuio/lsuio.mk b/package/lsuio/lsuio.mk
index 5f8a965..193de15 100644
--- a/package/lsuio/lsuio.mk
+++ b/package/lsuio/lsuio.mk
@@ -6,7 +6,7 @@
LSUIO_VERSION = 0.2.0
LSUIO_SITE = http://www.osadl.org/projects/downloads/UIO/user
-LSUIO_LICENSE = GPLv2
+LSUIO_LICENSE = GPL-2.0
LSUIO_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index 29f374b..cd9a345 100644
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -7,7 +7,7 @@
LTP_TESTSUITE_VERSION = 20170116
LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION)
-LTP_TESTSUITE_LICENSE = GPLv2, GPLv2+
+LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+
LTP_TESTSUITE_LICENSE_FILES = COPYING
# Do not enable Open POSIX testsuite as it doesn't cross-compile
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index eac42be..6dfbb58 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -8,7 +8,7 @@ LTRACE_VERSION = c22d359433b333937ee3d803450dc41998115685
LTRACE_SITE = git://anonscm.debian.org/collab-maint/ltrace.git
LTRACE_DEPENDENCIES = elfutils
LTRACE_CONF_OPTS = --disable-werror
-LTRACE_LICENSE = GPLv2
+LTRACE_LICENSE = GPL-2.0
LTRACE_LICENSE_FILES = COPYING
LTRACE_AUTORECONF = YES
diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk
index bbd270e..8f12ab1 100644
--- a/package/ltris/ltris.mk
+++ b/package/ltris/ltris.mk
@@ -6,7 +6,7 @@
LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris
LTRIS_VERSION = 1.0.19
-LTRIS_LICENSE = GPLv2+
+LTRIS_LICENSE = GPL-2.0+
LTRIS_LICENSE_FILES = COPYING
LTRIS_DEPENDENCIES = sdl
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index 6ac129a..1b2c654 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -7,7 +7,7 @@
LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace
LTTNG_BABELTRACE_VERSION = 1.5.2
LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
-LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code)
+LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPL-2.0 (test code)
LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf
# The host-elfutils dependency is optional, but since we don't have
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index f8c4c11..a195e2f 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -7,7 +7,7 @@
LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
LTTNG_LIBUST_VERSION = 2.9.0
LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
-LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
+LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
LTTNG_LIBUST_LICENSE_FILES = COPYING
LTTNG_LIBUST_INSTALL_STAGING = YES
LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index e77617e..ecc8992 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -7,7 +7,7 @@
LTTNG_MODULES_VERSION = 2.9.1
LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules
LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
-LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*)
+LTTNG_MODULES_LICENSE = LGPLv2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*)
LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE
LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 5af0ab3..808e256 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -7,7 +7,7 @@
LTTNG_TOOLS_VERSION = 2.9.4
LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools
LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
-LTTNG_TOOLS_LICENSE = GPLv2+, LGPLv2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
+LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPLv2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
diff --git a/package/lugaru/lugaru.mk b/package/lugaru/lugaru.mk
index 7704931..53797f4 100644
--- a/package/lugaru/lugaru.mk
+++ b/package/lugaru/lugaru.mk
@@ -8,7 +8,7 @@ LUGARU_VERSION = 1.2
LUGARU_SITE = https://bitbucket.org/osslugaru/lugaru/downloads
LUGARU_SOURCE = lugaru-$(LUGARU_VERSION).tar.xz
-LUGARU_LICENSE = GPLv2+, CC-BY-SA-3.0 (Wolfire and Slib assets), \
+LUGARU_LICENSE = GPL-2.0+, CC-BY-SA-3.0 (Wolfire and Slib assets), \
CC-BY-SA-4.0 (OSS Lugaru, Jendraz and Philtron R. assets)
LUGARU_LICENSE_FILES = COPYING.txt CONTENT-LICENSE.txt
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 6af3137..068a400 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -8,7 +8,7 @@ LVM2_VERSION = 2.02.169
LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases
LVM2_INSTALL_STAGING = YES
-LVM2_LICENSE = GPLv2, LGPLv2.1
+LVM2_LICENSE = GPL-2.0, LGPLv2.1
LVM2_LICENSE_FILES = COPYING COPYING.LIB
# Make sure that binaries and libraries are installed with write
diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk
index c2c8919..8316a88 100644
--- a/package/lz4/lz4.mk
+++ b/package/lz4/lz4.mk
@@ -7,7 +7,7 @@
LZ4_VERSION = v1.7.5
LZ4_SITE = $(call github,lz4,lz4,$(LZ4_VERSION))
LZ4_INSTALL_STAGING = YES
-LZ4_LICENSE = BSD-2c (library), GPLv2+ (programs)
+LZ4_LICENSE = BSD-2c (library), GPL-2.0+ (programs)
LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING
ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk
index db04862..04c83f1 100644
--- a/package/lzip/lzip.mk
+++ b/package/lzip/lzip.mk
@@ -6,7 +6,7 @@
LZIP_VERSION = 1.18
LZIP_SITE = http://download.savannah.gnu.org/releases/lzip
-LZIP_LICENSE = GPLv2+
+LZIP_LICENSE = GPL-2.0+
LZIP_LICENSE_FILES = COPYING
define LZIP_CONFIGURE_CMDS
diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk
index ec7c749..17d8d0f 100644
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -6,7 +6,7 @@
LZO_VERSION = 2.09
LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
-LZO_LICENSE = GPLv2+
+LZO_LICENSE = GPL-2.0+
LZO_LICENSE_FILES = COPYING
LZO_INSTALL_STAGING = YES
# Ships a beta libtool version hence our patch doesn't apply.
diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk
index 43c1628..14d417f 100644
--- a/package/lzop/lzop.mk
+++ b/package/lzop/lzop.mk
@@ -6,7 +6,7 @@
LZOP_VERSION = 1.03
LZOP_SITE = http://www.lzop.org/download
-LZOP_LICENSE = GPLv2+
+LZOP_LICENSE = GPL-2.0+
LZOP_LICENSE_FILES = COPYING
LZOP_DEPENDENCIES = lzo
HOST_LZOP_DEPENDENCIES = host-lzo
diff --git a/package/macchanger/macchanger.mk b/package/macchanger/macchanger.mk
index 2e716d9..f2cbce4 100644
--- a/package/macchanger/macchanger.mk
+++ b/package/macchanger/macchanger.mk
@@ -6,7 +6,7 @@
MACCHANGER_VERSION = 1.7.0
MACCHANGER_SITE = https://github.com/alobbs/macchanger/releases/download/$(MACCHANGER_VERSION)
-MACCHANGER_LICENSE = GPLv2+
+MACCHANGER_LICENSE = GPL-2.0+
MACCHANGER_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk
index 2606ac8..4ae95ab 100644
--- a/package/madplay/madplay.mk
+++ b/package/madplay/madplay.mk
@@ -6,7 +6,7 @@
MADPLAY_VERSION = 0.15.2b
MADPLAY_SITE = http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
-MADPLAY_LICENSE = GPLv2+
+MADPLAY_LICENSE = GPL-2.0+
MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
MADPLAY_LIBTOOL_PATCH = NO
MADPLAY_DEPENDENCIES = libmad libid3tag $(if $(BR2_PACKAGE_GETTEXT),gettext)
diff --git a/package/makedevs/makedevs.mk b/package/makedevs/makedevs.mk
index 9bd684f..3e78892 100644
--- a/package/makedevs/makedevs.mk
+++ b/package/makedevs/makedevs.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MAKEDEVS_LICENSE = GPLv2
+MAKEDEVS_LICENSE = GPL-2.0
HOST_MAKEDEVS_CFLAGS = $(HOST_CFLAGS)
HOST_MAKEDEVS_LDFLAGS = $(HOST_LDFLAGS)
diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index 8c7375a..a17f746 100644
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@@ -6,7 +6,7 @@
MARIADB_VERSION = 10.1.22
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
-MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library)
+MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library)
MARIADB_LICENSE_FILES = README COPYING COPYING.LESSER
MARIADB_INSTALL_STAGING = YES
MARIADB_PROVIDES = mysql
diff --git a/package/matchbox-common/matchbox-common.mk b/package/matchbox-common/matchbox-common.mk
index 038dd59..fd54c27 100644
--- a/package/matchbox-common/matchbox-common.mk
+++ b/package/matchbox-common/matchbox-common.mk
@@ -8,7 +8,7 @@ MATCHBOX_COMMON_VERSION_MAJOR = 0.9
MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
MATCHBOX_COMMON_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
-MATCHBOX_COMMON_LICENSE = GPLv2+
+MATCHBOX_COMMON_LICENSE = GPL-2.0+
MATCHBOX_COMMON_LICENSE_FILES = COPYING
MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
diff --git a/package/matchbox-desktop/matchbox-desktop.mk b/package/matchbox-desktop/matchbox-desktop.mk
index a703a18..81b13c0 100644
--- a/package/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox-desktop/matchbox-desktop.mk
@@ -8,7 +8,7 @@ MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9
MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1
MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR)
-MATCHBOX_DESKTOP_LICENSE = GPLv2+
+MATCHBOX_DESKTOP_LICENSE = GPL-2.0+
MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib
MATCHBOX_DESKTOP_CONF_OPTS = --enable-expat
diff --git a/package/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox-fakekey/matchbox-fakekey.mk
index ea8e6dc..996206e 100644
--- a/package/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox-fakekey/matchbox-fakekey.mk
@@ -7,7 +7,7 @@
MATCHBOX_FAKEKEY_VERSION = 0.1
MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2
MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION)
-MATCHBOX_FAKEKEY_LICENSE = GPLv2+
+MATCHBOX_FAKEKEY_LICENSE = GPL-2.0+
MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING
MATCHBOX_FAKEKEY_INSTALL_STAGING = YES
MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
diff --git a/package/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox-keyboard/matchbox-keyboard.mk
index 3ffaca6..23ab5ad 100644
--- a/package/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox-keyboard/matchbox-keyboard.mk
@@ -7,7 +7,7 @@
MATCHBOX_KEYBOARD_VERSION = 0.1
MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2
MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
-MATCHBOX_KEYBOARD_LICENSE = GPLv2+
+MATCHBOX_KEYBOARD_LICENSE = GPL-2.0+
MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING
MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expat
diff --git a/package/matchbox-panel/matchbox-panel.mk b/package/matchbox-panel/matchbox-panel.mk
index aa2d417..344d8fd 100644
--- a/package/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox-panel/matchbox-panel.mk
@@ -8,7 +8,7 @@ MATCHBOX_PANEL_VERSION_MAJOR = 0.9
MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3
MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2
MATCHBOX_PANEL_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR)
-MATCHBOX_PANEL_LICENSE = GPLv2+
+MATCHBOX_PANEL_LICENSE = GPL-2.0+
MATCHBOX_PANEL_LICENSE_FILES = COPYING
MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
MATCHBOX_PANEL_CONF_OPTS = --enable-expat --enable-dnotify
diff --git a/package/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
index be57239..c80e753 100644
--- a/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -7,7 +7,7 @@
MATCHBOX_STARTUP_MONITOR_VERSION = 0.1
MATCHBOX_STARTUP_MONITOR_SOURCE = mb-applet-startup-monitor-$(MATCHBOX_STARTUP_MONITOR_VERSION).tar.bz2
MATCHBOX_STARTUP_MONITOR_SITE = http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION)
-MATCHBOX_STARTUP_MONITOR_LICENSE = GPLv2+
+MATCHBOX_STARTUP_MONITOR_LICENSE = GPL-2.0+
MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING
MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index 9094b1e..c0a2778 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -7,7 +7,7 @@
MATCHBOX_VERSION = 1.2
MATCHBOX_SOURCE = matchbox-window-manager-$(MATCHBOX_VERSION).tar.bz2
MATCHBOX_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_VERSION)
-MATCHBOX_LICENSE = GPLv2+
+MATCHBOX_LICENSE = GPL-2.0+
MATCHBOX_LICENSE_FILES = COPYING
MATCHBOX_DEPENDENCIES = matchbox-lib
diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk
index 1290e34..bea31b9 100644
--- a/package/mcelog/mcelog.mk
+++ b/package/mcelog/mcelog.mk
@@ -7,7 +7,7 @@
MCELOG_VERSION = v111
MCELOG_SITE = $(BR2_KERNEL_MIRROR)/scm/utils/cpu/mce/mcelog.git
MCELOG_SITE_METHOD = git
-MCELOG_LICENSE = GPLv2
+MCELOG_LICENSE = GPL-2.0
MCELOG_LICENSE_FILES = README
define MCELOG_BUILD_CMDS
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index 7558c18..c08e057 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -7,7 +7,7 @@
MDADM_VERSION = 3.3.4
MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz
MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm
-MDADM_LICENSE = GPLv2+
+MDADM_LICENSE = GPL-2.0+
MDADM_LICENSE_FILES = COPYING
MDADM_MAKE_OPTS = \
diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
index b4f0c52..a9e0bf7 100644
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -10,7 +10,7 @@ MEDIASTREAMER_INSTALL_STAGING = YES
MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext
# tests fail linking on some architectures, so disable them
MEDIASTREAMER_CONF_OPTS = --disable-tests --disable-glx --disable-strict
-MEDIASTREAMER_LICENSE = GPLv2+
+MEDIASTREAMER_LICENSE = GPL-2.0+
MEDIASTREAMER_LICENSE_FILES = COPYING
# fix compilation issue with latest bctoolbox (touches configure.ac)
diff --git a/package/memtest86/memtest86.mk b/package/memtest86/memtest86.mk
index d2ec1a7..eb071cc 100644
--- a/package/memtest86/memtest86.mk
+++ b/package/memtest86/memtest86.mk
@@ -7,7 +7,7 @@
MEMTEST86_VERSION = 5.01
MEMTEST86_SOURCE = memtest86+-$(MEMTEST86_VERSION).tar.gz
MEMTEST86_SITE = http://www.memtest.org/download/$(MEMTEST86_VERSION)
-MEMTEST86_LICENSE = GPLv2
+MEMTEST86_LICENSE = GPL-2.0
MEMTEST86_LICENSE_FILES = README
# memtest86+ is sensitive to toolchain changes, use the shipped binary version
diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk
index 802c1e4..0e64d8c 100644
--- a/package/memtester/memtester.mk
+++ b/package/memtester/memtester.mk
@@ -6,7 +6,7 @@
MEMTESTER_VERSION = 4.3.0
MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions
-MEMTESTER_LICENSE = GPLv2
+MEMTESTER_LICENSE = GPL-2.0
MEMTESTER_LICENSE_FILES = COPYING
MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr
diff --git a/package/memtool/memtool.mk b/package/memtool/memtool.mk
index f641627..c236cab 100644
--- a/package/memtool/memtool.mk
+++ b/package/memtool/memtool.mk
@@ -7,7 +7,7 @@
MEMTOOL_VERSION = 2016.10.0
MEMTOOL_SITE = http://public.pengutronix.de/software/memtool
MEMTOOL_SOURCE = memtool-$(MEMTOOL_VERSION).tar.xz
-MEMTOOL_LICENSE = GPLv2
+MEMTOOL_LICENSE = GPL-2.0
MEMTOOL_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
index d889779..b93200c 100644
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -9,7 +9,7 @@ METACITY_VERSION_MAJOR = 2.25
METACITY_VERSION = $(METACITY_VERSION_MAJOR).1
METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2
METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/$(METACITY_VERSION_MAJOR)
-METACITY_LICENSE = GPLv2+
+METACITY_LICENSE = GPL-2.0+
METACITY_LICENSE_FILES = COPYING
METACITY_CONF_OPTS = \
diff --git a/package/minicom/minicom.mk b/package/minicom/minicom.mk
index 94a4628..75cd0c4 100644
--- a/package/minicom/minicom.mk
+++ b/package/minicom/minicom.mk
@@ -6,7 +6,7 @@
MINICOM_VERSION = 2.7
MINICOM_SITE = https://alioth.debian.org/frs/download.php/file/3977
-MINICOM_LICENSE = GPLv2+
+MINICOM_LICENSE = GPL-2.0+
MINICOM_LICENSE_FILES = COPYING
# pkg-config is only used to check for liblockdev, which we don't have
diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk
index 0e765e8..cf2f273 100644
--- a/package/minidlna/minidlna.mk
+++ b/package/minidlna/minidlna.mk
@@ -6,7 +6,7 @@
MINIDLNA_VERSION = 1.1.5
MINIDLNA_SITE = http://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION)
-MINIDLNA_LICENSE = GPLv2, BSD-3c
+MINIDLNA_LICENSE = GPL-2.0, BSD-3c
MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd
MINIDLNA_DEPENDENCIES = \
diff --git a/package/miraclecast/miraclecast.mk b/package/miraclecast/miraclecast.mk
index 17e73f1..f037a2e 100644
--- a/package/miraclecast/miraclecast.mk
+++ b/package/miraclecast/miraclecast.mk
@@ -6,7 +6,7 @@
MIRACLECAST_VERSION = c94be167c85c6ec8badd7ac79e3dea2e0b73225c
MIRACLECAST_SITE = $(call github,albfan,miraclecast,$(MIRACLECAST_VERSION))
-MIRACLECAST_LICENSE = LGPLv2.1+, GPLv2 (gdhcp)
+MIRACLECAST_LICENSE = LGPLv2.1+, GPL-2.0 (gdhcp)
MIRACLECAST_LICENSE_FILES = COPYING LICENSE_gdhcp LICENSE_htable LICENSE_lgpl
MIRACLECAST_DEPENDENCIES = host-pkgconf systemd gstreamer1 \
readline libglib2
diff --git a/package/mjpegtools/mjpegtools.mk b/package/mjpegtools/mjpegtools.mk
index 76ae968..c7392fa 100644
--- a/package/mjpegtools/mjpegtools.mk
+++ b/package/mjpegtools/mjpegtools.mk
@@ -7,7 +7,7 @@
MJPEGTOOLS_VERSION = 2.1.0
MJPEGTOOLS_SITE = http://sourceforge.net/projects/mjpeg/files/mjpegtools/$(MJPEGTOOLS_VERSION)
MJPEGTOOLS_DEPENDENCIES = host-pkgconf jpeg
-MJPEGTOOLS_LICENSE = GPLv2+
+MJPEGTOOLS_LICENSE = GPL-2.0+
MJPEGTOOLS_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBPNG),y)
diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk
index a710af6..4fecf69 100644
--- a/package/mjpg-streamer/mjpg-streamer.mk
+++ b/package/mjpg-streamer/mjpg-streamer.mk
@@ -10,7 +10,7 @@
# http://sourceforge.net/p/mjpg-streamer/patches/14/
MJPG_STREAMER_VERSION = bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b
MJPG_STREAMER_SITE = $(call github,oliv3r,mjpg-streamer,$(MJPG_STREAMER_VERSION))
-MJPG_STREAMER_LICENSE = GPLv2+
+MJPG_STREAMER_LICENSE = GPL-2.0+
MJPG_STREAMER_LICENSE_FILES = LICENSE
MJPG_STREAMER_DEPENDENCIES = jpeg
diff --git a/package/mkpasswd/mkpasswd.mk b/package/mkpasswd/mkpasswd.mk
index 07935a4..ba4bd29 100644
--- a/package/mkpasswd/mkpasswd.mk
+++ b/package/mkpasswd/mkpasswd.mk
@@ -7,7 +7,7 @@
# source included in buildroot, taken from
# https://github.com/rfc1036/whois/blob/master/
# at revision 5a0f08500fa51608b6d3b73ee338be38c692eadb
-HOST_MKPASSWD_LICENSE = GPLv2+
+HOST_MKPASSWD_LICENSE = GPL-2.0+
define HOST_MKPASSWD_BUILD_CMDS
$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
diff --git a/package/mkpimage/mkpimage.mk b/package/mkpimage/mkpimage.mk
index 04b2ef0..bba2eb4 100644
--- a/package/mkpimage/mkpimage.mk
+++ b/package/mkpimage/mkpimage.mk
@@ -4,7 +4,7 @@
#
################################################################################
-HOST_MKPIMAGE_LICENSE = GPLv2
+HOST_MKPIMAGE_LICENSE = GPL-2.0
# source included in the package
# came from barebox's repository:
diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk
index 7473a1b..5eb9a9a 100644
--- a/package/mmc-utils/mmc-utils.mk
+++ b/package/mmc-utils/mmc-utils.mk
@@ -6,7 +6,7 @@
MMC_UTILS_VERSION = 2cb6695e8dec00d887bdd5309d1b57d836fcd214
MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
-MMC_UTILS_LICENSE = GPLv2
+MMC_UTILS_LICENSE = GPL-2.0
define MMC_UTILS_BUILD_CMDS
$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
index 6a9b6a0..ecb7d3f 100644
--- a/package/modem-manager/modem-manager.mk
+++ b/package/modem-manager/modem-manager.mk
@@ -7,7 +7,7 @@
MODEM_MANAGER_VERSION = 1.6.4
MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
-MODEM_MANAGER_LICENSE = GPLv2+ (programs, plugins), LGPLv2+ (libmm-glib)
+MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPLv2+ (libmm-glib)
MODEM_MANAGER_LICENSE_FILES = COPYING
MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool libgudev
MODEM_MANAGER_INSTALL_STAGING = YES
diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk
index 7dfa119..ad8b08c 100644
--- a/package/mongoose/mongoose.mk
+++ b/package/mongoose/mongoose.mk
@@ -6,7 +6,7 @@
MONGOOSE_VERSION = 6.2
MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION))
-MONGOOSE_LICENSE = GPLv2
+MONGOOSE_LICENSE = GPL-2.0
MONGOOSE_LICENSE_FILES = LICENSE
MONGOOSE_INSTALL_STAGING = YES
diff --git a/package/mono/mono.mk b/package/mono/mono.mk
index 866bff2..58dfab7 100644
--- a/package/mono/mono.mk
+++ b/package/mono/mono.mk
@@ -7,7 +7,7 @@
MONO_VERSION = 4.6.2.16
MONO_SITE = http://download.mono-project.com/sources/mono
MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2
-MONO_LICENSE = GPLv2 or MIT (compiler, tools), MIT (libs) or commercial
+MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial
MONO_LICENSE_FILES = LICENSE mcs/COPYING eglib/COPYING \
external/Newtonsoft.Json/Tools/7-zip/copying.txt
MONO_INSTALL_STAGING = YES
diff --git a/package/motion/motion.mk b/package/motion/motion.mk
index d76b547..ce64a93 100644
--- a/package/motion/motion.mk
+++ b/package/motion/motion.mk
@@ -6,7 +6,7 @@
MOTION_VERSION = release-4.0.1
MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION))
-MOTION_LICENSE = GPLv2
+MOTION_LICENSE = GPL-2.0
MOTION_LICENSE_FILES = COPYING
MOTION_DEPENDENCIES = host-pkgconf jpeg
# From git and patched configure.ac
diff --git a/package/mpd-mpc/mpd-mpc.mk b/package/mpd-mpc/mpd-mpc.mk
index d9aa1f8..6c15c0d 100644
--- a/package/mpd-mpc/mpd-mpc.mk
+++ b/package/mpd-mpc/mpd-mpc.mk
@@ -8,7 +8,7 @@ MPD_MPC_VERSION_MAJOR = 0
MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).28
MPD_MPC_SITE = http://www.musicpd.org/download/mpc/$(MPD_MPC_VERSION_MAJOR)
MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz
-MPD_MPC_LICENSE = GPLv2+
+MPD_MPC_LICENSE = GPL-2.0+
MPD_MPC_LICENSE_FILES = COPYING
MPD_MPC_DEPENDENCIES = host-pkgconf libmpdclient
MPD_MPC_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 79cc995..7fd9bc9 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -13,7 +13,7 @@ endif
MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
MPD_DEPENDENCIES = host-pkgconf boost
-MPD_LICENSE = GPLv2+
+MPD_LICENSE = GPL-2.0+
MPD_LICENSE_FILES = COPYING
MPD_AUTORECONF = YES
diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
index 8288dcb..6b3009a 100644
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -8,7 +8,7 @@ MPLAYER_VERSION = 1.3.0
MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.xz
MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
MPLAYER_DEPENDENCIES = host-pkgconf
-MPLAYER_LICENSE = GPLv2
+MPLAYER_LICENSE = GPL-2.0
MPLAYER_LICENSE_FILES = LICENSE Copyright
MPLAYER_CFLAGS = $(TARGET_CFLAGS)
MPLAYER_LDFLAGS = $(TARGET_LDFLAGS)
diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
index 5b83b6d..2c5d829 100644
--- a/package/mpv/mpv.mk
+++ b/package/mpv/mpv.mk
@@ -10,7 +10,7 @@ MPV_SOURCE = v$(MPV_VERSION).tar.gz
MPV_DEPENDENCIES = \
host-pkgconf ffmpeg zlib \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
-MPV_LICENSE = GPLv2+
+MPV_LICENSE = GPL-2.0+
MPV_LICENSE_FILES = LICENSE
MPV_NEEDS_EXTERNAL_WAF = YES
diff --git a/package/msr-tools/msr-tools.mk b/package/msr-tools/msr-tools.mk
index 4f84a28..bfe1a07 100644
--- a/package/msr-tools/msr-tools.mk
+++ b/package/msr-tools/msr-tools.mk
@@ -6,7 +6,7 @@
MSR_TOOLS_VERSION = 1.3
MSR_TOOLS_SITE = $(call github,01org,msr-tools,msr-tools-$(MSR_TOOLS_VERSION))
-MSR_TOOLS_LICENSE = GPLv2
+MSR_TOOLS_LICENSE = GPL-2.0
MSR_TOOLS_LICENSE_FILES = cpuid.c
define MSR_TOOLS_BUILD_CMDS
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index acf24d5..d6f0be2 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -7,7 +7,7 @@
MTD_VERSION = 1.5.2
MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
-MTD_LICENSE = GPLv2
+MTD_LICENSE = GPL-2.0
MTD_LICENSE_FILES = COPYING
MTD_INSTALL_STAGING = YES
diff --git a/package/mtr/mtr.mk b/package/mtr/mtr.mk
index 5ee6124..82688ed 100644
--- a/package/mtr/mtr.mk
+++ b/package/mtr/mtr.mk
@@ -9,7 +9,7 @@ MTR_SITE = $(call github,traviscross,mtr,$(MTR_VERSION))
MTR_AUTORECONF = YES
MTR_CONF_OPTS = --without-gtk
MTR_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_NCURSES),ncurses)
-MTR_LICENSE = GPLv2
+MTR_LICENSE = GPL-2.0
MTR_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/multicat/multicat.mk b/package/multicat/multicat.mk
index cc6eb78..6f88266 100644
--- a/package/multicat/multicat.mk
+++ b/package/multicat/multicat.mk
@@ -7,7 +7,7 @@
MULTICAT_VERSION = 2.1
MULTICAT_SOURCE = multicat-$(MULTICAT_VERSION).tar.bz2
MULTICAT_SITE = https://get.videolan.org/multicat/$(MULTICAT_VERSION)
-MULTICAT_LICENSE = GPLv2+
+MULTICAT_LICENSE = GPL-2.0+
MULTICAT_LICENSE_FILES = COPYING
MULTICAT_DEPENDENCIES = bitstream
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
index cd44ca1..8c3be5e 100644
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -6,7 +6,7 @@
MUTT_VERSION = 1.7.1
MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads
-MUTT_LICENSE = GPLv2+
+MUTT_LICENSE = GPL-2.0+
MUTT_LICENSE_FILES = GPL
MUTT_DEPENDENCIES = ncurses
MUTT_CONF_OPTS = --disable-smtp
diff --git a/package/mxsldr/mxsldr.mk b/package/mxsldr/mxsldr.mk
index fa7ca84..07ef8da 100644
--- a/package/mxsldr/mxsldr.mk
+++ b/package/mxsldr/mxsldr.mk
@@ -6,7 +6,7 @@
MXSLDR_VERSION = 2793a657ab7a22487d21c1b020957806f8ae8383
MXSLDR_SITE = git://git.denx.de/mxsldr.git
-MXSLDR_LICENSE = GPLv2+
+MXSLDR_LICENSE = GPL-2.0+
MXSLDR_LICENSE_FILES = COPYING
HOST_MXSLDR_DEPENDENCIES = host-libusb host-pkgconf
diff --git a/package/nanocom/nanocom.mk b/package/nanocom/nanocom.mk
index caab368..7893cc6 100644
--- a/package/nanocom/nanocom.mk
+++ b/package/nanocom/nanocom.mk
@@ -8,7 +8,7 @@ NANOCOM_VERSION = 1.0
NANOCOM_SOURCE = nanocom.tar.gz
NANOCOM_SITE = http://downloads.sourceforge.net/project/nanocom/nanocom/v$(NANOCOM_VERSION)
NANOCOM_STRIP_COMPONENTS = 0
-NANOCOM_LICENSE = GPLv2+
+NANOCOM_LICENSE = GPL-2.0+
NANOCOM_LICENSE_FILES = COPYING
define NANOCOM_BUILD_CMDS
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 7eeadec..82de1c4 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -9,7 +9,7 @@ NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz
NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
NBD_CONF_OPTS = --enable-lfs
NBD_DEPENDENCIES = libglib2
-NBD_LICENSE = GPLv2
+NBD_LICENSE = GPL-2.0
NBD_LICENSE_FILES = COPYING
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk
index b5fa7cd..6f421df 100644
--- a/package/ncmpc/ncmpc.mk
+++ b/package/ncmpc/ncmpc.mk
@@ -9,7 +9,7 @@ NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).25
NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz
NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR)
NCMPC_DEPENDENCIES = host-pkgconf libglib2 libmpdclient ncurses
-NCMPC_LICENSE = GPLv2+
+NCMPC_LICENSE = GPL-2.0+
NCMPC_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index f431035..4797a8e 100644
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -9,7 +9,7 @@ NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2
NDISC6_SITE = http://www.remlab.net/files/ndisc6
NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
NDISC6_CONF_OPTS = --disable-rpath --disable-suid-install
-NDISC6_LICENSE = GPLv2 or GPLv3
+NDISC6_LICENSE = GPL-2.0 or GPLv3
NDISC6_LICENSE_FILES = COPYING
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
diff --git a/package/neard/neard.mk b/package/neard/neard.mk
index ed2c6b1..c46f46c 100644
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -7,7 +7,7 @@
NEARD_VERSION = 0.14
NEARD_SOURCE = neard-$(NEARD_VERSION).tar.xz
NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
-NEARD_LICENSE = GPLv2
+NEARD_LICENSE = GPL-2.0
NEARD_LICENSE_FILES = COPYING
NEARD_DEPENDENCIES = host-pkgconf dbus libglib2 libnl
diff --git a/package/neardal/neardal.mk b/package/neardal/neardal.mk
index c3164ef..f3e55fd 100644
--- a/package/neardal/neardal.mk
+++ b/package/neardal/neardal.mk
@@ -7,7 +7,7 @@
NEARDAL_VERSION = 33b54a55032b047fd885a5eb3592c169c0056c49
NEARDAL_SITE = $(call github,connectivity,neardal,$(NEARDAL_VERSION))
NEARDAL_INSTALL_STAGING = YES
-NEARDAL_LICENSE = GPLv2
+NEARDAL_LICENSE = GPL-2.0
NEARDAL_LICENSE_FILES = COPYING
NEARDAL_DEPENDENCIES = host-pkgconf dbus dbus-glib
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index ca1a6bd..6a517a9 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -6,7 +6,7 @@
NEON_VERSION = 0.30.2
NEON_SITE = http://www.webdav.org/neon
-NEON_LICENSE = LGPLv2+ (library), GPLv2+ (manual and tests)
+NEON_LICENSE = LGPLv2+ (library), GPL-2.0+ (manual and tests)
NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README
NEON_INSTALL_STAGING = YES
NEON_CONF_OPTS = --without-gssapi --disable-rpath
diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk
index f0c61d5..5720fcc 100644
--- a/package/net-tools/net-tools.mk
+++ b/package/net-tools/net-tools.mk
@@ -7,7 +7,7 @@
NET_TOOLS_VERSION = 3f170bff115303e92319791cbd56371e33dcbf6d
NET_TOOLS_SITE = git://git.code.sf.net/p/net-tools/code
NET_TOOLS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-NET_TOOLS_LICENSE = GPLv2+
+NET_TOOLS_LICENSE = GPL-2.0+
NET_TOOLS_LICENSE_FILES = COPYING
# Install after busybox for the full-blown versions
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index dbe13a9..053a55d 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -12,7 +12,7 @@ NETATALK_AUTORECONF = YES
NETATALK_CONFIG_SCRIPTS = netatalk-config
NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \
libevent
-NETATALK_LICENSE = GPLv2+, LGPLv3+, MIT-like
+NETATALK_LICENSE = GPL-2.0+, LGPLv3+, MIT-like
NETATALK_LICENSE_FILES = COPYING COPYRIGHT
# Don't run ldconfig!
diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk
index 5d01ebb..eb7ddca 100644
--- a/package/netcat/netcat.mk
+++ b/package/netcat/netcat.mk
@@ -6,7 +6,7 @@
NETCAT_VERSION = 0.7.1
NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION)
-NETCAT_LICENSE = GPLv2+
+NETCAT_LICENSE = GPL-2.0+
NETCAT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk
index a165192..9363a71 100644
--- a/package/netplug/netplug.mk
+++ b/package/netplug/netplug.mk
@@ -7,7 +7,7 @@
NETPLUG_VERSION = 1.2.9.2
NETPLUG_SOURCE = netplug-$(NETPLUG_VERSION).tar.bz2
NETPLUG_SITE = http://www.red-bean.com/~bos/netplug
-NETPLUG_LICENSE = GPLv2
+NETPLUG_LICENSE = GPL-2.0
NETPLUG_LICENSE_FILES = COPYING
define NETPLUG_BUILD_CMDS
diff --git a/package/netsniff-ng/netsniff-ng.mk b/package/netsniff-ng/netsniff-ng.mk
index 4ec7e74..1a4017e 100644
--- a/package/netsniff-ng/netsniff-ng.mk
+++ b/package/netsniff-ng/netsniff-ng.mk
@@ -6,7 +6,7 @@
NETSNIFF_NG_VERSION = v0.6.2
NETSNIFF_NG_SITE = $(call github,netsniff-ng,netsniff-ng,$(NETSNIFF_NG_VERSION))
-NETSNIFF_NG_LICENSE = GPLv2
+NETSNIFF_NG_LICENSE = GPL-2.0
NETSNIFF_NG_LICENSE_FILES = README COPYING
# Prevent netsniff-ng configure script from finding a host installed nacl
NETSNIFF_NG_CONF_ENV = \
diff --git a/package/netstat-nat/netstat-nat.mk b/package/netstat-nat/netstat-nat.mk
index 9a60f12..0d16579 100644
--- a/package/netstat-nat/netstat-nat.mk
+++ b/package/netstat-nat/netstat-nat.mk
@@ -6,7 +6,7 @@
NETSTAT_NAT_VERSION = 1.4.10
NETSTAT_NAT_SITE = http://tweegy.nl/download
-NETSTAT_NAT_LICENSE = GPLv2+
+NETSTAT_NAT_LICENSE = GPL-2.0+
NETSTAT_NAT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index 31789ec..4937f4e 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -8,7 +8,7 @@ NETTLE_VERSION = 3.3
NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive
NETTLE_DEPENDENCIES = gmp
NETTLE_INSTALL_STAGING = YES
-NETTLE_LICENSE = Dual GPLv2+/LGPLv3+
+NETTLE_LICENSE = Dual GPL-2.0+/LGPLv3+
NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2
# don't include openssl support for (unused) examples as it has problems
# with static linking
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 3d7a1bf..6e82d30 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -11,7 +11,7 @@ NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(N
NETWORK_MANAGER_INSTALL_STAGING = YES
NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \
libgcrypt wireless_tools util-linux host-intltool readline libndp libgudev
-NETWORK_MANAGER_LICENSE = GPLv2+ (app), LGPLv2+ (libnm-util)
+NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPLv2+ (libnm-util)
NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING
NETWORK_MANAGER_CONF_ENV = \
diff --git a/package/newt/newt.mk b/package/newt/newt.mk
index 2b8d337..1764bbc 100644
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -11,7 +11,7 @@ NEWT_DEPENDENCIES = popt slang \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
NEWT_CONF_OPTS = --without-python --without-tcl
NEWT_MAKE = $(MAKE1)
-NEWT_LICENSE = GPLv2
+NEWT_LICENSE = GPL-2.0
NEWT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/nfacct/nfacct.mk b/package/nfacct/nfacct.mk
index a4e2045..d4c7c4c 100644
--- a/package/nfacct/nfacct.mk
+++ b/package/nfacct/nfacct.mk
@@ -9,7 +9,7 @@ NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2
NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files
NFACCT_DEPENDENCIES = host-pkgconf \
libnetfilter_acct
-NFACCT_LICENSE = GPLv2
+NFACCT_LICENSE = GPL-2.0
NFACCT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 179009d..26112d6 100644
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -7,7 +7,7 @@
NFS_UTILS_VERSION = 1.3.3
NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
-NFS_UTILS_LICENSE = GPLv2+
+NFS_UTILS_LICENSE = GPL-2.0+
NFS_UTILS_LICENSE_FILES = COPYING
NFS_UTILS_AUTORECONF = YES
NFS_UTILS_DEPENDENCIES = host-pkgconf
diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk
index 64d6be7..7263ec7 100644
--- a/package/nftables/nftables.mk
+++ b/package/nftables/nftables.mk
@@ -9,7 +9,7 @@ NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2
NFTABLES_SITE = http://www.netfilter.org/projects/nftables/files
NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \
host-pkgconf $(if $(BR2_NEEDS_GETTEXT),gettext)
-NFTABLES_LICENSE = GPLv2
+NFTABLES_LICENSE = GPL-2.0
NFTABLES_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_READLINE),y)
diff --git a/package/nginx-naxsi/nginx-naxsi.mk b/package/nginx-naxsi/nginx-naxsi.mk
index 33f1b60..491d518 100644
--- a/package/nginx-naxsi/nginx-naxsi.mk
+++ b/package/nginx-naxsi/nginx-naxsi.mk
@@ -6,7 +6,7 @@
NGINX_NAXSI_VERSION = 0.55.3
NGINX_NAXSI_SITE = $(call github,nbs-system,naxsi,$(NGINX_NAXSI_VERSION))
-NGINX_NAXSI_LICENSE = GPLv2+ with OpenSSL exception
+NGINX_NAXSI_LICENSE = GPL-2.0+ with OpenSSL exception
NGINX_NAXSI_LICENSE_FILES = naxsi_src/naxsi_json.c
$(eval $(generic-package))
diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk
index 927474c..f7857e8 100644
--- a/package/ngircd/ngircd.mk
+++ b/package/ngircd/ngircd.mk
@@ -8,7 +8,7 @@ NGIRCD_VERSION = 20.3
NGIRCD_SOURCE = ngircd-$(NGIRCD_VERSION).tar.xz
NGIRCD_SITE = http://arthur.barton.de/pub/ngircd
NGIRCD_DEPENDENCIES = zlib
-NGIRCD_LICENSE = GPLv2+
+NGIRCD_LICENSE = GPL-2.0+
NGIRCD_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/nload/nload.mk b/package/nload/nload.mk
index 1ead61c..80d42a1 100644
--- a/package/nload/nload.mk
+++ b/package/nload/nload.mk
@@ -7,7 +7,7 @@
NLOAD_VERSION = 0.7.4
NLOAD_SITE = http://www.roland-riegel.de/nload
NLOAD_DEPENDENCIES = ncurses
-NLOAD_LICENSE = GPLv2+
+NLOAD_LICENSE = GPL-2.0+
NLOAD_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk
index 6e178b1..37720e2 100644
--- a/package/nmap/nmap.mk
+++ b/package/nmap/nmap.mk
@@ -11,7 +11,7 @@ NMAP_DEPENDENCIES = libpcap pcre
NMAP_CONF_OPTS = --without-liblua --without-zenmap \
--with-libdnet=included --with-liblinear=included \
--with-libpcre="$(STAGING_DIR)/usr" --without-ncat
-NMAP_LICENSE = GPLv2
+NMAP_LICENSE = GPL-2.0
NMAP_LICENSE_FILES = COPYING
# needed by libpcap
diff --git a/package/nodm/nodm.mk b/package/nodm/nodm.mk
index da6bc85..4f751c3 100644
--- a/package/nodm/nodm.mk
+++ b/package/nodm/nodm.mk
@@ -6,7 +6,7 @@
NODM_VERSION = 0.12-1
NODM_SITE = $(call github,spanezz,nodm,debian/$(NODM_VERSION))
-NODM_LICENSE = GPLv2+
+NODM_LICENSE = GPL-2.0+
NODM_LICENSE_FILES = COPYING
NODM_AUTORECONF = YES
diff --git a/package/noip/noip.mk b/package/noip/noip.mk
index a61d141..b7fcc84 100644
--- a/package/noip/noip.mk
+++ b/package/noip/noip.mk
@@ -7,7 +7,7 @@
NOIP_VERSION = 2.1.9
NOIP_SITE = http://www.no-ip.com/client/linux
NOIP_SOURCE = noip-duc-linux.tar.gz
-NOIP_LICENSE = GPLv2+
+NOIP_LICENSE = GPL-2.0+
NOIP_LICENSE_FILES = COPYING
define NOIP_BUILD_CMDS
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index 25658f9..0aabde7 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -10,7 +10,7 @@ NTFS_3G_SITE = http://tuxera.com/opensource
NTFS_3G_CONF_OPTS = --disable-ldconfig
NTFS_3G_INSTALL_STAGING = YES
NTFS_3G_DEPENDENCIES = host-pkgconf
-NTFS_3G_LICENSE = GPLv2+, LGPLv2+
+NTFS_3G_LICENSE = GPL-2.0+, LGPLv2+
NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB
ifeq ($(BR2_PACKAGE_LIBFUSE),y)
diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk
index e2d2590..83fdae7 100644
--- a/package/numactl/numactl.mk
+++ b/package/numactl/numactl.mk
@@ -9,7 +9,7 @@ NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download
NUMACTL_PATCH = \
https://github.com/numactl/numactl/commit/3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.patch \
https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b.patch
-NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPLv2 (programs)
+NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPL-2.0 (programs)
NUMACTL_LICENSE_FILES = README
NUMACTL_INSTALL_STAGING = YES
diff --git a/package/nut/nut.mk b/package/nut/nut.mk
index 7136e83..8cd4184 100644
--- a/package/nut/nut.mk
+++ b/package/nut/nut.mk
@@ -7,7 +7,7 @@
NUT_VERSION_MAJOR = 2.7
NUT_VERSION = $(NUT_VERSION_MAJOR).4
NUT_SITE = http://www.networkupstools.org/source/$(NUT_VERSION_MAJOR)
-NUT_LICENSE = GPLv2+, GPLv3+ (python scripts), GPL/Artistic (perl client)
+NUT_LICENSE = GPL-2.0+, GPLv3+ (python scripts), GPL/Artistic (perl client)
NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3
NUT_DEPENDENCIES = host-pkgconf
diff --git a/package/nuttcp/nuttcp.mk b/package/nuttcp/nuttcp.mk
index 455875a..2636f95 100644
--- a/package/nuttcp/nuttcp.mk
+++ b/package/nuttcp/nuttcp.mk
@@ -7,7 +7,7 @@
NUTTCP_VERSION = 6.1.2
NUTTCP_SITE = http://nuttcp.net/nuttcp
NUTTCP_SOURCE = nuttcp-$(NUTTCP_VERSION).tar.bz2
-NUTTCP_LICENSE = GPLv2
+NUTTCP_LICENSE = GPL-2.0
NUTTCP_LICENSE_FILES = LICENSE
define NUTTCP_BUILD_CMDS
diff --git a/package/nvme/nvme.mk b/package/nvme/nvme.mk
index b745025..66b3cef 100644
--- a/package/nvme/nvme.mk
+++ b/package/nvme/nvme.mk
@@ -6,7 +6,7 @@
NVME_VERSION = v0.3
NVME_SITE = $(call github,linux-nvme,nvme-cli,$(NVME_VERSION))
-NVME_LICENSE = GPLv2+
+NVME_LICENSE = GPL-2.0+
NVME_LICENSE_FILES = LICENSE
# Yes LIBUDEV=0 means udev support enabled, LIBUDEV=1 means udev
diff --git a/package/odhcp6c/odhcp6c.mk b/package/odhcp6c/odhcp6c.mk
index 0ec9657..31867d7 100644
--- a/package/odhcp6c/odhcp6c.mk
+++ b/package/odhcp6c/odhcp6c.mk
@@ -6,7 +6,7 @@
ODHCP6C_VERSION = 7533a6243dc3ac5a747cf6ccbc4d0539dafd3e07
ODHCP6C_SITE = $(call github,sbyx,odhcp6c,$(ODHCP6C_VERSION))
-ODHCP6C_LICENSE = GPLv2
+ODHCP6C_LICENSE = GPL-2.0
ODHCP6C_LICENSE_FILES = COPYING
define ODHCP6C_INSTALL_SCRIPT
diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index 8234396..88749aa 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -7,7 +7,7 @@
OFONO_VERSION = 1.18
OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz
OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
-OFONO_LICENSE = GPLv2
+OFONO_LICENSE = GPL-2.0
OFONO_LICENSE_FILES = COPYING
OFONO_DEPENDENCIES = \
host-pkgconf \
diff --git a/package/ola/ola.mk b/package/ola/ola.mk
index cfd6638..a4f3501 100644
--- a/package/ola/ola.mk
+++ b/package/ola/ola.mk
@@ -6,7 +6,7 @@
OLA_VERSION = 0.10.2
OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION)
-OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPLv2+ (libolaserver, olad, Python examples and tests)
+OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests)
OLA_LICENSE_FILES = LICENCE GPL LGPL
OLA_INSTALL_STAGING = YES
OLA_AUTORECONF = YES
diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
index b8a342b..e2aeefa 100644
--- a/package/omap-u-boot-utils/omap-u-boot-utils.mk
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -6,7 +6,7 @@
OMAP_U_BOOT_UTILS_VERSION = 3f07426cddc0be9e24702e7aacc7574ddd7fba28
OMAP_U_BOOT_UTILS_SITE = $(call github,nmenon,omap-u-boot-utils,$(OMAP_U_BOOT_UTILS_VERSION))
-OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+
+OMAP_U_BOOT_UTILS_LICENSE = GPL-2.0, GPL-2.0+
OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING
define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS
diff --git a/package/omxplayer/omxplayer.mk b/package/omxplayer/omxplayer.mk
index da4614b..7425014 100644
--- a/package/omxplayer/omxplayer.mk
+++ b/package/omxplayer/omxplayer.mk
@@ -6,7 +6,7 @@
OMXPLAYER_VERSION = 6c90c7503ba4658221774759edf7f2ae816711de
OMXPLAYER_SITE = $(call github,popcornmix,omxplayer,$(OMXPLAYER_VERSION))
-OMXPLAYER_LICENSE = GPLv2+
+OMXPLAYER_LICENSE = GPL-2.0+
OMXPLAYER_LICENSE_FILES = COPYING
OMXPLAYER_DEPENDENCIES = \
diff --git a/package/on2-8170-modules/on2-8170-modules.mk b/package/on2-8170-modules/on2-8170-modules.mk
index b40ed86..9864313 100644
--- a/package/on2-8170-modules/on2-8170-modules.mk
+++ b/package/on2-8170-modules/on2-8170-modules.mk
@@ -7,7 +7,7 @@
ON2_8170_MODULES_VERSION = 73b08061d30789178e692bc332b73d1d9922bf39
ON2_8170_MODULES_SITE = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION))
-ON2_8170_MODULES_LICENSE = GPLv2+
+ON2_8170_MODULES_LICENSE = GPL-2.0+
#There is no license file
$(eval $(kernel-module))
diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk
index 588692d..589d344 100644
--- a/package/open2300/open2300.mk
+++ b/package/open2300/open2300.mk
@@ -7,7 +7,7 @@
OPEN2300_SITE = http://www.lavrsen.dk/svn/open2300/trunk
OPEN2300_SITE_METHOD = svn
OPEN2300_VERSION = 12
-OPEN2300_LICENSE = GPLv2
+OPEN2300_LICENSE = GPL-2.0
OPEN2300_LICENSE_FILES = COPYING
OPEN2300_BINS = \
diff --git a/package/openbox/openbox.mk b/package/openbox/openbox.mk
index b5148e0..91d1c86 100644
--- a/package/openbox/openbox.mk
+++ b/package/openbox/openbox.mk
@@ -7,7 +7,7 @@
OPENBOX_VERSION = 3.6.1
OPENBOX_SOURCE = openbox-$(OPENBOX_VERSION).tar.xz
OPENBOX_SITE = http://openbox.org/dist/openbox
-OPENBOX_LICENSE = GPLv2+
+OPENBOX_LICENSE = GPL-2.0+
OPENBOX_LICENSE_FILES = COPYING
OPENBOX_CONF_OPTS = \
diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk
index 9faa7c6..25bd7fd 100644
--- a/package/openipmi/openipmi.mk
+++ b/package/openipmi/openipmi.mk
@@ -9,7 +9,7 @@ OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20
OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz
OPENIPMI_PATCH = \
http://sourceforge.net/p/openipmi/patches/26/attachment/0001-ui-use-standard-uint32_t.patch
-OPENIPMI_LICENSE = LGPLv2+, GPLv2+, BSD-3c
+OPENIPMI_LICENSE = LGPLv2+, GPL-2.0+, BSD-3c
OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD
OPENIPMI_DEPENDENCIES = popt ncurses host-pkgconf
# Patching Makefile.am
diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk
index 6a1a10b..b6b2bf0 100644
--- a/package/openobex/openobex.mk
+++ b/package/openobex/openobex.mk
@@ -10,7 +10,7 @@ OPENOBEX_SITE = http://downloads.sourceforge.net/project/openobex/openobex/$(OPE
OPENOBEX_SOURCE = openobex-$(OPENOBEX_VERSION)-Source.zip
# Libraries seems to be released under LGPLv2.1+,
# while other material is under GPLv2+.
-OPENOBEX_LICENSE = GPLv2+/LGPLv2.1+
+OPENOBEX_LICENSE = GPL-2.0+/LGPLv2.1+
OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
OPENOBEX_DEPENDENCIES = host-pkgconf
diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk
index dcb548c..a3fbd18 100644
--- a/package/openpowerlink/openpowerlink.mk
+++ b/package/openpowerlink/openpowerlink.mk
@@ -7,7 +7,7 @@
OPENPOWERLINK_VERSION = V2.5.0
OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/$(OPENPOWERLINK_VERSION)
OPENPOWERLINK_SOURCE = openPOWERLINK_$(OPENPOWERLINK_VERSION).tar.gz
-OPENPOWERLINK_LICENSE = BSD-2c, GPLv2
+OPENPOWERLINK_LICENSE = BSD-2c, GPL-2.0
OPENPOWERLINK_LICENSE_FILES = license.md
OPENPOWERLINK_INSTALL_STAGING = YES
diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index 5c8e143..c83c583 100644
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -6,7 +6,7 @@
OPENSWAN_VERSION = 2.6.46
OPENSWAN_SITE = http://download.openswan.org/openswan
-OPENSWAN_LICENSE = GPLv2+, BSD-3c
+OPENSWAN_LICENSE = GPL-2.0+, BSD-3c
OPENSWAN_LICENSE_FILES = COPYING LICENSE
OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2
diff --git a/package/opentyrian/opentyrian.mk b/package/opentyrian/opentyrian.mk
index 6efbe4e..4417512 100644
--- a/package/opentyrian/opentyrian.mk
+++ b/package/opentyrian/opentyrian.mk
@@ -7,7 +7,7 @@
OPENTYRIAN_VERSION = 9c9f0ec3532b
OPENTYRIAN_SITE = https://bitbucket.org/opentyrian/opentyrian
OPENTYRIAN_SITE_METHOD = hg
-OPENTYRIAN_LICENSE = GPLv2+
+OPENTYRIAN_LICENSE = GPL-2.0+
OPENTYRIAN_LICENSE_FILES = COPYING
OPENTYRIAN_DEPENDENCIES = sdl
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 6581a4e..aba6e30 100644
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -8,7 +8,7 @@ OPENVPN_VERSION = 2.4.1
OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz
OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
OPENVPN_DEPENDENCIES = host-pkgconf openssl
-OPENVPN_LICENSE = GPLv2
+OPENVPN_LICENSE = GPL-2.0
OPENVPN_LICENSE_FILES = COPYRIGHT.GPL
OPENVPN_CONF_OPTS = \
--disable-plugin-auth-pam \
diff --git a/package/opkg-utils/opkg-utils.mk b/package/opkg-utils/opkg-utils.mk
index aa3c44d..6f4e64e 100644
--- a/package/opkg-utils/opkg-utils.mk
+++ b/package/opkg-utils/opkg-utils.mk
@@ -7,7 +7,7 @@
OPKG_UTILS_VERSION = 0.3.4
OPKG_UTILS_SITE = http://git.yoctoproject.org/git/opkg-utils
OPKG_UTILS_SITE_METHOD = git
-OPKG_UTILS_LICENSE = GPLv2+
+OPKG_UTILS_LICENSE = GPL-2.0+
OPKG_UTILS_LICENSE_FILES = COPYING
define HOST_OPKG_UTILS_BUILD_CMDS
diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
index bf19a60..0c7e15e 100644
--- a/package/opkg/opkg.mk
+++ b/package/opkg/opkg.mk
@@ -9,7 +9,7 @@ OPKG_SITE = http://git.yoctoproject.org/git/opkg
OPKG_SITE_METHOD = git
# Uses PKG_CHECK_MODULES() in configure.ac
OPKG_DEPENDENCIES = host-pkgconf libarchive
-OPKG_LICENSE = GPLv2+
+OPKG_LICENSE = GPL-2.0+
OPKG_LICENSE_FILES = COPYING
OPKG_INSTALL_STAGING = YES
OPKG_CONF_OPTS = --disable-curl
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
index f6c0f13..d86b8c5 100644
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -6,7 +6,7 @@
OPROFILE_VERSION = 1.1.0
OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
-OPROFILE_LICENSE = GPLv2+
+OPROFILE_LICENSE = GPL-2.0+
OPROFILE_LICENSE_FILES = COPYING
OPROFILE_CONF_OPTS = \
--disable-account-check \
diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk
index f0f0649..45a71fa 100644
--- a/package/oracle-mysql/oracle-mysql.mk
+++ b/package/oracle-mysql/oracle-mysql.mk
@@ -11,7 +11,7 @@ ORACLE_MYSQL_SITE = http://dev.mysql.com/get/Downloads/MySQL-$(ORACLE_MYSQL_VERS
ORACLE_MYSQL_INSTALL_STAGING = YES
ORACLE_MYSQL_DEPENDENCIES = readline ncurses
ORACLE_MYSQL_AUTORECONF = YES
-ORACLE_MYSQL_LICENSE = GPLv2
+ORACLE_MYSQL_LICENSE = GPL-2.0
ORACLE_MYSQL_LICENSE_FILES = README COPYING
ORACLE_MYSQL_PROVIDES = mysql
diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk
index e0679d2..a7f9ed0 100644
--- a/package/owfs/owfs.mk
+++ b/package/owfs/owfs.mk
@@ -13,7 +13,7 @@ OWFS_CONF_OPTS = --disable-owperl --without-perl5 --disable-owtcl --without-tcl
OWFS_AUTORECONF = YES
# owtcl license is declared in module/ownet/c/src/include/ow_functions.h
-OWFS_LICENSE = GPLv2+, LGPLv2 (owtcl)
+OWFS_LICENSE = GPL-2.0+, LGPLv2 (owtcl)
OWFS_LICENSE_FILES = COPYING COPYING.LIB
OWFS_INSTALL_STAGING = YES
diff --git a/package/p910nd/p910nd.mk b/package/p910nd/p910nd.mk
index a1afdb3..163ab1b 100644
--- a/package/p910nd/p910nd.mk
+++ b/package/p910nd/p910nd.mk
@@ -7,7 +7,7 @@
P910ND_VERSION = 0.97
P910ND_SITE = http://downloads.sourceforge.net/project/p910nd/p910nd/$(P910ND_VERSION)
P910ND_SOURCE = p910nd-$(P910ND_VERSION).tar.bz2
-P910ND_LICENSE = GPLv2
+P910ND_LICENSE = GPL-2.0
P910ND_LICENSE_FILES = COPYING
define P910ND_BUILD_CMDS
diff --git a/package/pangomm/pangomm.mk b/package/pangomm/pangomm.mk
index 2a85e39..7146532 100644
--- a/package/pangomm/pangomm.mk
+++ b/package/pangomm/pangomm.mk
@@ -8,7 +8,7 @@ PANGOMM_VERSION_MAJOR = 2.40
PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).1
PANGOMM_SOURCE = pangomm-$(PANGOMM_VERSION).tar.xz
PANGOMM_SITE = http://ftp.gnome.org/pub/gnome/sources/pangomm/$(PANGOMM_VERSION_MAJOR)
-PANGOMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
+PANGOMM_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (tools)
PANGOMM_LICENSE_FILES = COPYING COPYING.tools
PANGOMM_INSTALL_STAGING = YES
PANGOMM_DEPENDENCIES = glibmm cairomm libsigc pango host-pkgconf
diff --git a/package/pax-utils/pax-utils.mk b/package/pax-utils/pax-utils.mk
index 35ea8e8..b31468e 100644
--- a/package/pax-utils/pax-utils.mk
+++ b/package/pax-utils/pax-utils.mk
@@ -7,7 +7,7 @@
PAX_UTILS_VERSION = 1.2.2
PAX_UTILS_SITE = http://distfiles.gentoo.org/distfiles
PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.xz
-PAX_UTILS_LICENSE = GPLv2
+PAX_UTILS_LICENSE = GPL-2.0
PAX_UTILS_LICENSE_FILES = COPYING
PAX_UTILS_DEPENDENCIES = host-pkgconf
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index e65eadc..5b32eed 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -8,7 +8,7 @@ PCIUTILS_VERSION = 3.5.2
PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils
PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz
PCIUTILS_INSTALL_STAGING = YES
-PCIUTILS_LICENSE = GPLv2+
+PCIUTILS_LICENSE = GPL-2.0+
PCIUTILS_LICENSE_FILES = COPYING
PCIUTILS_MAKE_OPTS = \
CC="$(TARGET_CC)" \
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
index e361909..e173436 100644
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -8,7 +8,7 @@ PCMANFM_VERSION = 1.2.4
PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz
PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files
PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm
-PCMANFM_LICENSE = GPLv2+
+PCMANFM_LICENSE = GPL-2.0+
PCMANFM_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk
index 59a749f..8e77f1d 100644
--- a/package/picocom/picocom.mk
+++ b/package/picocom/picocom.mk
@@ -6,7 +6,7 @@
PICOCOM_VERSION = 2.1
PICOCOM_SITE = $(call github,npat-efault,picocom,$(PICOCOM_VERSION))
-PICOCOM_LICENSE = GPLv2+
+PICOCOM_LICENSE = GPL-2.0+
PICOCOM_LICENSE_FILES = LICENSE.txt
define PICOCOM_BUILD_CMDS
diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk
index bcb910a..e4f68b5 100644
--- a/package/pinentry/pinentry.mk
+++ b/package/pinentry/pinentry.mk
@@ -7,7 +7,7 @@
PINENTRY_VERSION = 0.9.4
PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2
PINENTRY_SITE = ftp://ftp.gnupg.org/gcrypt/pinentry
-PINENTRY_LICENSE = GPLv2+
+PINENTRY_LICENSE = GPL-2.0+
PINENTRY_LICENSE_FILES = COPYING
PINENTRY_DEPENDENCIES = \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk
index 6076bb9..911d40d 100644
--- a/package/policycoreutils/policycoreutils.mk
+++ b/package/policycoreutils/policycoreutils.mk
@@ -6,7 +6,7 @@
POLICYCOREUTILS_VERSION = 2.6
POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
-POLICYCOREUTILS_LICENSE = GPLv2
+POLICYCOREUTILS_LICENSE = GPL-2.0
POLICYCOREUTILS_LICENSE_FILES = COPYING
POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng
diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk
index f31387e..e283181 100644
--- a/package/polkit/polkit.mk
+++ b/package/polkit/polkit.mk
@@ -6,7 +6,7 @@
POLKIT_VERSION = 0.103
POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases
-POLKIT_LICENSE = GPLv2
+POLKIT_LICENSE = GPL-2.0
POLKIT_LICENSE_FILES = COPYING
POLKIT_INSTALL_STAGING = YES
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
index d5f1378..aea90b0 100644
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -8,7 +8,7 @@ POPPLER_VERSION = 0.53.0
POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
POPPLER_SITE = http://poppler.freedesktop.org
POPPLER_DEPENDENCIES = fontconfig host-pkgconf
-POPPLER_LICENSE = GPLv2+
+POPPLER_LICENSE = GPL-2.0+
POPPLER_LICENSE_FILES = COPYING
POPPLER_INSTALL_STAGING = YES
POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
diff --git a/package/powerpc-utils/powerpc-utils.mk b/package/powerpc-utils/powerpc-utils.mk
index f6e0277..0aa79dc 100644
--- a/package/powerpc-utils/powerpc-utils.mk
+++ b/package/powerpc-utils/powerpc-utils.mk
@@ -8,7 +8,7 @@ POWERPC_UTILS_VERSION = v1.3.3
POWERPC_UTILS_SITE = $(call github,nfont,powerpc-utils,$(POWERPC_UTILS_VERSION))
POWERPC_UTILS_DEPENDENCIES = zlib
POWERPC_UTILS_AUTORECONF = YES
-POWERPC_UTILS_LICENSE = GPLv2+
+POWERPC_UTILS_LICENSE = GPL-2.0+
POWERPC_UTILS_LICENSE_FILES = COPYING
POWERPC_UTILS_CONF_ENV = \
diff --git a/package/powertop/powertop.mk b/package/powertop/powertop.mk
index 53be483..bd73e19 100644
--- a/package/powertop/powertop.mk
+++ b/package/powertop/powertop.mk
@@ -7,7 +7,7 @@
POWERTOP_VERSION = 2.7
POWERTOP_SITE = https://01.org/sites/default/files/downloads/powertop
POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-gettext host-pkgconf
-POWERTOP_LICENSE = GPLv2
+POWERTOP_LICENSE = GPL-2.0
POWERTOP_LICENSE_FILES = COPYING
# We're patching Makefile.am
POWERTOP_AUTORECONF = YES
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 55630a8..722146c 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -7,7 +7,7 @@
PPPD_VERSION = 2.4.7
PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
PPPD_SITE = https://download.samba.org/pub/ppp
-PPPD_LICENSE = LGPLv2+, LGPL, BSD-4c, BSD-3c, GPLv2+
+PPPD_LICENSE = LGPLv2+, LGPL, BSD-4c, BSD-3c, GPL-2.0+
PPPD_LICENSE_FILES = \
pppd/tdb.c pppd/plugins/pppoatm/COPYING \
pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c
diff --git a/package/pps-tools/pps-tools.mk b/package/pps-tools/pps-tools.mk
index c3e147a..37bb7e1 100644
--- a/package/pps-tools/pps-tools.mk
+++ b/package/pps-tools/pps-tools.mk
@@ -7,7 +7,7 @@
PPS_TOOLS_VERSION = 47333f24af878f67ce48022e8af16419713aa1ac
PPS_TOOLS_SITE = $(call github,ago,pps-tools,$(PPS_TOOLS_VERSION))
PPS_TOOLS_INSTALL_STAGING = YES
-PPS_TOOLS_LICENSE = GPLv2+
+PPS_TOOLS_LICENSE = GPL-2.0+
PPS_TOOLS_LICENSE_FILES = COPYING
define PPS_TOOLS_BUILD_CMDS
diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index 1538457..17433b0 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -8,7 +8,7 @@ PPTP_LINUX_VERSION = 1.8.0
PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION)
PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz
PPTP_LINUX_MAKE = $(MAKE1)
-PPTP_LINUX_LICENSE = GPLv2+
+PPTP_LINUX_LICENSE = GPL-2.0+
PPTP_LINUX_LICENSE_FILES = COPYING
define PPTP_LINUX_BUILD_CMDS
diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk
index 5f5e7fb..d370ae3 100644
--- a/package/prboom/prboom.mk
+++ b/package/prboom/prboom.mk
@@ -8,7 +8,7 @@ PRBOOM_VERSION = 2.5.0
PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION)
PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes
PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer
-PRBOOM_LICENSE = GPLv2+
+PRBOOM_LICENSE = GPL-2.0+
PRBOOM_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBPNG),y)
diff --git a/package/privoxy/privoxy.mk b/package/privoxy/privoxy.mk
index 267ddc2..df0e737 100644
--- a/package/privoxy/privoxy.mk
+++ b/package/privoxy/privoxy.mk
@@ -10,7 +10,7 @@ PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz
# configure not shipped
PRIVOXY_AUTORECONF = YES
PRIVOXY_DEPENDENCIES = pcre zlib
-PRIVOXY_LICENSE = GPLv2+
+PRIVOXY_LICENSE = GPL-2.0+
PRIVOXY_LICENSE_FILES = LICENSE
$(eval $(autotools-package))
diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk
index 0f8b20c..d5a140b 100644
--- a/package/procps-ng/procps-ng.mk
+++ b/package/procps-ng/procps-ng.mk
@@ -7,7 +7,7 @@
PROCPS_NG_VERSION = 3.3.12
PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production
-PROCPS_NG_LICENSE = GPLv2+, LGPLv2+ (libproc and libps)
+PROCPS_NG_LICENSE = GPL-2.0+, LGPLv2+ (libproc and libps)
PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB
PROCPS_NG_INSTALL_STAGING = YES
PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index b5ffddc..21f7de5 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -6,7 +6,7 @@
PROFTPD_VERSION = 1.3.5d
PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source
-PROFTPD_LICENSE = GPLv2+
+PROFTPD_LICENSE = GPL-2.0+
PROFTPD_LICENSE_FILES = COPYING
PROFTPD_CONF_ENV = \
diff --git a/package/proxychains-ng/proxychains-ng.mk b/package/proxychains-ng/proxychains-ng.mk
index 54e7dcd..0d31bce 100644
--- a/package/proxychains-ng/proxychains-ng.mk
+++ b/package/proxychains-ng/proxychains-ng.mk
@@ -7,7 +7,7 @@
PROXYCHAINS_NG_VERSION = 4.6
PROXYCHAINS_NG_SOURCE = proxychains-$(PROXYCHAINS_NG_VERSION).tar.bz2
PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng
-PROXYCHAINS_NG_LICENSE = GPLv2+
+PROXYCHAINS_NG_LICENSE = GPL-2.0+
PROXYCHAINS_NG_LICENSE_FILES = COPYING
define PROXYCHAINS_NG_CONFIGURE_CMDS
diff --git a/package/pru-software-support/pru-software-support.mk b/package/pru-software-support/pru-software-support.mk
index adaa4ac..ee28de6 100644
--- a/package/pru-software-support/pru-software-support.mk
+++ b/package/pru-software-support/pru-software-support.mk
@@ -6,7 +6,7 @@
PRU_SOFTWARE_SUPPORT_VERSION = v5.1.0
PRU_SOFTWARE_SUPPORT_SITE = https://git.ti.com/pru-software-support-package/pru-software-support-package/archive-tarball/$(PRU_SOFTWARE_SUPPORT_VERSION)?
-PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3c, GPLv2, Public Domain
+PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3c, GPL-2.0, Public Domain
PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v5.0-Manifest.html
PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support
HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
index 2f83b7d..70caf5e 100644
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -8,7 +8,7 @@ PSMISC_VERSION = 22.21
PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc
PSMISC_PATCH = \
https://gitlab.com/psmisc/psmisc/commit/e7203c36a2a4dc10cd8268a5dc036fc9c2a73b6c.diff
-PSMISC_LICENSE = GPLv2
+PSMISC_LICENSE = GPL-2.0
PSMISC_LICENSE_FILES = COPYING
PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
diff --git a/package/psplash/psplash.mk b/package/psplash/psplash.mk
index 4e365c5..0bd985f 100644
--- a/package/psplash/psplash.mk
+++ b/package/psplash/psplash.mk
@@ -6,7 +6,7 @@
PSPLASH_VERSION = 14c8f7b705de944beb4de3f296506d80871e410f
PSPLASH_SITE = git://git.yoctoproject.org/psplash
-PSPLASH_LICENSE = GPLv2+
+PSPLASH_LICENSE = GPL-2.0+
PSPLASH_AUTORECONF = YES
define PSPLASH_INSTALL_INIT_SYSTEMD
diff --git a/package/pwgen/pwgen.mk b/package/pwgen/pwgen.mk
index 9810097..653adb8 100644
--- a/package/pwgen/pwgen.mk
+++ b/package/pwgen/pwgen.mk
@@ -6,7 +6,7 @@
PWGEN_VERSION = 2.07
PWGEN_SITE = http://downloads.sourceforge.net/project/pwgen/pwgen/$(PWGEN_VERSION)
-PWGEN_LICENSE = GPLv2
+PWGEN_LICENSE = GPL-2.0
PWGEN_LICENSE_FILES = debian/copyright
$(eval $(autotools-package))
diff --git a/package/python-dicttoxml/python-dicttoxml.mk b/package/python-dicttoxml/python-dicttoxml.mk
index 6976715..537afff 100644
--- a/package/python-dicttoxml/python-dicttoxml.mk
+++ b/package/python-dicttoxml/python-dicttoxml.mk
@@ -8,7 +8,7 @@ PYTHON_DICTTOXML_VERSION = 1.7.4
PYTHON_DICTTOXML_SOURCE = dicttoxml-$(PYTHON_DICTTOXML_VERSION).tar.gz
PYTHON_DICTTOXML_SITE = https://pypi.python.org/packages/74/36/534db111db9e7610a41641a1f6669a964aacaf51858f466de264cc8dcdd9
PYTHON_DICTTOXML_SETUP_TYPE = distutils
-PYTHON_DICTTOXML_LICENSE = GPLv2
+PYTHON_DICTTOXML_LICENSE = GPL-2.0
PYTHON_DICTTOXML_LICENSE_FILES = LICENCE.txt
$(eval $(python-package))
diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk
index 157576e..d4cdded 100644
--- a/package/python-id3/python-id3.mk
+++ b/package/python-id3/python-id3.mk
@@ -8,7 +8,7 @@ PYTHON_ID3_VERSION = 1.2
PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz
PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION)
PYTHON_ID3_SETUP_TYPE = distutils
-PYTHON_ID3_LICENSE = GPLv2+
+PYTHON_ID3_LICENSE = GPL-2.0+
PYTHON_ID3_LICENSE_FILES = COPYING
$(eval $(python-package))
diff --git a/package/python-mad/python-mad.mk b/package/python-mad/python-mad.mk
index 5a49887..a222148 100644
--- a/package/python-mad/python-mad.mk
+++ b/package/python-mad/python-mad.mk
@@ -8,7 +8,7 @@ PYTHON_MAD_VERSION = 0.6
PYTHON_MAD_SOURCE = pymad-$(PYTHON_MAD_VERSION).tar.gz
PYTHON_MAD_SITE = http://spacepants.org/src/pymad/download
PYTHON_MAD_SETUP_TYPE = distutils
-PYTHON_MAD_LICENSE = GPLv2+
+PYTHON_MAD_LICENSE = GPL-2.0+
PYTHON_MAD_LICENSE_FILES = COPYING
PYTHON_MAD_DEPENDENCIES = libmad
diff --git a/package/python-mutagen/python-mutagen.mk b/package/python-mutagen/python-mutagen.mk
index c80eb98..3b516fe 100644
--- a/package/python-mutagen/python-mutagen.mk
+++ b/package/python-mutagen/python-mutagen.mk
@@ -7,7 +7,7 @@
PYTHON_MUTAGEN_VERSION = 1.36.2
PYTHON_MUTAGEN_SOURCE = mutagen-$(PYTHON_MUTAGEN_VERSION).tar.gz
PYTHON_MUTAGEN_SITE = https://pypi.python.org/packages/e7/8a/61496657e30c2cbeb9b3aa28848e0adbcba7cab0ff0bd8e6206647670088
-PYTHON_MUTAGEN_LICENSE = GPLv2
+PYTHON_MUTAGEN_LICENSE = GPL-2.0
PYTHON_MUTAGEN_LICENSE_FILES = COPYING
PYTHON_MUTAGEN_SETUP_TYPE = distutils
diff --git a/package/python-pylru/python-pylru.mk b/package/python-pylru/python-pylru.mk
index e670f3d..75b6de7 100644
--- a/package/python-pylru/python-pylru.mk
+++ b/package/python-pylru/python-pylru.mk
@@ -8,7 +8,7 @@ PYTHON_PYLRU_VERSION = 1.0.9
PYTHON_PYLRU_SOURCE = pylru-$(PYTHON_PYLRU_VERSION).tar.gz
PYTHON_PYLRU_SITE = https://pypi.python.org/packages/c0/7d/0de1055632f3871dfeaabe5a3f0510317cd98b93e7b792b44e4c7de2b17b
PYTHON_PYLRU_SETUP_TYPE = distutils
-PYTHON_PYLRU_LICENSE = GPLv2
+PYTHON_PYLRU_LICENSE = GPL-2.0
PYTHON_PYLRU_LICENSE_FILES = LICENSE.txt
$(eval $(python-package))
diff --git a/package/python-pyparted/python-pyparted.mk b/package/python-pyparted/python-pyparted.mk
index 4bf58c4..4a691f2 100644
--- a/package/python-pyparted/python-pyparted.mk
+++ b/package/python-pyparted/python-pyparted.mk
@@ -7,7 +7,7 @@
PYTHON_PYPARTED_VERSION = v3.10.7
PYTHON_PYPARTED_SITE = $(call github,rhinstaller,pyparted,$(PYTHON_PYPARTED_VERSION))
PYTHON_PYPARTED_SETUP_TYPE = distutils
-PYTHON_PYPARTED_LICENSE = GPLv2+
+PYTHON_PYPARTED_LICENSE = GPL-2.0+
PYTHON_PYPARTED_LICENSE_FILES = COPYING
PYTHON_PYPARTED_DEPENDENCIES = host-python-cffi parted
diff --git a/package/python-pyqt/python-pyqt.mk b/package/python-pyqt/python-pyqt.mk
index 50e8351..f689be6 100644
--- a/package/python-pyqt/python-pyqt.mk
+++ b/package/python-pyqt/python-pyqt.mk
@@ -7,7 +7,7 @@
PYTHON_PYQT_VERSION = 4.11.3
PYTHON_PYQT_SOURCE = PyQt-x11-gpl-$(PYTHON_PYQT_VERSION).tar.gz
PYTHON_PYQT_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt4/PyQt-$(PYTHON_PYQT_VERSION)
-PYTHON_PYQT_LICENSE = GPLv2 or GPLv3
+PYTHON_PYQT_LICENSE = GPL-2.0 or GPLv3
PYTHON_PYQT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3
PYTHON_PYQT_DEPENDENCIES = python-sip host-python-sip qt
diff --git a/package/python-pyroute2/python-pyroute2.mk b/package/python-pyroute2/python-pyroute2.mk
index f026b7f..eed8eb4 100644
--- a/package/python-pyroute2/python-pyroute2.mk
+++ b/package/python-pyroute2/python-pyroute2.mk
@@ -7,7 +7,7 @@
PYTHON_PYROUTE2_VERSION = 0.4.13
PYTHON_PYROUTE2_SOURCE = pyroute2-$(PYTHON_PYROUTE2_VERSION).tar.gz
PYTHON_PYROUTE2_SITE = https://pypi.python.org/packages/91/e7/814f60e355078dc51625cd2e7e715ed4a06111ddf2ac5580f2f10e79c94a
-PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPLv2+
+PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPL-2.0+
PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache.v2 LICENSE.GPL.v2 README.license.md
PYTHON_PYROUTE2_SETUP_TYPE = distutils
diff --git a/package/python-scapy3k/python-scapy3k.mk b/package/python-scapy3k/python-scapy3k.mk
index 661cb9d..e858dcc 100644
--- a/package/python-scapy3k/python-scapy3k.mk
+++ b/package/python-scapy3k/python-scapy3k.mk
@@ -7,6 +7,6 @@
PYTHON_SCAPY3K_VERSION = v0.18
PYTHON_SCAPY3K_SITE = $(call github,phaethon,scapy,$(PYTHON_SCAPY3K_VERSION))
PYTHON_SCAPY3K_SETUP_TYPE = distutils
-PYTHON_SCAPY3K_LICENSE = GPLv2+
+PYTHON_SCAPY3K_LICENSE = GPL-2.0+
$(eval $(python-package))
diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk
index 0c0a947..60adec2 100644
--- a/package/python-sip/python-sip.mk
+++ b/package/python-sip/python-sip.mk
@@ -7,7 +7,7 @@
PYTHON_SIP_VERSION = 4.18
PYTHON_SIP_SOURCE = sip-$(PYTHON_SIP_VERSION).tar.gz
PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON_SIP_VERSION)
-PYTHON_SIP_LICENSE = SIP license or GPLv2 or GPLv3
+PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPLv3
PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3
ifeq ($(BR2_PACKAGE_QT5),y)
diff --git a/package/python-smbus-cffi/python-smbus-cffi.mk b/package/python-smbus-cffi/python-smbus-cffi.mk
index 5fd9558..bc5731d 100644
--- a/package/python-smbus-cffi/python-smbus-cffi.mk
+++ b/package/python-smbus-cffi/python-smbus-cffi.mk
@@ -8,7 +8,7 @@ PYTHON_SMBUS_CFFI_VERSION = 0.5.1
PYTHON_SMBUS_CFFI_SOURCE = smbus-cffi-$(PYTHON_SMBUS_CFFI_VERSION).tar.gz
PYTHON_SMBUS_CFFI_SITE = https://pypi.python.org/packages/source/s/smbus-cffi
PYTHON_SMBUS_CFFI_SETUP_TYPE = setuptools
-PYTHON_SMBUS_CFFI_LICENSE = GPLv2
+PYTHON_SMBUS_CFFI_LICENSE = GPL-2.0
PYTHON_SMBUS_CFFI_LICENSE_FILES = LICENSE
PYTHON_SMBUS_CFFI_DEPENDENCIES = host-python-cffi
diff --git a/package/python-spidev/python-spidev.mk b/package/python-spidev/python-spidev.mk
index d839bb3..17fb049 100644
--- a/package/python-spidev/python-spidev.mk
+++ b/package/python-spidev/python-spidev.mk
@@ -8,7 +8,7 @@ PYTHON_SPIDEV_VERSION = 3.2
PYTHON_SPIDEV_SOURCE = spidev-$(PYTHON_SPIDEV_VERSION).tar.gz
PYTHON_SPIDEV_SITE = https://pypi.python.org/packages/36/83/73748b6e1819b57d8e1df8090200195cdae33aaa22a49a91ded16785eedd
PYTHON_SPIDEV_SETUP_TYPE = distutils
-PYTHON_SPIDEV_LICENSE = GPLv2
+PYTHON_SPIDEV_LICENSE = GPL-2.0
PYTHON_SPIDEV_LICENSE_FILES = LICENSE.md
$(eval $(python-package))
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index e744556..6c42490 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -7,7 +7,7 @@
QEMU_VERSION = 2.8.0
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
QEMU_SITE = http://wiki.qemu.org/download
-QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
+QEMU_LICENSE = GPL-2.0, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
QEMU_LICENSE_FILES = COPYING COPYING.LIB
#?NOTE: there is no top-level license file for non-(L)GPL licenses;
# the non-(L)GPL license texts are specified in the affected
diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
index 5dac5b0..77e9c53 100644
--- a/package/qt5/qt53d/qt53d.mk
+++ b/package/qt5/qt53d/qt53d.mk
@@ -15,7 +15,7 @@ QT53D_DEPENDENCIES += assimp
endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT53D_LICENSE = GPLv2 or GPLv3 or LGPLv3
+QT53D_LICENSE = GPL-2.0 or GPLv3 or LGPLv3
QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3
else
QT53D_LICENSE = Commercial license
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 1020348..b1fd6fb 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -50,7 +50,7 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5BASE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5BASE_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk
index 3f605ab..7a35a76 100644
--- a/package/qt5/qt5canvas3d/qt5canvas3d.mk
+++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk
@@ -11,7 +11,7 @@ QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative
QT5CANVAS3D_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5CANVAS3D_LICENSE = GPLv2 or GPLv3 or LGPLv3
+QT5CANVAS3D_LICENSE = GPL-2.0 or GPLv3 or LGPLv3
QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
else
QT5CANVAS3D_LICENSE = Commercial license
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index f00dcb2..f0e1e4d 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -12,10 +12,10 @@ QT5CONNECTIVITY_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5CONNECTIVITY_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5CONNECTIVITY_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index d5b298c..66a2696 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -12,7 +12,7 @@ QT5DECLARATIVE_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5DECLARATIVE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index aef69eb..76d9ddc 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -12,10 +12,10 @@ QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5GRAPHICALEFFECTS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5GRAPHICALEFFECTS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index d764925..802a3f4 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -12,10 +12,10 @@ QT5IMAGEFORMATS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5IMAGEFORMATS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5IMAGEFORMATS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index dbdc645..f6f413c 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -12,10 +12,10 @@ QT5LOCATION_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5LOCATION_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5LOCATION_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 0a95340..638133d 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -12,7 +12,7 @@ QT5MULTIMEDIA_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5MULTIMEDIA_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5MULTIMEDIA_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 43254ba..0a1d632 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -11,7 +11,7 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5QUICKCONTROLS_LICENSE = Commercial license
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index fb9ef32..00c0ac0 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -12,10 +12,10 @@ QT5SENSORS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SENSORS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5SENSORS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SENSORS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SENSORS_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
index b188f5d..636b529 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.mk
+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -11,7 +11,7 @@ QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport
QT5SERIALBUS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SERIALBUS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5SERIALBUS_LICENSE = GPL-2.0 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5SERIALBUS_LICENSE = Commercial license
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index 4fbca9e..b0f0cec 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -12,10 +12,10 @@ QT5SERIALPORT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SERIALPORT_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SERIALPORT_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index 08821e4..e946a67 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -12,7 +12,7 @@ QT5SVG_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SVG_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5SVG_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5SVG_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index 0395f96..1f02eb2 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -21,7 +21,7 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5TOOLS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5TOOLS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5TOOLS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 9522a74..1d10a5c 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -12,10 +12,10 @@ QT5WEBCHANNEL_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5WEBCHANNEL_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5WEBCHANNEL_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index 975ea64..972fa73 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -12,7 +12,7 @@ QT5WEBSOCKETS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5WEBSOCKETS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools)
+QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools)
QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3
else
QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3
--git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index 996056b..d3d409e 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -12,10 +12,10 @@ QT5X11EXTRAS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5X11EXTRAS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5X11EXTRAS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index e5981af..d33d180 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -12,7 +12,7 @@ QT5XMLPATTERNS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5XMLPATTERNS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
QT5XMLPATTERNS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index c17ceaa..b2b4e2a 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -7,7 +7,7 @@
QUAGGA_VERSION = 1.1.1
QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
QUAGGA_DEPENDENCIES = host-gawk host-pkgconf
-QUAGGA_LICENSE = GPLv2+
+QUAGGA_LICENSE = GPL-2.0+
QUAGGA_LICENSE_FILES = COPYING
# We need to override the sysconf and localstate directories so that
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
index a1e343a..d3b8755 100644
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -8,7 +8,7 @@ QUOTA_VERSION = 4.01
QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
QUOTA_DEPENDENCIES = host-gettext
QUOTA_AUTORECONF = YES
-QUOTA_LICENSE = GPLv2+
+QUOTA_LICENSE = GPL-2.0+
QUOTA_CONF_OPTS = --disable-strip-binaries
QUOTA_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/racehound/racehound.mk b/package/racehound/racehound.mk
index 8e282c1..6499e16 100644
--- a/package/racehound/racehound.mk
+++ b/package/racehound/racehound.mk
@@ -6,7 +6,7 @@
RACEHOUND_VERSION = f09f06fcc3c77c8c5541be3ba5be80aa8148ce0c
RACEHOUND_SITE = $(call github,winnukem,racehound,$(RACEHOUND_VERSION))
-RACEHOUND_LICENSE = GPLv2
+RACEHOUND_LICENSE = GPL-2.0
RACEHOUND_LICENSE_FILES = LICENSE
RACEHOUND_SUPPORTS_IN_SOURCE_BUILD = NO
diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk
index 2653663..445d2be 100644
--- a/package/raptor/raptor.mk
+++ b/package/raptor/raptor.mk
@@ -8,7 +8,7 @@ RAPTOR_VERSION = 2.0.15
RAPTOR_SOURCE = raptor2-$(RAPTOR_VERSION).tar.gz
RAPTOR_SITE = http://download.librdf.org/source
RAPTOR_DEPENDENCIES = libxml2 libxslt
-RAPTOR_LICENSE = GPLv2+ or LGPLv2.1+ or Apache-2.0+
+RAPTOR_LICENSE = GPL-2.0+ or LGPLv2.1+ or Apache-2.0+
RAPTOR_LICENSE_FILES = LICENSE.txt
RAPTOR_INSTALL_STAGING = YES
diff --git a/package/rng-tools/rng-tools.mk b/package/rng-tools/rng-tools.mk
index cc07bdf..bbb1a64 100644
--- a/package/rng-tools/rng-tools.mk
+++ b/package/rng-tools/rng-tools.mk
@@ -6,7 +6,7 @@
RNG_TOOLS_VERSION = 5
RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION)
-RNG_TOOLS_LICENSE = GPLv2
+RNG_TOOLS_LICENSE = GPL-2.0
RNG_TOOLS_LICENSE_FILES = COPYING
# Work around for uClibc or musl toolchains which lack argp_*()
diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
index 99d231e..4214df9 100644
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -6,7 +6,7 @@
RP_PPPOE_VERSION = 3.12
RP_PPPOE_SITE = http://www.roaringpenguin.com/files/download
-RP_PPPOE_LICENSE = GPLv2
+RP_PPPOE_LICENSE = GPL-2.0
RP_PPPOE_LICENSE_FILES = doc/LICENSE
RP_PPPOE_DEPENDENCIES = pppd
RP_PPPOE_SUBDIR = src
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 1c03f2e..d57dd70 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -9,7 +9,7 @@ RPM_VERSION = $(RPM_VERSION_MAJOR).0.1
RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2
RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x
RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib
-RPM_LICENSE = GPLv2 or LGPLv2 (library only)
+RPM_LICENSE = GPL-2.0 or LGPLv2 (library only)
RPM_LICENSE_FILES = COPYING
RPM_PATCH = \
https://github.com/rpm-software-management/rpm/commit/b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch \
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
index abca1d8..84c7bb7 100644
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -6,7 +6,7 @@
RRDTOOL_VERSION = 1.6.0
RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
-RRDTOOL_LICENSE = GPLv2+ with FLOSS license exceptions as explained in COPYRIGHT
+RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT
RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE
RRDTOOL_DEPENDENCIES = host-pkgconf libglib2
# autoreconf needed to avoid link failure due to missing -lintl,
diff --git a/package/rsh-redone/rsh-redone.mk b/package/rsh-redone/rsh-redone.mk
index a62c2df..f63da64 100644
--- a/package/rsh-redone/rsh-redone.mk
+++ b/package/rsh-redone/rsh-redone.mk
@@ -7,7 +7,7 @@
RSH_REDONE_VERSION = 85
RSH_REDONE_SOURCE = rsh-redone_$(RSH_REDONE_VERSION).orig.tar.gz
RSH_REDONE_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/r/rsh-redone
-RSH_REDONE_LICENSE = GPLv2
+RSH_REDONE_LICENSE = GPL-2.0
RSH_REDONE_LICENSE_FILES = rsh.c
RSH_REDONE_BINS-y =
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
index 9a9c562..fb0ce5d 100644
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -7,7 +7,7 @@
RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests
RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz
RT_TESTS_VERSION = 1.0
-RT_TESTS_LICENSE = GPLv2+
+RT_TESTS_LICENSE = GPL-2.0+
RT_TESTS_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_PYTHON),y)
diff --git a/package/rtl8188eu/rtl8188eu.mk b/package/rtl8188eu/rtl8188eu.mk
index 8560be2..5c1cc73 100644
--- a/package/rtl8188eu/rtl8188eu.mk
+++ b/package/rtl8188eu/rtl8188eu.mk
@@ -6,7 +6,7 @@
RTL8188EU_VERSION = ced2b64a1139dcaf86947e3a9f7617dffbd64239
RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION))
-RTL8188EU_LICENSE = GPLv2, proprietary (rtl8188eufw.bin firmware blob)
+RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob)
RTL8188EU_LICENSE_FILES = COPYING
RTL8188EU_MODULE_MAKE_OPTS = CONFIG_RTL8188EU=m
diff --git a/package/rtl8723bs/rtl8723bs.mk b/package/rtl8723bs/rtl8723bs.mk
index f5bc1ac..4c6303c 100644
--- a/package/rtl8723bs/rtl8723bs.mk
+++ b/package/rtl8723bs/rtl8723bs.mk
@@ -6,7 +6,7 @@
RTL8723BS_VERSION = 11ab92d8ccd71c80f0102828366b14ef6b676fb2
RTL8723BS_SITE = $(call github,hadess,rtl8723bs,$(RTL8723BS_VERSION))
-RTL8723BS_LICENSE = GPLv2, proprietary (*.bin firmware blobs)
+RTL8723BS_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs)
RTL8723BS_MODULE_MAKE_OPTS = \
CONFIG_RTL8723BS=m \
diff --git a/package/rtl8821au/rtl8821au.mk b/package/rtl8821au/rtl8821au.mk
index 9ba43ef..5f39bc5 100644
--- a/package/rtl8821au/rtl8821au.mk
+++ b/package/rtl8821au/rtl8821au.mk
@@ -6,7 +6,7 @@
RTL8821AU_VERSION = c33ddb05a77741d2a9c9b974ad0cf0fa26d17b6e
RTL8821AU_SITE = $(call github,abperiasamy,rtl8812AU_8821AU_linux,$(RTL8821AU_VERSION))
-RTL8821AU_LICENSE = GPLv2
+RTL8821AU_LICENSE = GPL-2.0
RTL8821AU_LICENSE_FILES = COPYING
RTL8821AU_MODULE_MAKE_OPTS = \
diff --git a/package/rtorrent/rtorrent.mk b/package/rtorrent/rtorrent.mk
index edde02e..51dc9ee 100644
--- a/package/rtorrent/rtorrent.mk
+++ b/package/rtorrent/rtorrent.mk
@@ -8,7 +8,7 @@ RTORRENT_VERSION = 0.9.6
RTORRENT_SITE = http://rtorrent.net/downloads
RTORRENT_DEPENDENCIES = host-pkgconf libcurl libtorrent ncurses
RTORRENT_AUTORECONF = YES
-RTORRENT_LICENSE = GPLv2
+RTORRENT_LICENSE = GPL-2.0
RTORRENT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
index 37e5136..ed3b912 100644
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -7,7 +7,7 @@
SANE_BACKENDS_VERSION = 1.0.25
SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/file/4146
SANE_BACKENDS_CONFIG_SCRIPTS = sane-config
-SANE_BACKENDS_LICENSE = GPLv2+
+SANE_BACKENDS_LICENSE = GPL-2.0+
SANE_BACKENDS_LICENSE_FILES = COPYING
SANE_BACKENDS_INSTALL_STAGING = YES
diff --git a/package/sbc/sbc.mk b/package/sbc/sbc.mk
index 60ebc74..6bafe03 100644
--- a/package/sbc/sbc.mk
+++ b/package/sbc/sbc.mk
@@ -9,7 +9,7 @@ SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz
SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
SBC_INSTALL_STAGING = YES
SBC_DEPENDENCIES = libsndfile host-pkgconf
-SBC_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library)
+SBC_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (library)
SBC_LICENSE_FILES = COPYING COPYING.LIB
$(eval $(autotools-package))
diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index 793ca6f..cf7bcbc 100644
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -6,7 +6,7 @@
SCONESERVER_VERSION = d659468cd164e6a6cc12932cc6780566b04f8328
SCONESERVER_SITE = $(call github,sconemad,sconeserver,$(SCONESERVER_VERSION))
-SCONESERVER_LICENSE = GPLv2+
+SCONESERVER_LICENSE = GPL-2.0+
SCONESERVER_LICENSE_FILES = COPYING
# fetching from Git, we need to generate the configure script
SCONESERVER_AUTORECONF = YES
diff --git a/package/scrub/scrub.mk b/package/scrub/scrub.mk
index b816272..0207a4c 100644
--- a/package/scrub/scrub.mk
+++ b/package/scrub/scrub.mk
@@ -6,7 +6,7 @@
SCRUB_VERSION = 2.6.1
SCRUB_SITE = $(call github,chaos,scrub,$(SCRUB_VERSION))
-SCRUB_LICENSE = GPLv2+
+SCRUB_LICENSE = GPL-2.0+
SCRUB_LICENSE_FILES = COPYING DISCLAIMER
SCRUB_PATCH = https://github.com/chaos/scrub/commit/11d30916dd9c11a26c7c8a0f6db9e6ebca301594.patch
diff --git a/package/sepolgen/sepolgen.mk b/package/sepolgen/sepolgen.mk
index 137eaed..94c0d59 100644
--- a/package/sepolgen/sepolgen.mk
+++ b/package/sepolgen/sepolgen.mk
@@ -6,7 +6,7 @@
SEPOLGEN_VERSION = 2.6
SEPOLGEN_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
-SEPOLGEN_LICENSE = GPLv2
+SEPOLGEN_LICENSE = GPL-2.0
SEPOLGEN_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_PYTHON3),y)
diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index 3d9002a..833becc 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -6,7 +6,7 @@
SER2NET_VERSION = 3.4
SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
-SER2NET_LICENSE = GPLv2+
+SER2NET_LICENSE = GPL-2.0+
SER2NET_LICENSE_FILES = COPYING
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/package/setools/setools.mk b/package/setools/setools.mk
index 87a19cf..7ff14ac 100644
--- a/package/setools/setools.mk
+++ b/package/setools/setools.mk
@@ -9,7 +9,7 @@ SETOOLS_SOURCE = setools-$(SETOOLS_VERSION).tar.bz2
SETOOLS_SITE = https://raw.githubusercontent.com/wiki/TresysTechnology/setools3/files/dists/setools-$(SETOOLS_VERSION)
SETOOLS_DEPENDENCIES = libselinux libsepol sqlite libxml2 bzip2 host-bison host-flex
SETOOLS_INSTALL_STAGING = YES
-SETOOLS_LICENSE = GPLv2+, LGPLv2.1+
+SETOOLS_LICENSE = GPL-2.0+, LGPLv2.1+
SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
# configure.ac is patched by the cross compile patch,
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index 561fbe9..66ca59d 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -8,7 +8,7 @@ SETSERIAL_VERSION = 2.17
SETSERIAL_PATCH = setserial_2.17-45.3.diff.gz
SETSERIAL_SOURCE = setserial_$(SETSERIAL_VERSION).orig.tar.gz
SETSERIAL_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/setserial
-SETSERIAL_LICENSE = GPLv2
+SETSERIAL_LICENSE = GPL-2.0
SETSERIAL_LICENSE_FILES = debian/copyright
# make all also builds setserial.cat which needs nroff
SETSERIAL_MAKE_OPTS = setserial
diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk
index e7af83a..bc7b0b5 100644
--- a/package/sg3_utils/sg3_utils.mk
+++ b/package/sg3_utils/sg3_utils.mk
@@ -10,7 +10,7 @@ SG3_UTILS_SITE = http://sg.danny.cz/sg/p
SG3_UTILS_LICENSE = BSD-3c
# utils progs are GPLv2+ licenced
ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y)
-SG3_UTILS_LICENSE += GPLv2+
+SG3_UTILS_LICENSE += GPL-2.0+
endif
SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index 64bb4d5..300c3e0 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -16,7 +16,7 @@ SHARED_MIME_INFO_CONF_OPTS = \
HOST_SHARED_MIME_INFO_CONF_OPTS = \
--disable-update-mimedb \
--disable-default-make-check
-SHARED_MIME_INFO_LICENSE = GPLv2
+SHARED_MIME_INFO_LICENSE = GPL-2.0
SHARED_MIME_INFO_LICENSE_FILES = COPYING
HOST_SHARED_MIME_INFO_DEPENDENCIES = \
diff --git a/package/shellinabox/shellinabox.mk b/package/shellinabox/shellinabox.mk
index 1173ef7..1db62e6 100644
--- a/package/shellinabox/shellinabox.mk
+++ b/package/shellinabox/shellinabox.mk
@@ -6,7 +6,7 @@
SHELLINABOX_VERSION = v2.19
SHELLINABOX_SITE = $(call github,shellinabox,shellinabox,$(SHELLINABOX_VERSION))
-SHELLINABOX_LICENSE = GPLv2 with OpenSSL exception
+SHELLINABOX_LICENSE = GPL-2.0 with OpenSSL exception
SHELLINABOX_LICENSE_FILES = COPYING GPL-2
# Fetching from Github, and patching Makefile.am, so we need to autoreconf
diff --git a/package/simicsfs/simicsfs.mk b/package/simicsfs/simicsfs.mk
index 91ed413..fe05302 100644
--- a/package/simicsfs/simicsfs.mk
+++ b/package/simicsfs/simicsfs.mk
@@ -6,7 +6,7 @@
SIMICSFS_VERSION = 1.18
SIMICSFS_SITE = http://download.simics.net/pub
-SIMICSFS_LICENSE = GPLv2+
+SIMICSFS_LICENSE = GPL-2.0+
SIMICSFS_LICENSE_FILES = hostfs.h
$(eval $(kernel-module))
diff --git a/package/sispmctl/sispmctl.mk b/package/sispmctl/sispmctl.mk
index 3f3635e..85c0338 100644
--- a/package/sispmctl/sispmctl.mk
+++ b/package/sispmctl/sispmctl.mk
@@ -6,7 +6,7 @@
SISPMCTL_VERSION = 3.1
SISPMCTL_SITE = http://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION)
-SISPMCTL_LICENSE = GPLv2+
+SISPMCTL_LICENSE = GPL-2.0+
SISPMCTL_LICENSE_FILES = LICENCE
SISPMCTL_DEPENDENCIES = libusb-compat
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index e6abdee..7feaeb4 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -6,7 +6,7 @@
SLANG_VERSION = 2.3.0
SLANG_SITE = http://www.jedsoft.org/releases/slang
-SLANG_LICENSE = GPLv2+
+SLANG_LICENSE = GPL-2.0+
SLANG_LICENSE_FILES = COPYING
SLANG_INSTALL_STAGING = YES
SLANG_CONF_OPTS = --with-onig=no
diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index cd0c076..137c00a 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -6,7 +6,7 @@
SMARTMONTOOLS_VERSION = 6.5
SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
-SMARTMONTOOLS_LICENSE = GPLv2+
+SMARTMONTOOLS_LICENSE = GPL-2.0+
SMARTMONTOOLS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk
index a3d4bc4..0dd39ea 100644
--- a/package/smcroute/smcroute.mk
+++ b/package/smcroute/smcroute.mk
@@ -7,7 +7,7 @@
SMCROUTE_VERSION = 2.1.1
SMCROUTE_SOURCE = smcroute-$(SMCROUTE_VERSION).tar.xz
SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION)
-SMCROUTE_LICENSE = GPLv2+
+SMCROUTE_LICENSE = GPL-2.0+
SMCROUTE_LICENSE_FILES = COPYING
SMCROUTE_CONF_OPTS = ac_cv_func_setpgrp_void=yes
diff --git a/package/smstools3/smstools3.mk b/package/smstools3/smstools3.mk
index 52f9b31..2dfd11b 100644
--- a/package/smstools3/smstools3.mk
+++ b/package/smstools3/smstools3.mk
@@ -6,7 +6,7 @@
SMSTOOLS3_VERSION = 3.1.15
SMSTOOLS3_SITE = http://smstools3.kekekasvi.com/packages
-SMSTOOLS3_LICENSE = GPLv2+
+SMSTOOLS3_LICENSE = GPL-2.0+
SMSTOOLS3_LICENSE_FILES = doc/license.html LICENSE
SMSTOOLS3_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index 754b210..ba46263 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -7,7 +7,7 @@
SOCAT_VERSION = 2.0.0-b9
SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
SOCAT_SITE = http://www.dest-unreach.org/socat/download
-SOCAT_LICENSE = GPLv2
+SOCAT_LICENSE = GPL-2.0
SOCAT_LICENSE_FILES = COPYING
SOCAT_CONF_ENV = \
sc_cv_termios_ispeed=no \
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
index 0cc56ef..3b4bba6 100644
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -7,7 +7,7 @@
SOCKETCAND_VERSION = df7fb4ff8a4439d7737fe2df3540e1ab7465721a
SOCKETCAND_SITE = $(call github,dschanoeh,socketcand,$(SOCKETCAND_VERSION))
SOCKETCAND_AUTORECONF = YES
-SOCKETCAND_LICENSE = BSD-3c or GPLv2
+SOCKETCAND_LICENSE = BSD-3c or GPL-2.0
SOCKETCAND_LICENSE_FILES = socketcand.c
ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
diff --git a/package/softether/softether.mk b/package/softether/softether.mk
index da7d129..0222629 100644
--- a/package/softether/softether.mk
+++ b/package/softether/softether.mk
@@ -9,7 +9,7 @@ SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN,$(SOFTETHER_VERSION))
SOFTETHER_PATCH = \
https://github.com/dajhorn/SoftEtherVPN/commit/c5e5d7e93c6f3302adf5821c29c4efdb7630e418.patch \
https://github.com/dajhorn/SoftEtherVPN/commit/75625af541fd128f51079d0ffe5ef24645b8f421.patch
-SOFTETHER_LICENSE = GPLv2
+SOFTETHER_LICENSE = GPL-2.0
SOFTETHER_LICENSE_FILES = LICENSE
SOFTETHER_DEPENDENCIES = host-softether openssl readline
SOFTETHER_AUTORECONF = YES
diff --git a/package/sox/sox.mk b/package/sox/sox.mk
index 61f5220..186f37d 100644
--- a/package/sox/sox.mk
+++ b/package/sox/sox.mk
@@ -10,7 +10,7 @@ SOX_SOURCE = sox-$(SOX_VERSION).tar.bz2
SOX_DEPENDENCIES = host-pkgconf
SOX_CONF_OPTS = --with-distro="Buildroot" --without-ffmpeg --disable-gomp \
$(if $(BR2_TOOLCHAIN_HAS_SSP),,--disable-stack-protector)
-SOX_LICENSE = GPLv2+ (sox binary), LGPLv2.1+ (libraries)
+SOX_LICENSE = GPL-2.0+ (sox binary), LGPLv2.1+ (libraries)
SOX_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL
# MIPS Codescape toolchains don't support stack-smashing protection
--git a/package/sp-oops-extract/sp-oops-extract.mk b/package/sp-oops-extract/sp-oops-extract.mk
index 9919807..a3ff46c 100644
--- a/package/sp-oops-extract/sp-oops-extract.mk
+++ b/package/sp-oops-extract/sp-oops-extract.mk
@@ -7,7 +7,7 @@
SP_OOPS_EXTRACT_VERSION = 0.0.7-1
SP_OOPS_EXTRACT_SITE = http://repository.maemo.org/pool/maemo5.0/free/s/sp-oops-extract
SP_OOPS_EXTRACT_SOURCE = sp-oops-extract_$(SP_OOPS_EXTRACT_VERSION).tar.gz
-SP_OOPS_EXTRACT_LICENSE = GPLv2
+SP_OOPS_EXTRACT_LICENSE = GPL-2.0
SP_OOPS_EXTRACT_LICENSE_FILES = COPYING
define SP_OOPS_EXTRACT_BUILD_CMDS
diff --git a/package/spi-tools/spi-tools.mk b/package/spi-tools/spi-tools.mk
index 384ae41..e5f3774 100644
--- a/package/spi-tools/spi-tools.mk
+++ b/package/spi-tools/spi-tools.mk
@@ -8,7 +8,7 @@ SPI_TOOLS_VERSION = 0.8.1
SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION))
# autoreconf must be run as specified in package documentation
SPI_TOOLS_AUTORECONF = YES
-SPI_TOOLS_LICENSE = GPLv2
+SPI_TOOLS_LICENSE = GPL-2.0
SPI_TOOLS_LICENSE_FILES = LICENSE
$(eval $(autotools-package))
diff --git a/package/spidev_test/spidev_test.mk b/package/spidev_test/spidev_test.mk
index 52441bb..50e7a30 100644
--- a/package/spidev_test/spidev_test.mk
+++ b/package/spidev_test/spidev_test.mk
@@ -14,7 +14,7 @@ SPIDEV_TEST_VERSION = v3.0
endif
SPIDEV_TEST_SITE = http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/Documentation/spi
SPIDEV_TEST_SOURCE = spidev_test.c?id=$(SPIDEV_TEST_VERSION)
-SPIDEV_TEST_LICENSE = GPLv2
+SPIDEV_TEST_LICENSE = GPL-2.0
# musl libc requires linux/ioctl.h for _IOC_SIZEBITS. Do a sed patch to keep
# compatibility with different spidev_test.c versions that we support.
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
index 4f84872..65c39c1 100644
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -7,7 +7,7 @@
SQUASHFS_VERSION = 3de1687d7432ea9b302c2db9521996f506c140a3
SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
SQUASHFS_SITE_METHOD = git
-SQUASHFS_LICENSE = GPLv2+
+SQUASHFS_LICENSE = GPL-2.0+
SQUASHFS_LICENSE_FILES = COPYING
SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
index cf0378a..263ce16 100644
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -8,7 +8,7 @@ SQUID_VERSION_MAJOR = 3.5
SQUID_VERSION = $(SQUID_VERSION_MAJOR).24
SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
-SQUID_LICENSE = GPLv2+
+SQUID_LICENSE = GPL-2.0+
SQUID_LICENSE_FILES = COPYING
# For 0001-assume-get-certificate-ok.patch
SQUID_AUTORECONF = YES
diff --git a/package/sredird/sredird.mk b/package/sredird/sredird.mk
index b564f1a..723c10a 100644
--- a/package/sredird/sredird.mk
+++ b/package/sredird/sredird.mk
@@ -6,7 +6,7 @@
SREDIRD_VERSION = 2.2.2
SREDIRD_SITE = http://www.ibiblio.org/pub/Linux/system/serial
-SREDIRD_LICENSE = GPLv2+
+SREDIRD_LICENSE = GPL-2.0+
SREDIRD_LICENSE_FILES = COPYING
define SREDIRD_BUILD_CMDS
diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index de4c361..1288318 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -6,7 +6,7 @@
SSHFS_VERSION = 2.8
SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs_$(SSHFS_VERSION)
-SSHFS_LICENSE = GPLv2
+SSHFS_LICENSE = GPL-2.0
SSHFS_LICENSE_FILES = COPYING
SSHFS_DEPENDENCIES = \
libglib2 libfuse openssh \
diff --git a/package/sshpass/sshpass.mk b/package/sshpass/sshpass.mk
index de46604..6c14f0f 100644
--- a/package/sshpass/sshpass.mk
+++ b/package/sshpass/sshpass.mk
@@ -6,7 +6,7 @@
SSHPASS_VERSION = 1.06
SSHPASS_SITE = http://downloads.sourceforge.net/project/sshpass/sshpass/$(SSHPASS_VERSION)
-SSHPASS_LICENSE = GPLv2+
+SSHPASS_LICENSE = GPL-2.0+
SSHPASS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
index 17aafd1..3a9223b 100644
--- a/package/sslh/sslh.mk
+++ b/package/sslh/sslh.mk
@@ -6,7 +6,7 @@
SSLH_VERSION = v1.18
SSLH_SITE = http://www.rutschle.net/tech/sslh
-SSLH_LICENSE = GPLv2+
+SSLH_LICENSE = GPL-2.0+
SSLH_LICENSE_FILES = COPYING
SSLH_DEPENDENCIES = libconfig
diff --git a/package/start-stop-daemon/start-stop-daemon.mk b/package/start-stop-daemon/start-stop-daemon.mk
index 5aac541..7071f56 100644
--- a/package/start-stop-daemon/start-stop-daemon.mk
+++ b/package/start-stop-daemon/start-stop-daemon.mk
@@ -23,7 +23,7 @@ START_STOP_DAEMON_DEPENDENCIES = host-pkgconf \
$(if $(BR2_PACKAGE_BUSYBOX),busybox)
# Patching m4/dpkg-arch.m4
START_STOP_DAEMON_AUTORECONF = YES
-START_STOP_DAEMON_LICENSE = GPLv2+
+START_STOP_DAEMON_LICENSE = GPL-2.0+
START_STOP_DAEMON_LICENSE_FILES = COPYING
define START_STOP_DAEMON_BUILD_CMDS
diff --git a/package/statserial/statserial.mk b/package/statserial/statserial.mk
index 22b468e..f9b131f 100644
--- a/package/statserial/statserial.mk
+++ b/package/statserial/statserial.mk
@@ -7,7 +7,7 @@
STATSERIAL_VERSION = 1.1
STATSERIAL_SITE = http://www.ibiblio.org/pub/Linux/system/serial
STATSERIAL_DEPENDENCIES = ncurses
-STATSERIAL_LICENSE = GPLv2+
+STATSERIAL_LICENSE = GPL-2.0+
STATSERIAL_LICENSE_FILES = COPYING
define STATSERIAL_BUILD_CMDS
diff --git a/package/stella/stella.mk b/package/stella/stella.mk
index 2e9d57b..220abb2 100644
--- a/package/stella/stella.mk
+++ b/package/stella/stella.mk
@@ -7,7 +7,7 @@
STELLA_VERSION = 4.7.2
STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz
STELLA_SITE = http://downloads.sourceforge.net/stella
-STELLA_LICENSE = GPLv2+
+STELLA_LICENSE = GPL-2.0+
STELLA_LICENSE_FILES = Copyright.txt License.txt
STELLA_DEPENDENCIES = sdl2 libpng zlib
diff --git a/package/stm32flash/stm32flash.mk b/package/stm32flash/stm32flash.mk
index 2c0fa56..c41fc76 100644
--- a/package/stm32flash/stm32flash.mk
+++ b/package/stm32flash/stm32flash.mk
@@ -6,7 +6,7 @@
STM32FLASH_VERSION = 4ac0566f188f39eace0223d966d349cd2f2c5895
STM32FLASH_SITE = git://git.code.sf.net/p/stm32flash/code
-STM32FLASH_LICENSE = GPLv2+
+STM32FLASH_LICENSE = GPL-2.0+
STM32FLASH_LICENSE_FILES = gpl-2.0.txt
define STM32FLASH_BUILD_CMDS
diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk
index b4d4699..794e875 100644
--- a/package/stress-ng/stress-ng.mk
+++ b/package/stress-ng/stress-ng.mk
@@ -6,7 +6,7 @@
STRESS_NG_VERSION = 0.06.15
STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
-STRESS_NG_LICENSE = GPLv2+
+STRESS_NG_LICENSE = GPL-2.0+
STRESS_NG_LICENSE_FILES = COPYING
STRESS_NG_DEPENDENCIES = attr keyutils
diff --git a/package/stress/stress.mk b/package/stress/stress.mk
index 1b5ba06..4d2d4cb 100644
--- a/package/stress/stress.mk
+++ b/package/stress/stress.mk
@@ -6,7 +6,7 @@
STRESS_VERSION = 1.0.4
STRESS_SITE = http://people.seas.harvard.edu/~apw/stress
-STRESS_LICENSE = GPLv2+
+STRESS_LICENSE = GPL-2.0+
STRESS_LICENSE_FILES = COPYING
# Stress is linked statically if the --enable-static is specified.
diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
index 36b5148..2a852f2 100644
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -7,7 +7,7 @@
STRONGSWAN_VERSION = 5.4.0
STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
STRONGSWAN_SITE = http://download.strongswan.org
-STRONGSWAN_LICENSE = GPLv2+
+STRONGSWAN_LICENSE = GPL-2.0+
STRONGSWAN_LICENSE_FILES = COPYING LICENSE
STRONGSWAN_DEPENDENCIES = host-pkgconf
STRONGSWAN_CONF_OPTS += \
diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
index f98e7b5..99e5381 100644
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -13,7 +13,7 @@ STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \
STUNNEL_CONF_ENV = \
ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) \
LIBS=$(if $(BR2_STATIC_LIBS),-lz)
-STUNNEL_LICENSE = GPLv2+
+STUNNEL_LICENSE = GPL-2.0+
STUNNEL_LICENSE_FILES = COPYING COPYRIGHT.GPL
ifeq ($(BR2_INIT_SYSTEMD),y)
diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk
index 1a58aff..9bb0b9e 100644
--- a/package/sunxi-tools/sunxi-tools.mk
+++ b/package/sunxi-tools/sunxi-tools.mk
@@ -6,7 +6,7 @@
SUNXI_TOOLS_VERSION = v1.4.1
SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,$(SUNXI_TOOLS_VERSION))
-SUNXI_TOOLS_LICENSE = GPLv2+
+SUNXI_TOOLS_LICENSE = GPL-2.0+
SUNXI_TOOLS_LICENSE_FILES = LICENSE.md
HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf
FEX2BIN = $(HOST_DIR)/usr/bin/fex2bin
diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk
index 7f2cb0a..335ec90 100644
--- a/package/swupdate/swupdate.mk
+++ b/package/swupdate/swupdate.mk
@@ -6,7 +6,7 @@
SWUPDATE_VERSION = 2017.01
SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
-SWUPDATE_LICENSE = GPLv2+, MIT, Public Domain
+SWUPDATE_LICENSE = GPL-2.0+, MIT, Public Domain
SWUPDATE_LICENSE_FILES = COPYING
# swupdate bundles its own version of mongoose (version 3.8)
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index 8d42623..ea5c42e 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -8,7 +8,7 @@ SYLPHEED_VERSION_MAJOR = 3.2
SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).0
SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
-SYLPHEED_LICENSE = GPLv2+ (executables), LGPLv2.1+ (library, attachment plugin)
+SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPLv2.1+ (library, attachment plugin)
SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB
SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme
SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
index 82d672b..a4053e3 100644
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -6,7 +6,7 @@
SYNERGY_VERSION = v1.8.5-stable
SYNERGY_SITE = $(call github,symless,synergy,$(SYNERGY_VERSION))
-SYNERGY_LICENSE = GPLv2
+SYNERGY_LICENSE = GPL-2.0
SYNERGY_LICENSE_FILES = LICENSE
SYNERGY_DEPENDENCIES = libcurl openssl xlib_libX11 xlib_libXtst
diff --git a/package/sysdig/sysdig.mk b/package/sysdig/sysdig.mk
index 85d16a4..f967727 100644
--- a/package/sysdig/sysdig.mk
+++ b/package/sysdig/sysdig.mk
@@ -6,7 +6,7 @@
SYSDIG_VERSION = 0.1.100
SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION))
-SYSDIG_LICENSE = GPLv2
+SYSDIG_LICENSE = GPL-2.0
SYSDIG_LICENSE_FILES = COPYING
SYSDIG_CONF_OPTS = -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF \
-DUSE_BUNDLED_JSONCPP=OFF -DENABLE_DKMS=OFF
diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk
index 49997d4..e1f0c34 100644
--- a/package/sysklogd/sysklogd.mk
+++ b/package/sysklogd/sysklogd.mk
@@ -6,7 +6,7 @@
SYSKLOGD_VERSION = 1.5.1
SYSKLOGD_SITE = http://www.infodrom.org/projects/sysklogd/download
-SYSKLOGD_LICENSE = GPLv2+
+SYSKLOGD_LICENSE = GPL-2.0+
SYSKLOGD_LICENSE_FILES = COPYING
# Override BusyBox implementations if BusyBox is enabled.
diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index 61fc48f..8f56f5c 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -6,7 +6,7 @@
SYSLOG_NG_VERSION = 3.9.1
SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION)
-SYSLOG_NG_LICENSE = LGPLv2.1+ (syslog-ng core), GPLv2+ (modules)
+SYSLOG_NG_LICENSE = LGPLv2.1+ (syslog-ng core), GPL-2.0+ (modules)
SYSLOG_NG_LICENSE_FILES = COPYING
SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \
eventlog libglib2 openssl pcre
diff --git a/package/sysprof/sysprof.mk b/package/sysprof/sysprof.mk
index 0650781..033194a 100644
--- a/package/sysprof/sysprof.mk
+++ b/package/sysprof/sysprof.mk
@@ -7,7 +7,7 @@
SYSPROF_VERSION = 1.2.0
SYSPROF_SITE = http://sysprof.com
SYSPROF_DEPENDENCIES = libglib2
-SYSPROF_LICENSE = GPLv2+
+SYSPROF_LICENSE = GPL-2.0+
SYSPROF_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_SYSPROF_GUI),y)
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
index c285342..31645b8 100644
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -9,7 +9,7 @@ SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz
SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard
SYSSTAT_CONF_OPTS = --disable-man-group --disable-sensors
SYSSTAT_DEPENDENCIES = host-gettext
-SYSSTAT_LICENSE = GPLv2+
+SYSSTAT_LICENSE = GPL-2.0+
SYSSTAT_LICENSE_FILES = COPYING
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index cfd885d..d8ebec8 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -6,7 +6,7 @@
SYSTEMD_VERSION = 233
SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
-SYSTEMD_LICENSE = LGPLv2.1+, GPLv2+ (udev), Public Domain (few source files, see README)
+SYSTEMD_LICENSE = LGPLv2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README)
SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README
SYSTEMD_INSTALL_STAGING = YES
SYSTEMD_DEPENDENCIES = \
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index faefd5c..ca7d06b 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -8,7 +8,7 @@ SYSVINIT_VERSION = 2.88
SYSVINIT_SOURCE = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
SYSVINIT_PATCH = sysvinit_$(SYSVINIT_VERSION)dsf-13.1+squeeze1.diff.gz
SYSVINIT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/sysvinit
-SYSVINIT_LICENSE = GPLv2+
+SYSVINIT_LICENSE = GPL-2.0+
SYSVINIT_LICENSE_FILES = COPYING
SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR)
diff --git a/package/ti-sgx-km/ti-sgx-km.mk b/package/ti-sgx-km/ti-sgx-km.mk
index 48c8a6d..db74da9 100644
--- a/package/ti-sgx-km/ti-sgx-km.mk
+++ b/package/ti-sgx-km/ti-sgx-km.mk
@@ -7,7 +7,7 @@
# This correpsonds to SDK 02.00.00.00
TI_SGX_KM_VERSION = 2b7523d07a13ab704a24a7664749551f4a13ed32
TI_SGX_KM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-linux.git
-TI_SGX_KM_LICENSE = GPLv2
+TI_SGX_KM_LICENSE = GPL-2.0
TI_SGX_KM_LICENSE_FILES = GPL-COPYING
TI_SGX_KM_DEPENDENCIES = linux
diff --git a/package/ti-uim/ti-uim.mk b/package/ti-uim/ti-uim.mk
index 66b93e4..8b1678f 100644
--- a/package/ti-uim/ti-uim.mk
+++ b/package/ti-uim/ti-uim.mk
@@ -6,7 +6,7 @@
TI_UIM_VERSION = a0236bc252e6484835ce266ae4a50b361f6a902d
TI_UIM_SITE = $(call github,96boards,uim,$(TI_UIM_VERSION))
-TI_UIM_LICENSE = GPLv2+
+TI_UIM_LICENSE = GPL-2.0+
TI_UIM_LICENSE_FILES = uim.h
define TI_UIM_BUILD_CMDS
diff --git a/package/time/time.mk b/package/time/time.mk
index 56f28ff..8092ea9 100644
--- a/package/time/time.mk
+++ b/package/time/time.mk
@@ -7,7 +7,7 @@
TIME_VERSION = 1.7
TIME_SITE = $(BR2_GNU_MIRROR)/time
TIME_CONF_ENV = ac_cv_func_wait3=yes
-TIME_LICENSE = GPLv2+
+TIME_LICENSE = GPL-2.0+
TIME_LICENSE_FILES = COPYING
# time uses an old version of automake that does not support
diff --git a/package/tinc/tinc.mk b/package/tinc/tinc.mk
index 6d87cbf..f537d46 100644
--- a/package/tinc/tinc.mk
+++ b/package/tinc/tinc.mk
@@ -7,7 +7,7 @@
TINC_VERSION = 1.0.30
TINC_SITE = http://www.tinc-vpn.org/packages
TINC_DEPENDENCIES = lzo openssl zlib
-TINC_LICENSE = GPLv2+ with OpenSSL exception
+TINC_LICENSE = GPL-2.0+ with OpenSSL exception
TINC_LICENSE_FILES = COPYING COPYING.README
TINC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99"
diff --git a/package/tovid/tovid.mk b/package/tovid/tovid.mk
index 3069d67..079fada 100644
--- a/package/tovid/tovid.mk
+++ b/package/tovid/tovid.mk
@@ -6,7 +6,7 @@
TOVID_VERSION = 0.35.0
TOVID_SITE = https://github.com/tovid-suite/tovid/releases/download/v$(TOVID_VERSION)
-TOVID_LICENSE = GPLv2+
+TOVID_LICENSE = GPL-2.0+
TOVID_LICENSE_FILES = COPYING
TOVID_SETUP_TYPE = distutils
diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
index 2348155..a4f2255 100644
--- a/package/trace-cmd/trace-cmd.mk
+++ b/package/trace-cmd/trace-cmd.mk
@@ -8,7 +8,7 @@ TRACE_CMD_VERSION = trace-cmd-v2.6
TRACE_CMD_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/rostedt/trace-cmd.git
TRACE_CMD_SITE_METHOD = git
TRACE_CMD_INSTALL_STAGING = YES
-TRACE_CMD_LICENSE = GPLv2, LGPLv2.1
+TRACE_CMD_LICENSE = GPL-2.0, LGPLv2.1
TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
TRACE_CMD_DEPENDENCIES = host-pkgconf
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index 923ba40..fd923fe 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -18,7 +18,7 @@ TRANSMISSION_AUTORECONF = YES
TRANSMISSION_CONF_OPTS = \
--disable-libnotify \
--enable-lightweight
-TRANSMISSION_LICENSE = GPLv2 or GPLv3 with OpenSSL exception
+TRANSMISSION_LICENSE = GPL-2.0 or GPLv3 with OpenSSL exception
TRANSMISSION_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y)
diff --git a/package/tree/tree.mk b/package/tree/tree.mk
index b8988bd..34b6c60 100644
--- a/package/tree/tree.mk
+++ b/package/tree/tree.mk
@@ -7,7 +7,7 @@
TREE_VERSION = 1.7.0
TREE_SOURCE = tree-$(TREE_VERSION).tgz
TREE_SITE = http://mama.indstate.edu/users/ice/tree/src
-TREE_LICENSE = GPLv2+
+TREE_LICENSE = GPL-2.0+
TREE_LICENSE_FILES = LICENSE
define TREE_BUILD_CMDS
diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk
index 7596e92..fa5a280 100644
--- a/package/trinity/trinity.mk
+++ b/package/trinity/trinity.mk
@@ -6,7 +6,7 @@
TRINITY_VERSION = v1.6
TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION))
-TRINITY_LICENSE = GPLv2
+TRINITY_LICENSE = GPL-2.0
TRINITY_LICENSE_FILES = COPYING
define TRINITY_CONFIGURE_CMDS
diff --git a/package/tunctl/tunctl.mk b/package/tunctl/tunctl.mk
index 30dbbd1..0d7b88d 100644
--- a/package/tunctl/tunctl.mk
+++ b/package/tunctl/tunctl.mk
@@ -7,7 +7,7 @@
TUNCTL_VERSION = 1.5
TUNCTL_SITE = http://downloads.sourceforge.net/project/tunctl/tunctl/$(TUNCTL_VERSION)
-TUNCTL_LICENSE = GPLv2
+TUNCTL_LICENSE = GPL-2.0
TUNCTL_LICENSE_FILES = tunctl.c
define TUNCTL_BUILD_CMDS
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
index b26a662..2585c7b 100644
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -7,7 +7,7 @@
UBOOT_TOOLS_VERSION = 2017.03
UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
-UBOOT_TOOLS_LICENSE = GPLv2+
+UBOOT_TOOLS_LICENSE = GPL-2.0+
UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
UBOOT_TOOLS_INSTALL_STAGING = YES
diff --git a/package/uccp420wlan/uccp420wlan.mk b/package/uccp420wlan/uccp420wlan.mk
index 1496a92..bd89e07 100644
--- a/package/uccp420wlan/uccp420wlan.mk
+++ b/package/uccp420wlan/uccp420wlan.mk
@@ -6,7 +6,7 @@
UCCP420WLAN_VERSION = v6.9.1
UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,$(UCCP420WLAN_VERSION))
-UCCP420WLAN_LICENSE = GPLv2 (kernel module), proprietary (firmware blob)
+UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob)
UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination
define UCCP420WLAN_INSTALL_TARGET_CMDS
diff --git a/package/ucl/ucl.mk b/package/ucl/ucl.mk
index b183a13..aac068e 100644
--- a/package/ucl/ucl.mk
+++ b/package/ucl/ucl.mk
@@ -6,7 +6,7 @@
UCL_VERSION = 1.03
UCL_SITE = http://www.oberhumer.com/opensource/ucl/download
-UCL_LICENSE = GPLv2+
+UCL_LICENSE = GPL-2.0+
UCL_LICENSE_FILES = COPYING
# Fix ACC conformance test failure for host gcc 6.x
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
index f1558fb..119bcc6 100644
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -6,7 +6,7 @@
UDISKS_VERSION = 1.0.5
UDISKS_SITE = http://hal.freedesktop.org/releases
-UDISKS_LICENSE = GPLv2+
+UDISKS_LICENSE = GPL-2.0+
UDISKS_LICENSE_FILES = COPYING
# For 0002-Fix-systemd-service-file.patch
UDISKS_AUTORECONF = YES
diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index b0ce643..cb81781 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -7,7 +7,7 @@
UDPCAST_VERSION = 20120424
UDPCAST_SITE = http://www.udpcast.linux.lu/download
UDPCAST_DEPENDENCIES = host-m4
-UDPCAST_LICENSE = BSD-2c, GPLv2+
+UDPCAST_LICENSE = BSD-2c, GPL-2.0+
UDPCAST_LICENSE_FILES = COPYING
define UDPCAST_REMOVE_UDP_SENDER
diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk
index 4017edc..5b0e558 100644
--- a/package/ulogd/ulogd.mk
+++ b/package/ulogd/ulogd.mk
@@ -11,7 +11,7 @@ ULOGD_CONF_OPTS = --with-dbi=no --with-pgsql=no
ULOGD_DEPENDENCIES = host-pkgconf \
libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
libnfnetlink
-ULOGD_LICENSE = GPLv2
+ULOGD_LICENSE = GPL-2.0
ULOGD_LICENSE_FILES = COPYING
# DB backends need threads
diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk
index 280fe57..387f804 100644
--- a/package/unixodbc/unixodbc.mk
+++ b/package/unixodbc/unixodbc.mk
@@ -8,7 +8,7 @@ UNIXODBC_VERSION = 2.3.4
UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz
UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC
UNIXODBC_INSTALL_STAGING = YES
-UNIXODBC_LICENSE = LGPLv2.1+ (library), GPLv2+ (programs)
+UNIXODBC_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (programs)
UNIXODBC_LICENSE_FILES = COPYING exe/COPYING
UNIXODBC_CONF_OPTS = --enable-drivers --enable-driver-conf
diff --git a/package/unscd/unscd.mk b/package/unscd/unscd.mk
index 54caeb1..f0eb5d6 100644
--- a/package/unscd/unscd.mk
+++ b/package/unscd/unscd.mk
@@ -7,7 +7,7 @@
UNSCD_VERSION = 0.52
UNSCD_SOURCE = nscd-$(UNSCD_VERSION).c
UNSCD_SITE = http://busybox.net/~vda/unscd
-UNSCD_LICENSE = GPLv2
+UNSCD_LICENSE = GPL-2.0
UNSCD_LICENSE_FILES = $(UNSCD_SOURCE)
define UNSCD_EXTRACT_CMDS
diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk
index a9b057d..eabc04a 100644
--- a/package/upmpdcli/upmpdcli.mk
+++ b/package/upmpdcli/upmpdcli.mk
@@ -6,7 +6,7 @@
UPMPDCLI_VERSION = 1.2.12
UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
-UPMPDCLI_LICENSE = GPLv2+
+UPMPDCLI_LICENSE = GPL-2.0+
UPMPDCLI_LICENSE_FILES = COPYING
UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp
diff --git a/package/upower/upower.mk b/package/upower/upower.mk
index 471eb41..79dc5e8 100644
--- a/package/upower/upower.mk
+++ b/package/upower/upower.mk
@@ -7,7 +7,7 @@
UPOWER_VERSION = 0.99.4
UPOWER_SOURCE = upower-$(UPOWER_VERSION).tar.xz
UPOWER_SITE = https://upower.freedesktop.org/releases
-UPOWER_LICENSE = GPLv2+
+UPOWER_LICENSE = GPL-2.0+
UPOWER_LICENSE_FILES = COPYING
# libupower-glib.so
diff --git a/package/upx/upx.mk b/package/upx/upx.mk
index eaef275..5ed86b3 100644
--- a/package/upx/upx.mk
+++ b/package/upx/upx.mk
@@ -7,7 +7,7 @@
UPX_VERSION = 3.91
UPX_SITE = http://upx.sourceforge.net/download
UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.bz2
-UPX_LICENSE = GPLv2+
+UPX_LICENSE = GPL-2.0+
UPX_LICENSE_FILES = COPYING
HOST_UPX_DEPENDENCIES = host-ucl host-zlib
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index 57996ab..1901767 100644
--- a/package/usb_modeswitch/usb_modeswitch.mk
+++ b/package/usb_modeswitch/usb_modeswitch.mk
@@ -8,7 +8,7 @@ USB_MODESWITCH_VERSION = 2.5.0
USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
USB_MODESWITCH_DEPENDENCIES = libusb
-USB_MODESWITCH_LICENSE = GPLv2+
+USB_MODESWITCH_LICENSE = GPL-2.0+
USB_MODESWITCH_LICENSE_FILES = COPYING
USB_MODESWITCH_BUILD_TARGETS = static
diff --git a/package/usb_modeswitch_data/usb_modeswitch_data.mk b/package/usb_modeswitch_data/usb_modeswitch_data.mk
index 6d75b31..4f634cd 100644
--- a/package/usb_modeswitch_data/usb_modeswitch_data.mk
+++ b/package/usb_modeswitch_data/usb_modeswitch_data.mk
@@ -8,7 +8,7 @@ USB_MODESWITCH_DATA_VERSION = 20170205
USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2
USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch
USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch
-USB_MODESWITCH_DATA_LICENSE = GPLv2+
+USB_MODESWITCH_DATA_LICENSE = GPL-2.0+
USB_MODESWITCH_DATA_LICENSE_FILES = COPYING
# Nothing to build, it is a pure data package
diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
index 6765a9b..ae251d6 100644
--- a/package/usbredir/usbredir.mk
+++ b/package/usbredir/usbredir.mk
@@ -14,7 +14,7 @@ USBREDIR_DEPENDENCIES = host-pkgconf libusb
ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y)
-USBREDIR_LICENSE := $(USBREDIR_LICENSE), GPLv2+ (program)
+USBREDIR_LICENSE := $(USBREDIR_LICENSE), GPL-2.0+ (program)
USBREDIR_LICENSE_FILES += COPYING
else # BR2_PACKAGE_USBREDIR_SERVER != y
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index c96a1f5..c397d0a 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -8,7 +8,7 @@ USBUTILS_VERSION = 008
USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz
USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
USBUTILS_DEPENDENCIES = host-pkgconf libusb udev
-USBUTILS_LICENSE = GPLv2+
+USBUTILS_LICENSE = GPL-2.0+
USBUTILS_LICENSE_FILES = COPYING
# Build after busybox since it's got a lightweight lsusb
diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk
index 62d269c..3a5f178 100644
--- a/package/ushare/ushare.mk
+++ b/package/ushare/ushare.mk
@@ -8,7 +8,7 @@ USHARE_VERSION = 1.1a
USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2
USHARE_SITE = http://ushare.geexbox.org/releases
USHARE_DEPENDENCIES = host-pkgconf libupnp
-USHARE_LICENSE = GPLv2+
+USHARE_LICENSE = GPL-2.0+
USHARE_LICENSE_FILES = COPYING
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
diff --git a/package/ussp-push/ussp-push.mk b/package/ussp-push/ussp-push.mk
index c3d11f9..0c45c29 100644
--- a/package/ussp-push/ussp-push.mk
+++ b/package/ussp-push/ussp-push.mk
@@ -6,7 +6,7 @@
USSP_PUSH_VERSION = 0.11
USSP_PUSH_SITE = http://www.xmailserver.org
-USSP_PUSH_LICENSE = GPLv2+
+USSP_PUSH_LICENSE = GPL-2.0+
USSP_PUSH_LICENSE_FILES = COPYING
USSP_PUSH_DEPENDENCIES = bluez_utils openobex
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 05e1398..42a4a43 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -14,7 +14,7 @@ UTIL_LINUX_AUTORECONF = YES
# README.licensing claims that some files are GPLv2-only, but this is not true.
# Some files are GPLv3+ but only in tests.
-UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, LGPLv2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid)
+UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4c, LGPLv2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid)
UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3
UTIL_LINUX_INSTALL_STAGING = YES
UTIL_LINUX_DEPENDENCIES = host-pkgconf
diff --git a/package/v4l2grab/v4l2grab.mk b/package/v4l2grab/v4l2grab.mk
index f3a8967..68efe27 100644
--- a/package/v4l2grab/v4l2grab.mk
+++ b/package/v4l2grab/v4l2grab.mk
@@ -6,7 +6,7 @@
V4L2GRAB_VERSION = f8d8844d52387b3db7b8736f5e86156d9374f781
V4L2GRAB_SITE = $(call github,twam,v4l2grab,$(V4L2GRAB_VERSION))
-V4L2GRAB_LICENSE = GPLv2+
+V4L2GRAB_LICENSE = GPL-2.0+
V4L2GRAB_LICENSE_FILES = LICENSE.md
# Fetched from github, no pre-generated configure script provided
V4L2GRAB_AUTORECONF = YES
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index ccc6cc3..61f7466 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -7,7 +7,7 @@
VALGRIND_VERSION = 3.12.0
VALGRIND_SITE = http://valgrind.org/downloads
VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
-VALGRIND_LICENSE = GPLv2, GFDLv1.2
+VALGRIND_LICENSE = GPL-2.0, GFDLv1.2
VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
VALGRIND_CONF_OPTS = \
--disable-ubsan \
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
index 3bbfd5f..6e0a074 100644
--- a/package/vde2/vde2.mk
+++ b/package/vde2/vde2.mk
@@ -7,7 +7,7 @@
VDE2_VERSION = 2.3.2
VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
-VDE2_LICENSE = GPLv2+, LGPLv2.1+, BSD-3c
+VDE2_LICENSE = GPL-2.0+, LGPLv2.1+, BSD-3c
VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
VDE2_INSTALL_STAGING = YES
diff --git a/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk b/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
index aaa0859..9a02e44 100644
--- a/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
+++ b/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
@@ -6,7 +6,7 @@
VDR_PLUGIN_VNSISERVER_VERSION = v1.5.0
VDR_PLUGIN_VNSISERVER_SITE = $(call github,FernetMenta,vdr-plugin-vnsiserver,$(VDR_PLUGIN_VNSISERVER_VERSION))
-VDR_PLUGIN_VNSISERVER_LICENSE = GPLv2+
+VDR_PLUGIN_VNSISERVER_LICENSE = GPL-2.0+
VDR_PLUGIN_VNSISERVER_LICENSE_FILES = COPYING
VDR_PLUGIN_VNSISERVER_DEPENDENCIES = vdr
diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk
index cdfa7e3..24467f7 100644
--- a/package/vdr/vdr.mk
+++ b/package/vdr/vdr.mk
@@ -7,7 +7,7 @@
VDR_VERSION = 2.3.2
VDR_SOURCE = vdr-$(VDR_VERSION).tar.bz2
VDR_SITE = ftp://ftp.tvdr.de/vdr/Developer
-VDR_LICENSE = GPLv2+
+VDR_LICENSE = GPL-2.0+
VDR_LICENSE_FILES = COPYING
VDR_INSTALL_STAGING = YES
VDR_DEPENDENCIES = \
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index 583edf3..86418c3 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -7,7 +7,7 @@
VLC_VERSION = 2.2.4
VLC_SITE = http://get.videolan.org/vlc/$(VLC_VERSION)
VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
-VLC_LICENSE = GPLv2+, LGPLv2.1+
+VLC_LICENSE = GPL-2.0+, LGPLv2.1+
VLC_LICENSE_FILES = COPYING COPYING.LIB
VLC_DEPENDENCIES = host-pkgconf
VLC_AUTORECONF = YES
diff --git a/package/vnstat/vnstat.mk b/package/vnstat/vnstat.mk
index f3e74a7..18fb319 100644
--- a/package/vnstat/vnstat.mk
+++ b/package/vnstat/vnstat.mk
@@ -6,7 +6,7 @@
VNSTAT_VERSION = 1.17
VNSTAT_SITE = http://humdi.net/vnstat
-VNSTAT_LICENSE = GPLv2
+VNSTAT_LICENSE = GPL-2.0
VNSTAT_LICENSE_FILES = COPYING
VNSTAT_DEPENDENCIES = host-pkgconf
diff --git a/package/vorbis-tools/vorbis-tools.mk b/package/vorbis-tools/vorbis-tools.mk
index fc8e7dd..1bec1e2 100644
--- a/package/vorbis-tools/vorbis-tools.mk
+++ b/package/vorbis-tools/vorbis-tools.mk
@@ -6,7 +6,7 @@
VORBIS_TOOLS_VERSION = 1.4.0
VORBIS_TOOLS_SITE = http://downloads.xiph.org/releases/vorbis
-VORBIS_TOOLS_LICENSE = GPLv2
+VORBIS_TOOLS_LICENSE = GPL-2.0
VORBIS_TOOLS_LICENSE_FILES = COPYING
VORBIS_TOOLS_DEPENDENCIES = libao libogg libvorbis libcurl
VORBIS_TOOLS_CONF_OPTS = --program-transform-name=''
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
index 282a422..81cd830 100644
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -6,7 +6,7 @@
VPNC_VERSION = b1243d29e0c00312ead038b04a2cf5e2fa31d740
VPNC_SITE = $(call github,ndpgroup,vpnc,$(VPNC_VERSION))
-VPNC_LICENSE = GPLv2+
+VPNC_LICENSE = GPL-2.0+
VPNC_LICENSE_FILES = COPYING
VPNC_DEPENDENCIES = libgcrypt libgpg-error gnutls host-pkgconf
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index fd92346..2f86d91 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -7,7 +7,7 @@
VSFTPD_VERSION = 3.0.3
VSFTPD_SITE = https://security.appspot.com/downloads
VSFTPD_LIBS = -lcrypt
-VSFTPD_LICENSE = GPLv2
+VSFTPD_LICENSE = GPL-2.0
VSFTPD_LICENSE_FILES = COPYING
define VSFTPD_DISABLE_UTMPX
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
index 5e0e266..9c46559 100644
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -6,7 +6,7 @@
VTUN_VERSION = 3.0.3
VTUN_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION)
-VTUN_LICENSE = GPLv2+ with OpenSSL exception
+VTUN_LICENSE = GPL-2.0+ with OpenSSL exception
VTUN_LICENSE_FILES = README.OpenSSL
VTUN_DEPENDENCIES = host-bison host-flex zlib lzo openssl
VTUN_AUTORECONF = YES
diff --git a/package/w_scan/w_scan.mk b/package/w_scan/w_scan.mk
index 3ec84ed..cdb4250 100644
--- a/package/w_scan/w_scan.mk
+++ b/package/w_scan/w_scan.mk
@@ -7,7 +7,7 @@
W_SCAN_VERSION = 20141122
W_SCAN_SOURCE = w_scan-$(W_SCAN_VERSION).tar.bz2
W_SCAN_SITE = http://wirbel.htpc-forum.de/w_scan
-W_SCAN_LICENSE = GPLv2+
+W_SCAN_LICENSE = GPL-2.0+
W_SCAN_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBICONV),y)
diff --git a/package/whois/whois.mk b/package/whois/whois.mk
index 29a18e3..24b6b69 100644
--- a/package/whois/whois.mk
+++ b/package/whois/whois.mk
@@ -12,7 +12,7 @@ WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox)
WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
LIBS="$(WHOIS_EXTRA_LIBS)"
-WHOIS_LICENSE = GPLv2+
+WHOIS_LICENSE = GPL-2.0+
WHOIS_LICENSE_FILES = COPYING
ifeq ($(BR2_NEEDS_GETTEXT),y)
diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk
index 9ec7faf..83a8c87 100644
--- a/package/wipe/wipe.mk
+++ b/package/wipe/wipe.mk
@@ -7,7 +7,7 @@
WIPE_VERSION = 2.3.1
WIPE_SITE = http://downloads.sourceforge.net/project/wipe/wipe/$(WIPE_VERSION)
WIPE_SOURCE = wipe-$(WIPE_VERSION).tar.bz2
-WIPE_LICENSE = GPLv2+
+WIPE_LICENSE = GPL-2.0+
WIPE_LICENSE_FILES = LICENSE
define WIPE_INSTALL_TARGET_CMDS
diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk
index f4e0ffb..51320a9 100644
--- a/package/wireless_tools/wireless_tools.mk
+++ b/package/wireless_tools/wireless_tools.mk
@@ -8,7 +8,7 @@ WIRELESS_TOOLS_VERSION_MAJOR = 30
WIRELESS_TOOLS_VERSION = $(WIRELESS_TOOLS_VERSION_MAJOR).pre9
WIRELESS_TOOLS_SITE = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
WIRELESS_TOOLS_SOURCE = wireless_tools.$(WIRELESS_TOOLS_VERSION).tar.gz
-WIRELESS_TOOLS_LICENSE = GPLv2
+WIRELESS_TOOLS_LICENSE = GPL-2.0
WIRELESS_TOOLS_LICENSE_FILES = COPYING
WIRELESS_TOOLS_INSTALL_STAGING = YES
diff --git a/package/wmctrl/wmctrl.mk b/package/wmctrl/wmctrl.mk
index f26b23e..0d4aeeb 100644
--- a/package/wmctrl/wmctrl.mk
+++ b/package/wmctrl/wmctrl.mk
@@ -6,7 +6,7 @@
WMCTRL_VERSION = 1.07
WMCTRL_SITE = https://sites.google.com/site/tstyblo/wmctrl
-WMCTRL_LICENSE = GPLv2+
+WMCTRL_LICENSE = GPL-2.0+
WMCTRL_LICENSE_FILES = COPYING
WMCTRL_DEPENDENCIES = libglib2 xlib_libX11 xlib_libXmu
diff --git a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
index 5c6f2d2..ddcc6ac 100644
--- a/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
+++ b/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
@@ -7,7 +7,7 @@
XCURSOR_TRANSPARENT_THEME_VERSION = 0.1.1
XCURSOR_TRANSPARENT_THEME_SITE = http://downloads.yoctoproject.org/releases/matchbox/utils
XCURSOR_TRANSPARENT_THEME_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
-XCURSOR_TRANSPARENT_THEME_LICENSE = GPLv2
+XCURSOR_TRANSPARENT_THEME_LICENSE = GPL-2.0
XCURSOR_TRANSPARENT_THEME_LICENSE_FILES = COPYING
define ICONS_DEFAULT_CONFIG_INSTALL
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index cdb3237..561d7bf 100644
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -10,7 +10,7 @@ X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11
# leak in if host has sdl-config
X11VNC_CONF_OPTS = --without-sdl
X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst
-X11VNC_LICENSE = GPLv2+
+X11VNC_LICENSE = GPL-2.0+
X11VNC_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
diff --git a/package/x264/x264.mk b/package/x264/x264.mk
index 2c8040b..7214c96 100644
--- a/package/x264/x264.mk
+++ b/package/x264/x264.mk
@@ -6,7 +6,7 @@
X264_VERSION = 97eaef2ab82a46d13ea5e00270712d6475fbe42b
X264_SITE = git://git.videolan.org/x264.git
-X264_LICENSE = GPLv2+
+X264_LICENSE = GPL-2.0+
X264_DEPENDENCIES = host-pkgconf
X264_LICENSE_FILES = COPYING
X264_INSTALL_STAGING = YES
diff --git a/package/x265/x265.mk b/package/x265/x265.mk
index 498ceaa..2ea404b 100644
--- a/package/x265/x265.mk
+++ b/package/x265/x265.mk
@@ -7,7 +7,7 @@
X265_VERSION = 2.3
X265_SOURCE = x265_$(X265_VERSION).tar.gz
X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
-X265_LICENSE = GPLv2+
+X265_LICENSE = GPL-2.0+
X265_LICENSE_FILES = COPYING
X265_SUBDIR = source
X265_INSTALL_STAGING = YES
diff --git a/package/xen/xen.mk b/package/xen/xen.mk
index 7d32e52..2e388fc 100644
--- a/package/xen/xen.mk
+++ b/package/xen/xen.mk
@@ -6,7 +6,7 @@
XEN_VERSION = 4.7.1
XEN_SITE = http://bits.xensource.com/oss-xen/release/$(XEN_VERSION)
-XEN_LICENSE = GPLv2
+XEN_LICENSE = GPL-2.0
XEN_LICENSE_FILES = COPYING
XEN_DEPENDENCIES = host-python
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index fc240f9..5125473 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -13,7 +13,7 @@ endif
XENOMAI_SITE = https://xenomai.org/downloads/xenomai/stable
XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
-XENOMAI_LICENSE = GPLv2+ with exception (headers), LGPLv2.1+ (libraries), GPLv2+ (kernel), GFDLv1.2+ (docs), GPLv2 (ipipe patch, can driver)
+XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPLv2.1+ (libraries), GPL-2.0+ (kernel), GFDLv1.2+ (docs), GPL-2.0 (ipipe patch, can driver)
# GFDL is not included but refers to gnu.org
XENOMAI_LICENSE_FILES = debian/copyright include/COPYING lib/trank/COPYING kernel/cobalt/COPYING
diff --git a/package/xl2tp/xl2tp.mk b/package/xl2tp/xl2tp.mk
index ff802a4..7f4ffd4 100644
--- a/package/xl2tp/xl2tp.mk
+++ b/package/xl2tp/xl2tp.mk
@@ -7,7 +7,7 @@
XL2TP_VERSION = v1.3.8
XL2TP_SITE = $(call github,xelerance,xl2tpd,$(XL2TP_VERSION))
XL2TP_DEPENDENCIES = libpcap openssl
-XL2TP_LICENSE = GPLv2
+XL2TP_LICENSE = GPL-2.0
XL2TP_LICENSE_FILES = LICENSE
ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
index 831349b..773fcde 100644
--- a/package/xscreensaver/xscreensaver.mk
+++ b/package/xscreensaver/xscreensaver.mk
@@ -8,7 +8,7 @@ XSCREENSAVER_VERSION = 5.32
XSCREENSAVER_SITE = http://www.jwz.org/xscreensaver
# N.B. GPLv2+ code (in the hacks/glx subdirectory) is not currently built.
-XSCREENSAVER_LICENSE = MIT-like, GPLv2+
+XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+
XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \
diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk
index 274e681..5c3be16 100644
--- a/package/xtables-addons/xtables-addons.mk
+++ b/package/xtables-addons/xtables-addons.mk
@@ -8,7 +8,7 @@ XTABLES_ADDONS_VERSION = 2.12
XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz
XTABLES_ADDONS_SITE = http://downloads.sourceforge.net/project/xtables-addons/Xtables-addons
XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf
-XTABLES_ADDONS_LICENSE = GPLv2+
+XTABLES_ADDONS_LICENSE = GPL-2.0+
XTABLES_ADDONS_LICENSE_FILES = LICENSE
XTABLES_ADDONS_CONF_OPTS = \
diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk
index a9a5dbf..141a0e3 100644
--- a/package/xvisor/xvisor.mk
+++ b/package/xvisor/xvisor.mk
@@ -6,7 +6,7 @@
XVISOR_VERSION = 0.2.8
XVISOR_SITE = http://www.xhypervisor.org/tarball
-XVISOR_LICENSE = GPLv2+
+XVISOR_LICENSE = GPL-2.0+
XVISOR_LICENSE_FILES = COPYING
XVISOR_INSTALL_IMAGES = YES
XVISOR_INSTALL_TARGET = NO
diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk
index 14e3f42..132d7e1 100644
--- a/package/xvkbd/xvkbd.mk
+++ b/package/xvkbd/xvkbd.mk
@@ -6,7 +6,7 @@
XVKBD_VERSION = 3.7
XVKBD_SITE = http://t-sato.in.coocan.jp/xvkbd
-XVKBD_LICENSE = GPLv2+
+XVKBD_LICENSE = GPL-2.0+
XVKBD_LICENSE_FILES = README
# Passing USRLIBDIR ensures that the stupid Makefile doesn't add
diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk
index 47ead75..e38b2dc 100644
--- a/package/xxhash/xxhash.mk
+++ b/package/xxhash/xxhash.mk
@@ -6,7 +6,7 @@
XXHASH_VERSION = r40
XXHASH_SITE = $(call github,Cyan4973,xxHash,$(XXHASH_VERSION))
-XXHASH_LICENSE = BSD-2c, GPLv2+
+XXHASH_LICENSE = BSD-2c, GPL-2.0+
XXHASH_LICENSE_FILES = LICENSE xxhsum.c
define XXHASH_BUILD_CMDS
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 40adb3d..4785be8 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -9,7 +9,7 @@ XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
XZ_SITE = http://tukaani.org/xz
XZ_INSTALL_STAGING = YES
XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-XZ_LICENSE = GPLv2+, GPLv3+, LGPLv2.1+
+XZ_LICENSE = GPL-2.0+, GPLv3+, LGPLv2.1+
XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/package/yaffs2utils/yaffs2utils.mk b/package/yaffs2utils/yaffs2utils.mk
index fdd5f67..927ffd6 100644
--- a/package/yaffs2utils/yaffs2utils.mk
+++ b/package/yaffs2utils/yaffs2utils.mk
@@ -7,7 +7,7 @@
YAFFS2UTILS_VERSION = 0.2.9
YAFFS2UTILS_SOURCE = $(YAFFS2UTILS_VERSION).tar.gz
YAFFS2UTILS_SITE = https://yaffs2utils.googlecode.com/files
-YAFFS2UTILS_LICENSE = GPLv2
+YAFFS2UTILS_LICENSE = GPL-2.0
YAFFS2UTILS_LICENSE_FILES = COPYING
define HOST_YAFFS2UTILS_BUILD_CMDS
diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk
index 1980034..25f11de 100644
--- a/package/yasm/yasm.mk
+++ b/package/yasm/yasm.mk
@@ -6,7 +6,7 @@
YASM_VERSION = 1.3.0
YASM_SITE = http://www.tortall.net/projects/yasm/releases
-YASM_LICENSE = BSD-2c, BSD-3c, Artistic, GPLv2, LGPLv2
+YASM_LICENSE = BSD-2c, BSD-3c, Artistic, GPL-2.0, LGPLv2
YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0
# This sed prevents it compiling 2 programs (vsyasm and ytasm)
diff --git a/package/yavta/yavta.mk b/package/yavta/yavta.mk
index 04af2a6..4e3d76e 100644
--- a/package/yavta/yavta.mk
+++ b/package/yavta/yavta.mk
@@ -6,7 +6,7 @@
YAVTA_VERSION = 82ff2efdb9787737b9f21b6f4759f077c827b238
YAVTA_SITE = git://git.ideasonboard.org/yavta.git
-YAVTA_LICENSE = GPLv2+
+YAVTA_LICENSE = GPL-2.0+
YAVTA_LICENSE_FILES = COPYING.GPL
define YAVTA_BUILD_CMDS
diff --git a/package/ympd/ympd.mk b/package/ympd/ympd.mk
index 61e9cab..a50aee0 100644
--- a/package/ympd/ympd.mk
+++ b/package/ympd/ympd.mk
@@ -6,7 +6,7 @@
YMPD_VERSION = v1.2.3
YMPD_SITE = $(call github,notandy,ympd,$(YMPD_VERSION))
-YMPD_LICENSE = GPLv2
+YMPD_LICENSE = GPL-2.0
YMPD_LICENSE_FILES = LICENSE
YMPD_DEPENDENCIES = libmpdclient
diff --git a/package/zd1211-firmware/zd1211-firmware.mk b/package/zd1211-firmware/zd1211-firmware.mk
index 59ea219..860aa76 100644
--- a/package/zd1211-firmware/zd1211-firmware.mk
+++ b/package/zd1211-firmware/zd1211-firmware.mk
@@ -7,7 +7,7 @@
ZD1211_FIRMWARE_VERSION = 1.4
ZD1211_FIRMWARE_SITE = http://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$(ZD1211_FIRMWARE_VERSION)
ZD1211_FIRMWARE_SOURCE = zd1211-firmware-$(ZD1211_FIRMWARE_VERSION).tar.bz2
-ZD1211_FIRMWARE_LICENSE = GPLv2
+ZD1211_FIRMWARE_LICENSE = GPL-2.0
ZD1211_FIRMWARE_LICENSE_FILES = COPYING
# Not all of the firmware files are used
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 03/21] boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+
2017-03-30 13:43 ` [Buildroot] [PATCH 03/21] boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+ Rahul Bedarkar
@ 2017-03-30 21:50 ` Arnout Vandecappelle
0 siblings, 0 replies; 34+ messages in thread
From: Arnout Vandecappelle @ 2017-03-30 21:50 UTC (permalink / raw)
To: buildroot
On 30-03-17 15:43, Rahul Bedarkar wrote:
> We want to use SPDX identifier for license strings as much as possible.
> SPDX short identifier for GPLv2/GPLv2+ is GPL-2.0/GPL-2.0+.
>
> This change is done by using following command.
> find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv2\>/GPL-2.0/g'
>
> Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
I gave up at strongswan, and instead I just did the reverse
sed s/GPL-2.0/GPLv2/ and reviewed that...
Note that this patch doesn't appear in patchwork.
Before applying, please run the sed command again to check that no new packages
were added with GPLv2.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 34+ messages in thread
* [Buildroot] [PATCH 04/21] boot, package: use SPDX short identifier for GPLv3/GPLv3+
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (2 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 03/21] boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+ Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 21:56 ` Arnout Vandecappelle
2017-03-30 13:43 ` [Buildroot] [PATCH 05/21] boot, package: use SPDX short identifier for LGPLv2.1/LGPLv2.1+ Rahul Bedarkar
` (18 subsequent siblings)
22 siblings, 1 reply; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for GPLv3/GPLv3+ is GPL-3.0/GPL-3.0+.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv3\>/GPL-3.0/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
boot/grub2/grub2.mk | 2 +-
package/4th/4th.mk | 2 +-
package/at/at.mk | 2 +-
package/aubio/aubio.mk | 2 +-
package/autoconf-archive/autoconf-archive.mk | 2 +-
package/autoconf/autoconf.mk | 2 +-
package/bash/bash.mk | 2 +-
package/binutils/binutils.mk | 2 +-
package/bison/bison.mk | 2 +-
package/ccache/ccache.mk | 2 +-
package/cgroupfs-mount/cgroupfs-mount.mk | 2 +-
package/cifs-utils/cifs-utils.mk | 2 +-
package/comix-cursors/comix-cursors.mk | 2 +-
package/coreutils/coreutils.mk | 2 +-
package/cpio/cpio.mk | 2 +-
package/dc3dd/dc3dd.mk | 2 +-
package/diffutils/diffutils.mk | 2 +-
package/dillo/dillo.mk | 2 +-
package/ding-libs/ding-libs.mk | 2 +-
package/dnsmasq/dnsmasq.mk | 2 +-
package/domoticz/domoticz.mk | 2 +-
package/dosfstools/dosfstools.mk | 2 +-
package/ed/ed.mk | 2 +-
package/elfutils/elfutils.mk | 2 +-
package/enscript/enscript.mk | 2 +-
package/espeak/espeak.mk | 2 +-
package/evemu/evemu.mk | 2 +-
package/exfat-utils/exfat-utils.mk | 2 +-
package/exfat/exfat.mk | 2 +-
package/fakeroot/fakeroot.mk | 2 +-
package/findutils/findutils.mk | 2 +-
package/ftop/ftop.mk | 2 +-
package/gawk/gawk.mk | 2 +-
package/gdb/gdb.mk | 2 +-
package/gdbm/gdbm.mk | 2 +-
package/gengetopt/gengetopt.mk | 2 +-
package/gettext/gettext.mk | 2 +-
package/git-crypt/git-crypt.mk | 2 +-
package/glmark2/glmark2.mk | 2 +-
package/gnupg/gnupg.mk | 2 +-
package/gnupg2/gnupg2.mk | 2 +-
package/gnuradio/gnuradio.mk | 2 +-
package/gnutls/gnutls.mk | 2 +-
package/gperf/gperf.mk | 2 +-
package/gqrx/gqrx.mk | 2 +-
package/gr-osmosdr/gr-osmosdr.mk | 2 +-
package/grep/grep.mk | 2 +-
package/gsl/gsl.mk | 2 +-
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 2 +-
package/gzip/gzip.mk | 2 +-
package/hans/hans.mk | 2 +-
package/haveged/haveged.mk | 2 +-
package/hidapi/hidapi.mk | 2 +-
package/ifenslave/ifenslave.mk | 2 +-
package/janus-gateway/janus-gateway.mk | 2 +-
package/kodi-adsp-basic/kodi-adsp-basic.mk | 2 +-
package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk | 2 +-
package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk | 2 +-
package/lensfun/lensfun.mk | 2 +-
package/less/less.mk | 2 +-
package/lftp/lftp.mk | 2 +-
package/libasplib/libasplib.mk | 2 +-
package/libassuan/libassuan.mk | 2 +-
package/libcdio/libcdio.mk | 2 +-
package/libfreeimage/libfreeimage.mk | 2 +-
package/libgpiod/libgpiod.mk | 2 +-
package/libgsasl/libgsasl.mk | 2 +-
package/libiconv/libiconv.mk | 2 +-
package/libidn/libidn.mk | 2 +-
package/libksba/libksba.mk | 2 +-
package/libllcp/libllcp.mk | 2 +-
package/libsigrok/libsigrok.mk | 2 +-
package/libsigrokdecode/libsigrokdecode.mk | 2 +-
package/libstrophe/libstrophe.mk | 2 +-
package/libtasn1/libtasn1.mk | 2 +-
package/liburcu/liburcu.mk | 2 +-
package/m4/m4.mk | 2 +-
package/make/make.mk | 2 +-
package/mc/mc.mk | 2 +-
package/mcrypt/mcrypt.mk | 2 +-
package/modplugtools/modplugtools.mk | 2 +-
package/mosh/mosh.mk | 2 +-
package/msmtp/msmtp.mk | 2 +-
package/mtdev2tuio/mtdev2tuio.mk | 2 +-
package/mtools/mtools.mk | 2 +-
package/nano/nano.mk | 2 +-
package/ndisc6/ndisc6.mk | 2 +-
package/nmon/nmon.mk | 2 +-
package/nut/nut.mk | 2 +-
package/ocrad/ocrad.mk | 2 +-
package/openzwave/openzwave.mk | 2 +-
package/parted/parted.mk | 2 +-
package/patch/patch.mk | 2 +-
package/patchelf/patchelf.mk | 2 +-
package/pifmrds/pifmrds.mk | 2 +-
package/pound/pound.mk | 2 +-
package/pulseview/pulseview.mk | 2 +-
package/python-daemon/python-daemon.mk | 2 +-
package/python-docutils/python-docutils.mk | 2 +-
package/python-enum/python-enum.mk | 2 +-
package/python-mwscrape2slob/python-mwscrape2slob.mk | 2 +-
package/python-networkmanager/python-networkmanager.mk | 2 +-
package/python-pyqt/python-pyqt.mk | 2 +-
package/python-pyqt5/python-pyqt5.mk | 2 +-
package/python-sip/python-sip.mk | 2 +-
package/python-slob/python-slob.mk | 2 +-
package/qt/qt.mk | 2 +-
package/qt5/qt53d/qt53d.mk | 2 +-
package/qt5/qt5base/qt5base.mk | 4 ++--
package/qt5/qt5canvas3d/qt5canvas3d.mk | 2 +-
package/qt5/qt5connectivity/qt5connectivity.mk | 4 ++--
package/qt5/qt5declarative/qt5declarative.mk | 4 ++--
package/qt5/qt5enginio/qt5enginio.mk | 2 +-
package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 ++--
package/qt5/qt5imageformats/qt5imageformats.mk | 4 ++--
package/qt5/qt5location/qt5location.mk | 4 ++--
package/qt5/qt5multimedia/qt5multimedia.mk | 4 ++--
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +-
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +-
package/qt5/qt5script/qt5script.mk | 2 +-
package/qt5/qt5sensors/qt5sensors.mk | 4 ++--
package/qt5/qt5serialbus/qt5serialbus.mk | 2 +-
package/qt5/qt5serialport/qt5serialport.mk | 4 ++--
package/qt5/qt5svg/qt5svg.mk | 4 ++--
package/qt5/qt5tools/qt5tools.mk | 4 ++--
package/qt5/qt5webchannel/qt5webchannel.mk | 4 ++--
package/qt5/qt5websockets/qt5websockets.mk | 4 ++--
| 4 ++--
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 ++--
package/qtuio/qtuio.mk | 2 +-
package/ranger/ranger.mk | 2 +-
package/rdesktop/rdesktop.mk | 2 +-
package/readline/readline.mk | 2 +-
package/rsync/rsync.mk | 2 +-
package/rsyslog/rsyslog.mk | 2 +-
package/samba4/samba4.mk | 2 +-
package/screen/screen.mk | 2 +-
package/sed/sed.mk | 2 +-
package/sigrok-cli/sigrok-cli.mk | 2 +-
package/sngrep/sngrep.mk | 2 +-
package/squeezelite/squeezelite.mk | 2 +-
package/supertuxkart/supertuxkart.mk | 2 +-
package/swig/swig.mk | 2 +-
package/tar/tar.mk | 2 +-
package/tcping/tcping.mk | 2 +-
package/tcpreplay/tcpreplay.mk | 2 +-
package/transmission/transmission.mk | 2 +-
package/triggerhappy/triggerhappy.mk | 2 +-
package/tvheadend/tvheadend.mk | 2 +-
package/udpxy/udpxy.mk | 2 +-
package/wavemon/wavemon.mk | 2 +-
package/wget/wget.mk | 2 +-
package/which/which.mk | 2 +-
package/xorriso/xorriso.mk | 2 +-
package/xz/xz.mk | 2 +-
package/yad/yad.mk | 2 +-
package/zynq-boot-bin/zynq-boot-bin.mk | 2 +-
157 files changed, 172 insertions(+), 172 deletions(-)
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index dc4e51e..dc01983 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -7,7 +7,7 @@
GRUB2_VERSION = 2.00
GRUB2_SITE = $(BR2_GNU_MIRROR)/grub
GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz
-GRUB2_LICENSE = GPLv3+
+GRUB2_LICENSE = GPL-3.0+
GRUB2_LICENSE_FILES = COPYING
GRUB2_DEPENDENCIES = host-bison host-flex
diff --git a/package/4th/4th.mk b/package/4th/4th.mk
index 0d82614..0226db1 100644
--- a/package/4th/4th.mk
+++ b/package/4th/4th.mk
@@ -7,7 +7,7 @@
4TH_VERSION = 3.62.4
4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz
4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION)
-4TH_LICENSE = GPLv3+, LGPLv3+
+4TH_LICENSE = GPL-3.0+, LGPLv3+
# The COPYING file only contains the text of the LGPLv3, but the
# source code really contains parts under GPLv3+.
4TH_LICENSE_FILES = COPYING
diff --git a/package/at/at.mk b/package/at/at.mk
index db38aa7..058ebac 100644
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -11,7 +11,7 @@ AT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a
AT_MAKE = $(MAKE1)
AT_AUTORECONF = YES
AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex
-AT_LICENSE = GPL-2.0+, GPLv3+, ISC
+AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC
AT_LICENSE_FILES = Copyright COPYING
AT_CONF_OPTS = \
diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk
index f3330c2..f8be19f 100644
--- a/package/aubio/aubio.mk
+++ b/package/aubio/aubio.mk
@@ -7,7 +7,7 @@
AUBIO_VERSION = 0.4.3
AUBIO_SITE = https://aubio.org/pub
AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2
-AUBIO_LICENSE = GPLv3+
+AUBIO_LICENSE = GPL-3.0+
AUBIO_LICENSE_FILES = COPYING
AUBIO_INSTALL_STAGING = YES
diff --git a/package/autoconf-archive/autoconf-archive.mk b/package/autoconf-archive/autoconf-archive.mk
index 86956eb..053ea33 100644
--- a/package/autoconf-archive/autoconf-archive.mk
+++ b/package/autoconf-archive/autoconf-archive.mk
@@ -7,7 +7,7 @@
AUTOCONF_ARCHIVE_VERSION = 2016.03.20
AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz
AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive
-AUTOCONF_ARCHIVE_LICENSE = GPLv3+ with exception
+AUTOCONF_ARCHIVE_LICENSE = GPL-3.0+ with exception
AUTOCONF_ARCHIVE_LICENSE_FILES = COPYING COPYING.EXCEPTION
HOST_AUTOCONF_ARCHIVE_INSTALL_OPTS = aclocaldir=$(HOST_DIR)/usr/share/autoconf-archive install
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index fd91961..904fada 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -8,7 +8,7 @@ AUTOCONF_VERSION = 2.69
AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.xz
AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
-AUTOCONF_LICENSE = GPLv3+ with exceptions
+AUTOCONF_LICENSE = GPL-3.0+ with exceptions
AUTOCONF_LICENSE_FILES = COPYINGv3 COPYING.EXCEPTION
HOST_AUTOCONF_CONF_ENV = \
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 090cf52..639f012 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -10,7 +10,7 @@ BASH_SITE = $(BR2_GNU_MIRROR)/bash
BASH_DEPENDENCIES = ncurses readline host-bison \
$(if $(BR2_PACKAGE_BUSYBOX),busybox)
BASH_CONF_OPTS = --with-installed-readline
-BASH_LICENSE = GPLv3+
+BASH_LICENSE = GPL-3.0+
BASH_LICENSE_FILES = COPYING
BASH_CONF_ENV += \
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 7dfe4db..467db6e 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -25,7 +25,7 @@ BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.bz2
BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
BINUTILS_INSTALL_STAGING = YES
BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-BINUTILS_LICENSE = GPLv3+, libiberty LGPLv2.1+
+BINUTILS_LICENSE = GPL-3.0+, libiberty LGPLv2.1+
BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB
ifeq ($(BINUTILS_FROM_GIT),y)
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 5779673..e4fc504 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -7,7 +7,7 @@
BISON_VERSION = 3.0.4
BISON_SOURCE = bison-$(BISON_VERSION).tar.xz
BISON_SITE = $(BR2_GNU_MIRROR)/bison
-BISON_LICENSE = GPLv3+
+BISON_LICENSE = GPL-3.0+
BISON_LICENSE_FILES = COPYING
HOST_BISON_DEPENDENCIES = host-m4
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index 6a20ee8..97d66bb 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -7,7 +7,7 @@
CCACHE_VERSION = 3.3.4
CCACHE_SITE = https://www.samba.org/ftp/ccache
CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
-CCACHE_LICENSE = GPLv3+, others
+CCACHE_LICENSE = GPL-3.0+, others
CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
# Force ccache to use its internal zlib. The problem is that without
diff --git a/package/cgroupfs-mount/cgroupfs-mount.mk b/package/cgroupfs-mount/cgroupfs-mount.mk
index b375605..096c728 100644
--- a/package/cgroupfs-mount/cgroupfs-mount.mk
+++ b/package/cgroupfs-mount/cgroupfs-mount.mk
@@ -6,7 +6,7 @@
CGROUPFS_MOUNT_VERSION = 7285bf44402029394808339f69f4f293730fc2c6
CGROUPFS_MOUNT_SITE = $(call github,tianon,cgroupfs-mount,$(CGROUPFS_MOUNT_VERSION))
-CGROUPFS_MOUNT_LICENSE = GPLv3+
+CGROUPFS_MOUNT_LICENSE = GPL-3.0+
CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright
define CGROUPFS_MOUNT_INSTALL_TARGET_CMDS
diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
index fdb1779..152a3ee 100644
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -7,7 +7,7 @@
CIFS_UTILS_VERSION = 6.6
CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils
-CIFS_UTILS_LICENSE = GPLv3+
+CIFS_UTILS_LICENSE = GPL-3.0+
CIFS_UTILS_LICENSE_FILES = COPYING
ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
diff --git a/package/comix-cursors/comix-cursors.mk b/package/comix-cursors/comix-cursors.mk
index f8e8284..6cc7376 100644
--- a/package/comix-cursors/comix-cursors.mk
+++ b/package/comix-cursors/comix-cursors.mk
@@ -7,7 +7,7 @@
COMIX_CURSORS_VERSION = 0.8.2
COMIX_CURSORS_SITE = http://limitland.de/downloads/comixcursors
COMIX_CURSORS_SOURCE = ComixCursors-$(COMIX_CURSORS_VERSION).tar.bz2
-COMIX_CURSORS_LICENSE = GPLv3
+COMIX_CURSORS_LICENSE = GPL-3.0
COMIX_CURSORS_STRIP_COMPONENTS = 0
define COMIX_CURSORS_INSTALL_TARGET_CMDS
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 409089c..8c71561 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -7,7 +7,7 @@
COREUTILS_VERSION = 8.26
COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
-COREUTILS_LICENSE = GPLv3+
+COREUTILS_LICENSE = GPL-3.0+
COREUTILS_LICENSE_FILES = COPYING
# coreutils-01-fix-for-dummy-man-usage.patch triggers autoreconf on build
diff --git a/package/cpio/cpio.mk b/package/cpio/cpio.mk
index b0b8fa6..7e8549d 100644
--- a/package/cpio/cpio.mk
+++ b/package/cpio/cpio.mk
@@ -8,7 +8,7 @@ CPIO_VERSION = 2.12
CPIO_SITE = $(BR2_GNU_MIRROR)/cpio
CPIO_CONF_OPTS = --bindir=/bin
CPIO_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-CPIO_LICENSE = GPLv3+
+CPIO_LICENSE = GPL-3.0+
CPIO_LICENSE_FILES = COPYING
# cpio uses argp.h which is not provided by uclibc or musl by default.
diff --git a/package/dc3dd/dc3dd.mk b/package/dc3dd/dc3dd.mk
index fef9093..1ed60a4 100644
--- a/package/dc3dd/dc3dd.mk
+++ b/package/dc3dd/dc3dd.mk
@@ -8,7 +8,7 @@ DC3DD_VERSION_MAJOR = 7.2
DC3DD_VERSION = $(DC3DD_VERSION_MAJOR).641
DC3DD_SOURCE = dc3dd-$(DC3DD_VERSION).tar.xz
DC3DD_SITE = https://downloads.sourceforge.net/project/dc3dd/dc3dd/$(DC3DD_VERSION_MAJOR)
-DC3DD_LICENSE = GPLv3+
+DC3DD_LICENSE = GPL-3.0+
DC3DD_LICENSE_FILES = COPYING
# We are patching the Makefile.am
DC3DD_AUTORECONF = yes
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index d3e608c..dee3fac 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -8,7 +8,7 @@ DIFFUTILS_VERSION = 3.5
DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz
DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-DIFFUTILS_LICENSE = GPLv3+
+DIFFUTILS_LICENSE = GPL-3.0+
DIFFUTILS_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk
index 01ab4f5..a6885f5 100644
--- a/package/dillo/dillo.mk
+++ b/package/dillo/dillo.mk
@@ -7,7 +7,7 @@
DILLO_VERSION = 3.0.5
DILLO_SOURCE = dillo-$(DILLO_VERSION).tar.bz2
DILLO_SITE = http://www.dillo.org/download
-DILLO_LICENSE = GPLv3+
+DILLO_LICENSE = GPL-3.0+
DILLO_LICENSE_FILES = COPYING
# configure.ac gets patched, so autoreconf is necessary
DILLO_AUTORECONF = YES
diff --git a/package/ding-libs/ding-libs.mk b/package/ding-libs/ding-libs.mk
index 5b842ff..8a6615d 100644
--- a/package/ding-libs/ding-libs.mk
+++ b/package/ding-libs/ding-libs.mk
@@ -11,7 +11,7 @@ DING_LIBS_DEPENDENCIES = host-pkgconf \
$(if $(BR2_PACKAGE_GETTEXT),gettext) \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
DING_LIBS_INSTALL_STAGING = YES
-DING_LIBS_LICENSE = LGPLv3+ (library),GPLv3+ (test programs)
+DING_LIBS_LICENSE = LGPLv3+ (library),GPL-3.0+ (test programs)
DING_LIBS_LICENSE_FILES = COPYING COPYING.LESSER
# autoconf/automake generated files not present in tarball
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 53a69d5..c6f15e2 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -11,7 +11,7 @@ DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
DNSMASQ_DEPENDENCIES = host-pkgconf
-DNSMASQ_LICENSE = GPL-2.0 or GPLv3
+DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0
DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)
diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk
index 48cdbc4..59731b5 100644
--- a/package/domoticz/domoticz.mk
+++ b/package/domoticz/domoticz.mk
@@ -6,7 +6,7 @@
DOMOTICZ_VERSION = 3.5877
DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
-DOMOTICZ_LICENSE = GPLv3
+DOMOTICZ_LICENSE = GPL-3.0
DOMOTICZ_LICENSE_FILES = License.txt
DOMOTICZ_DEPENDENCIES = \
boost \
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index 67c6f73..c2e1690 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -7,7 +7,7 @@
DOSFSTOOLS_VERSION = 4.0
DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION)
-DOSFSTOOLS_LICENSE = GPLv3+
+DOSFSTOOLS_LICENSE = GPL-3.0+
DOSFSTOOLS_LICENSE_FILES = COPYING
DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/
HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks
diff --git a/package/ed/ed.mk b/package/ed/ed.mk
index 33323be..ada0316 100644
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -10,7 +10,7 @@ ED_SOURCE = ed-$(ED_VERSION).tar.lz
ED_CONF_OPTS = \
CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)"
-ED_LICENSE = GPLv3+
+ED_LICENSE = GPL-3.0+
ED_LICENSE_FILES = COPYING
define ED_CONFIGURE_CMDS
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index be6e626..a7800b9 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -74,7 +74,7 @@ endif
ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y)
ELFUTILS_CONF_OPTS += --enable-progs
-ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPLv3+ (programs)
+ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPL-3.0+ (programs)
ELFUTILS_LICENSE_FILES += COPYING
else
ELFUTILS_CONF_OPTS += --disable-progs
diff --git a/package/enscript/enscript.mk b/package/enscript/enscript.mk
index fc2cd41..fbc9e69 100644
--- a/package/enscript/enscript.mk
+++ b/package/enscript/enscript.mk
@@ -6,7 +6,7 @@
ENSCRIPT_VERSION = 1.6.6
ENSCRIPT_SITE = $(BR2_GNU_MIRROR)/enscript
-ENSCRIPT_LICENSE = GPLv3+
+ENSCRIPT_LICENSE = GPL-3.0+
ENSCRIPT_LICENSE_FILES = COPYING
# Enable pthread threads if toolchain supports threads
diff --git a/package/espeak/espeak.mk b/package/espeak/espeak.mk
index 734ec30e..226f17f 100644
--- a/package/espeak/espeak.mk
+++ b/package/espeak/espeak.mk
@@ -8,7 +8,7 @@ ESPEAK_VERSION_MAJOR = 1.48
ESPEAK_VERSION = $(ESPEAK_VERSION_MAJOR).04
ESPEAK_SOURCE = espeak-$(ESPEAK_VERSION)-source.zip
ESPEAK_SITE = http://downloads.sourceforge.net/project/espeak/espeak/espeak-$(ESPEAK_VERSION_MAJOR)
-ESPEAK_LICENSE = GPLv3+
+ESPEAK_LICENSE = GPL-3.0+
ESPEAK_LICENSE_FILES = License.txt
ifeq ($(BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA),y)
diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk
index 4f59789..57f324b 100644
--- a/package/evemu/evemu.mk
+++ b/package/evemu/evemu.mk
@@ -7,7 +7,7 @@
EVEMU_VERSION = 2.5.0
EVEMU_SITE = http://www.freedesktop.org/software/evemu
EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz
-EVEMU_LICENSE = LGPLv3 (library), GPLv3 (tools)
+EVEMU_LICENSE = LGPLv3 (library), GPL-3.0 (tools)
EVEMU_LICENSE_FILES = COPYING
# asciidoc used to generate manpages, which we don't need, and if it's
diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk
index 259c2da..622c181 100644
--- a/package/exfat-utils/exfat-utils.mk
+++ b/package/exfat-utils/exfat-utils.mk
@@ -6,7 +6,7 @@
EXFAT_UTILS_VERSION = 1.2.4
EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION)
-EXFAT_UTILS_LICENSE = GPLv3+
+EXFAT_UTILS_LICENSE = GPL-3.0+
EXFAT_UTILS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk
index 84b6001..ae89217 100644
--- a/package/exfat/exfat.mk
+++ b/package/exfat/exfat.mk
@@ -8,7 +8,7 @@ EXFAT_VERSION = 1.2.4
EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_VERSION)
EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz
EXFAT_DEPENDENCIES = libfuse host-pkgconf
-EXFAT_LICENSE = GPLv3+
+EXFAT_LICENSE = GPL-3.0+
EXFAT_LICENSE_FILES = COPYING
EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 731b06a..4aa27a1 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -16,7 +16,7 @@ HOST_FAKEROOT_CONF_ENV = \
ac_cv_header_sys_capability_h=no \
ac_cv_func_capset=no
-FAKEROOT_LICENSE = GPLv3+
+FAKEROOT_LICENSE = GPL-3.0+
FAKEROOT_LICENSE_FILES = COPYING
$(eval $(host-autotools-package))
diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk
index 8f6b099..6ca0062 100644
--- a/package/findutils/findutils.mk
+++ b/package/findutils/findutils.mk
@@ -6,7 +6,7 @@
FINDUTILS_VERSION = 4.6.0
FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils
-FINDUTILS_LICENSE = GPLv3+
+FINDUTILS_LICENSE = GPL-3.0+
FINDUTILS_LICENSE_FILES = COPYING
FINDUTILS_CONF_ENV = \
gl_cv_func_stdin=yes \
diff --git a/package/ftop/ftop.mk b/package/ftop/ftop.mk
index c8d0f93..d10e9cd 100644
--- a/package/ftop/ftop.mk
+++ b/package/ftop/ftop.mk
@@ -7,7 +7,7 @@
FTOP_VERSION = 1.0
FTOP_SITE = http://ftop.googlecode.com/files
FTOP_DEPENDENCIES = ncurses
-FTOP_LICENSE = GPLv3+
+FTOP_LICENSE = GPL-3.0+
FTOP_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 7c6689b..a3a2927 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -8,7 +8,7 @@ GAWK_VERSION = 4.1.4
GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz
GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
GAWK_DEPENDENCIES = host-gawk
-GAWK_LICENSE = GPLv3+
+GAWK_LICENSE = GPL-3.0+
GAWK_LICENSE_FILES = COPYING
# Prefer full-blown gawk over busybox awk
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 8067b63..f2315a9 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -20,7 +20,7 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
GDB_FROM_GIT = y
endif
-GDB_LICENSE = GPL-2.0+, LGPLv2+, GPLv3+, LGPLv3+
+GDB_LICENSE = GPL-2.0+, LGPLv2+, GPL-3.0+, LGPLv3+
GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB
# We only want gdbserver and not the entire debugger.
diff --git a/package/gdbm/gdbm.mk b/package/gdbm/gdbm.mk
index 55ece88..72f958d 100644
--- a/package/gdbm/gdbm.mk
+++ b/package/gdbm/gdbm.mk
@@ -6,7 +6,7 @@
GDBM_VERSION = 1.12
GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm
-GDBM_LICENSE = GPLv3+
+GDBM_LICENSE = GPL-3.0+
GDBM_LICENSE_FILES = COPYING
GDBM_INSTALL_STAGING = YES
diff --git a/package/gengetopt/gengetopt.mk b/package/gengetopt/gengetopt.mk
index b7cbc7f..e7c49ba 100644
--- a/package/gengetopt/gengetopt.mk
+++ b/package/gengetopt/gengetopt.mk
@@ -6,7 +6,7 @@
GENGETOPT_VERSION = 2.22.6
GENGETOPT_SITE = $(BR2_GNU_MIRROR)/gengetopt
-GENGETOPT_LICENSE = GPLv3+
+GENGETOPT_LICENSE = GPL-3.0+
GENGETOPT_LICENSE_FILES = COPYING LICENSE
# Parallel build broken
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 1435388..34d8928 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -8,7 +8,7 @@ GETTEXT_VERSION = 0.19.8.1
GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
GETTEXT_SOURCE = gettext-$(GETTEXT_VERSION).tar.xz
GETTEXT_INSTALL_STAGING = YES
-GETTEXT_LICENSE = LGPLv2.1+ (libintl), GPLv3+ (the rest)
+GETTEXT_LICENSE = LGPLv2.1+ (libintl), GPL-3.0+ (the rest)
GETTEXT_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB
GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
diff --git a/package/git-crypt/git-crypt.mk b/package/git-crypt/git-crypt.mk
index 7785ddc..6cae456 100644
--- a/package/git-crypt/git-crypt.mk
+++ b/package/git-crypt/git-crypt.mk
@@ -7,7 +7,7 @@
GIT_CRYPT_VERSION = 0.5.0
GIT_CRYPT_SITE = https://www.agwa.name/projects/git-crypt/downloads
GIT_CRYPT_DEPENDENCIES = host-pkgconf openssl
-GIT_CRYPT_LICENSE = GPLv3+, MIT
+GIT_CRYPT_LICENSE = GPL-3.0+, MIT
GIT_CRYPT_LICENSE_FILES = COPYING parse_options.hpp
GIT_CRYPT_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
diff --git a/package/glmark2/glmark2.mk b/package/glmark2/glmark2.mk
index c7cefeb..4edc713 100644
--- a/package/glmark2/glmark2.mk
+++ b/package/glmark2/glmark2.mk
@@ -6,7 +6,7 @@
GLMARK2_VERSION = 7215c0f337dae0b232535549c37fca441747a891
GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION))
-GLMARK2_LICENSE = GPLv3+, SGIv1
+GLMARK2_LICENSE = GPL-3.0+, SGIv1
GLMARK2_LICENSE_FILES = COPYING COPYING.SGI
GLMARK2_DEPENDENCIES = host-pkgconf jpeg libpng \
$(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \
diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk
index 182abd6..caa9d2c 100644
--- a/package/gnupg/gnupg.mk
+++ b/package/gnupg/gnupg.mk
@@ -7,7 +7,7 @@
GNUPG_VERSION = 1.4.21
GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
-GNUPG_LICENSE = GPLv3+
+GNUPG_LICENSE = GPL-3.0+
GNUPG_LICENSE_FILES = COPYING
GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv)
GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no
diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk
index 3932c3a..c310f93 100644
--- a/package/gnupg2/gnupg2.mk
+++ b/package/gnupg2/gnupg2.mk
@@ -7,7 +7,7 @@
GNUPG2_VERSION = 2.1.19
GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
-GNUPG2_LICENSE = GPLv3+
+GNUPG2_LICENSE = GPL-3.0+
GNUPG2_LICENSE_FILES = COPYING
GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
index f1817f6..dbd8ee2 100644
--- a/package/gnuradio/gnuradio.mk
+++ b/package/gnuradio/gnuradio.mk
@@ -6,7 +6,7 @@
GNURADIO_VERSION = 3.7.9.1
GNURADIO_SITE = http://gnuradio.org/releases/gnuradio
-GNURADIO_LICENSE = GPLv3+
+GNURADIO_LICENSE = GPL-3.0+
GNURADIO_LICENSE_FILES = COPYING
GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index be1cf00..1d89b08 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -8,7 +8,7 @@ GNUTLS_VERSION_MAJOR = 3.5
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).10
GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
-GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library)
+GNUTLS_LICENSE = LGPLv2.1+ (core library), GPL-3.0+ (gnutls-openssl library)
GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER
GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre
GNUTLS_CONF_OPTS = \
diff --git a/package/gperf/gperf.mk b/package/gperf/gperf.mk
index 8ce3c95..2a6192a 100644
--- a/package/gperf/gperf.mk
+++ b/package/gperf/gperf.mk
@@ -6,7 +6,7 @@
GPERF_VERSION = 3.0.4
GPERF_SITE = $(BR2_GNU_MIRROR)/gperf
-GPERF_LICENSE = GPLv3+
+GPERF_LICENSE = GPL-3.0+
GPERF_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk
index b591e60..12e79ed 100644
--- a/package/gqrx/gqrx.mk
+++ b/package/gqrx/gqrx.mk
@@ -6,7 +6,7 @@
GQRX_VERSION = v2.6
GQRX_SITE = $(call github,csete,gqrx,$(GQRX_VERSION))
-GQRX_LICENSE = GPLv3+, Apache-2.0
+GQRX_LICENSE = GPL-3.0+, Apache-2.0
GQRX_LICENSE_FILES = COPYING LICENSE-CTK
GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg
diff --git a/package/gr-osmosdr/gr-osmosdr.mk b/package/gr-osmosdr/gr-osmosdr.mk
index d7c3d62..55e043e 100644
--- a/package/gr-osmosdr/gr-osmosdr.mk
+++ b/package/gr-osmosdr/gr-osmosdr.mk
@@ -6,7 +6,7 @@
GR_OSMOSDR_VERSION = 164a09fc11cec2d8b15b38e8b512fa542d6cecc7
GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,$(GR_OSMOSDR_VERSION))
-GR_OSMOSDR_LICENSE = GPLv3+
+GR_OSMOSDR_LICENSE = GPL-3.0+
GR_OSMOSDR_LICENSE_FILES = COPYING
# gr-osmosdr prevents doing an in-source-tree build
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 7468831..92a915c 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -7,7 +7,7 @@
GREP_VERSION = 3.0
GREP_SITE = $(BR2_GNU_MIRROR)/grep
GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
-GREP_LICENSE = GPLv3+
+GREP_LICENSE = GPL-3.0+
GREP_LICENSE_FILES = COPYING
GREP_CONF_OPTS = --disable-perl-regexp \
$(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)
diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk
index 0ad5377..3dd4904 100644
--- a/package/gsl/gsl.mk
+++ b/package/gsl/gsl.mk
@@ -7,7 +7,7 @@
GSL_VERSION = 1.16
GSL_SITE = $(BR2_GNU_MIRROR)/gsl
GSL_INSTALL_STAGING = YES
-GSL_LICENSE = GPLv3
+GSL_LICENSE = GPL-3.0
GSL_LICENSE_FILES = COPYING
GSL_CONFIG_SCRIPTS = gsl-config
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index e178dbc..9757f16 100644
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -12,7 +12,7 @@ GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base
ifeq ($(BR2_PACKAGE_GST_FFMPEG_GPL),y)
GST_FFMPEG_CONF_OPTS += --disable-lgpl
-GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPLv3+ (libav)
+GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPL-3.0+ (libav)
GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3
else
GST_FFMPEG_CONF_OPTS += --enable-lgpl
diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index c4e91b0..26fc8ec 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -11,7 +11,7 @@ GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
GZIP_CONF_OPTS = --exec-prefix=/
# Prefer full gzip over potentially lightweight/slower from busybox
GZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-GZIP_LICENSE = GPLv3+
+GZIP_LICENSE = GPL-3.0+
GZIP_LICENSE_FILES = COPYING
GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes
# configure substitutes $(SHELL) for the shell shebang in scripts like
diff --git a/package/hans/hans.mk b/package/hans/hans.mk
index 5111d46..2e1e002 100644
--- a/package/hans/hans.mk
+++ b/package/hans/hans.mk
@@ -6,7 +6,7 @@
HANS_VERSION = 0.4.4
HANS_SITE = http://downloads.sourceforge.net/project/hanstunnel/source
-HANS_LICENSE = GPLv3+
+HANS_LICENSE = GPL-3.0+
HANS_LICENSE_FILES = LICENSE
define HANS_BUILD_CMDS
diff --git a/package/haveged/haveged.mk b/package/haveged/haveged.mk
index 66d69a6..a645557 100644
--- a/package/haveged/haveged.mk
+++ b/package/haveged/haveged.mk
@@ -6,7 +6,7 @@
HAVEGED_VERSION = 1.9.1
HAVEGED_SITE = http://www.issihosts.com/haveged
-HAVEGED_LICENSE = GPLv3+
+HAVEGED_LICENSE = GPL-3.0+
HAVEGED_LICENSE_FILES = COPYING
ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y)
diff --git a/package/hidapi/hidapi.mk b/package/hidapi/hidapi.mk
index 9922efc..e4083ce 100644
--- a/package/hidapi/hidapi.mk
+++ b/package/hidapi/hidapi.mk
@@ -11,7 +11,7 @@ HIDAPI_SITE = $(call github,signal11,hidapi,$(HIDAPI_VERSION))
HIDAPI_INSTALL_STAGING = YES
# No configure provided, so we need to autoreconf.
HIDAPI_AUTORECONF = YES
-HIDAPI_LICENSE = GPLv3 or BSD-3c or HIDAPI license
+HIDAPI_LICENSE = GPL-3.0 or BSD-3c or HIDAPI license
HIDAPI_LICENSE_FILES = LICENSE.txt LICENSE-gpl3.txt LICENSE-bsd.txt LICENSE-orig.txt
HIDAPI_DEPENDENCIES = libusb libgudev
diff --git a/package/ifenslave/ifenslave.mk b/package/ifenslave/ifenslave.mk
index 1b82312..4030d22 100644
--- a/package/ifenslave/ifenslave.mk
+++ b/package/ifenslave/ifenslave.mk
@@ -7,7 +7,7 @@
IFENSLAVE_VERSION = 2.9
IFENSLAVE_SOURCE = ifenslave_$(IFENSLAVE_VERSION).tar.xz
IFENSLAVE_SITE = http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave
-IFENSLAVE_LICENSE = GPLv3+
+IFENSLAVE_LICENSE = GPL-3.0+
IFENSLAVE_LICENSE_FILES = debian/copyright
IFENSLAVE_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
index f58db81..7c35bfb 100644
--- a/package/janus-gateway/janus-gateway.mk
+++ b/package/janus-gateway/janus-gateway.mk
@@ -6,7 +6,7 @@
JANUS_GATEWAY_VERSION = v0.2.2
JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,$(JANUS_GATEWAY_VERSION))
-JANUS_GATEWAY_LICENSE = GPLv3
+JANUS_GATEWAY_LICENSE = GPL-3.0
JANUS_GATEWAY_LICENSE_FILES = COPYING
# ding-libs provides the ini_config library
diff --git a/package/kodi-adsp-basic/kodi-adsp-basic.mk b/package/kodi-adsp-basic/kodi-adsp-basic.mk
index 0b1ba95..f51594e 100644
--- a/package/kodi-adsp-basic/kodi-adsp-basic.mk
+++ b/package/kodi-adsp-basic/kodi-adsp-basic.mk
@@ -6,7 +6,7 @@
KODI_ADSP_BASIC_VERSION = cb56e0eb6530fd50a286d47ef0be529001e9d556
KODI_ADSP_BASIC_SITE = $(call github,kodi-adsp,adsp.basic,$(KODI_ADSP_BASIC_VERSION))
-KODI_ADSP_BASIC_LICENSE = GPLv3+
+KODI_ADSP_BASIC_LICENSE = GPL-3.0+
KODI_ADSP_BASIC_LICENSE_FILES = LICENSE.md
KODI_ADSP_BASIC_DEPENDENCIES = libplatform kodi-platform
diff --git a/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk b/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk
index 49cf673..c387d89 100644
--- a/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk
+++ b/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk
@@ -6,7 +6,7 @@
KODI_ADSP_FREESURROUND_VERSION = 08b691d3d9a0382d2f6f789a31614fb02512036c
KODI_ADSP_FREESURROUND_SITE = $(call github,kodi-adsp,adsp.freesurround,$(KODI_ADSP_FREESURROUND_VERSION))
-KODI_ADSP_FREESURROUND_LICENSE = GPLv3+
+KODI_ADSP_FREESURROUND_LICENSE = GPL-3.0+
KODI_ADSP_FREESURROUND_LICENSE_FILES = LICENSE.md
KODI_ADSP_FREESURROUND_DEPENDENCIES = libplatform kodi-platform
diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
index 7df6c22..2cd94da 100644
--- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
+++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
@@ -6,7 +6,7 @@
KODI_SCREENSAVER_RSXS_VERSION = 195e0ec3fbbcb2ee2012cd560e42d05167f0f259
KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION))
-KODI_SCREENSAVER_RSXS_LICENSE = GPLv3
+KODI_SCREENSAVER_RSXS_LICENSE = GPL-3.0
KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING
KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi xlib_libXmu
diff --git a/package/lensfun/lensfun.mk b/package/lensfun/lensfun.mk
index 8e92e59..c2b7ea4 100644
--- a/package/lensfun/lensfun.mk
+++ b/package/lensfun/lensfun.mk
@@ -6,7 +6,7 @@
LENSFUN_VERSION = 0.3.2
LENSFUN_SITE = https://sourceforge.net/projects/lensfun/files/$(LENSFUN_VERSION)
-LENSFUN_LICENSE = LGPLv3+ (libraries), GPLv3+ (programs)
+LENSFUN_LICENSE = LGPLv3+ (libraries), GPL-3.0+ (programs)
LENSFUN_LICENSE_FILES = docs/gpl-3.0.txt docs/lgpl-3.0.txt
LENSFUN_INSTALL_STAGING = YES
LENSFUN_DEPENDENCIES = libglib2
diff --git a/package/less/less.mk b/package/less/less.mk
index c217543..2102d3c 100644
--- a/package/less/less.mk
+++ b/package/less/less.mk
@@ -6,7 +6,7 @@
LESS_VERSION = 481
LESS_SITE = $(BR2_GNU_MIRROR)/less
-LESS_LICENSE = GPLv3+
+LESS_LICENSE = GPL-3.0+
LESS_LICENSE_FILES = COPYING
# Build after busybox, full-blown is better
LESS_DEPENDENCIES = ncurses $(if $(BR2_PACKAGE_BUSYBOX),busybox)
diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk
index a7e1f92..e658d59 100644
--- a/package/lftp/lftp.mk
+++ b/package/lftp/lftp.mk
@@ -7,7 +7,7 @@
LFTP_VERSION = 4.7.4
LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz
LFTP_SITE = http://lftp.yar.ru/ftp
-LFTP_LICENSE = GPLv3+
+LFTP_LICENSE = GPL-3.0+
LFTP_LICENSE_FILES = COPYING
# Needed so that our libtool patch applies properly, and for patch
# 0001-fix-static-link-with-readline.patch.
diff --git a/package/libasplib/libasplib.mk b/package/libasplib/libasplib.mk
index 558d173..e13945c 100644
--- a/package/libasplib/libasplib.mk
+++ b/package/libasplib/libasplib.mk
@@ -6,7 +6,7 @@
LIBASPLIB_VERSION = be7fac89218a84b75f7598e3d76625ece99296f2
LIBASPLIB_SITE = $(call github,AchimTuran,asplib,$(LIBASPLIB_VERSION))
-LIBASPLIB_LICENSE = GPLv3+
+LIBASPLIB_LICENSE = GPL-3.0+
LIBASPLIB_LICENSE_FILES = LICENSE
LIBASPLIB_INSTALL_STAGING = YES
diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk
index c4d2e4f..8c74e2b 100644
--- a/package/libassuan/libassuan.mk
+++ b/package/libassuan/libassuan.mk
@@ -7,7 +7,7 @@
LIBASSUAN_VERSION = 2.4.3
LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan
LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2
-LIBASSUAN_LICENSE = LGPLv2.1+ (library), GPLv3 (tests, doc)
+LIBASSUAN_LICENSE = LGPLv2.1+ (library), GPL-3.0 (tests, doc)
LIBASSUAN_LICENSE_FILES = COPYING.LIB COPYING
LIBASSUAN_INSTALL_STAGING = YES
LIBASSUAN_DEPENDENCIES = libgpg-error
diff --git a/package/libcdio/libcdio.mk b/package/libcdio/libcdio.mk
index 4a7c674..f0fc335 100644
--- a/package/libcdio/libcdio.mk
+++ b/package/libcdio/libcdio.mk
@@ -7,7 +7,7 @@
LIBCDIO_VERSION = 0.94
LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio
LIBCDIO_INSTALL_STAGING = YES
-LIBCDIO_LICENSE = GPLv3+
+LIBCDIO_LICENSE = GPL-3.0+
LIBCDIO_LICENSE_FILES = COPYING
LIBCDIO_CONF_OPTS = --disable-example-progs --disable-cddb
diff --git a/package/libfreeimage/libfreeimage.mk b/package/libfreeimage/libfreeimage.mk
index e6790b1..cd73f5a 100644
--- a/package/libfreeimage/libfreeimage.mk
+++ b/package/libfreeimage/libfreeimage.mk
@@ -7,7 +7,7 @@
LIBFREEIMAGE_VERSION = 3.17.0
LIBFREEIMAGE_SITE = http://downloads.sourceforge.net/freeimage
LIBFREEIMAGE_SOURCE = FreeImage$(subst .,,$(LIBFREEIMAGE_VERSION)).zip
-LIBFREEIMAGE_LICENSE = GPL-2.0 or GPLv3 or FreeImage Public License
+LIBFREEIMAGE_LICENSE = GPL-2.0 or GPL-3.0 or FreeImage Public License
LIBFREEIMAGE_LICENSE_FILES = license-gplv2.txt license-gplv3.txt license-fi.txt
LIBFREEIMAGE_INSTALL_STAGING = YES
diff --git a/package/libgpiod/libgpiod.mk b/package/libgpiod/libgpiod.mk
index bc9c6ec..0947a4a 100644
--- a/package/libgpiod/libgpiod.mk
+++ b/package/libgpiod/libgpiod.mk
@@ -6,7 +6,7 @@
LIBGPIOD_VERSION = v0.1.3
LIBGPIOD_SITE = $(call github,brgl,libgpiod,$(LIBGPIOD_VERSION))
-LIBGPIOD_LICENSE = GPLv3+
+LIBGPIOD_LICENSE = GPL-3.0+
LIBGPIOD_LICENSE_FILES = COPYING
# fetched from github, no configure script provided
LIBGPIOD_AUTORECONF = YES
diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk
index 00ce8e0..057138d 100644
--- a/package/libgsasl/libgsasl.mk
+++ b/package/libgsasl/libgsasl.mk
@@ -6,7 +6,7 @@
LIBGSASL_VERSION = 1.8.0
LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl
-LIBGSASL_LICENSE = LGPLv2.1+ (library), GPLv3+ (programs)
+LIBGSASL_LICENSE = LGPLv2.1+ (library), GPL-3.0+ (programs)
LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING
LIBGSASL_INSTALL_STAGING = YES
# It doesn't seem to build with our libgcrypt so better be safe
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index f014da0..26fa154 100644
--- a/package/libiconv/libiconv.mk
+++ b/package/libiconv/libiconv.mk
@@ -7,7 +7,7 @@
LIBICONV_VERSION = 1.14
LIBICONV_SITE = $(BR2_GNU_MIRROR)/libiconv
LIBICONV_INSTALL_STAGING = YES
-LIBICONV_LICENSE = GPLv3+ (iconv program), LGPLv2+ (library)
+LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPLv2+ (library)
LIBICONV_LICENSE_FILES = COPYING COPYING.LIB
# Don't build the preloadable library, as we don't need it (it's only
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index d348665..8145e08 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -10,7 +10,7 @@ LIBIDN_INSTALL_STAGING = YES
LIBIDN_CONF_ENV = EMACS="no"
LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no
LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-LIBIDN_LICENSE = GPL-2.0+, GPLv3+, LGPLv3+
+LIBIDN_LICENSE = GPL-2.0+, GPL-3.0+, LGPLv3+
LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3
define LIBIDN_REMOVE_BINARY
diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk
index 58d0ff3..1a72cfd 100644
--- a/package/libksba/libksba.mk
+++ b/package/libksba/libksba.mk
@@ -7,7 +7,7 @@
LIBKSBA_VERSION = 1.3.5
LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2
LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba
-LIBKSBA_LICENSE = LGPLv3+ or GPL-2.0+ (library, headers), GPLv3+ (manual, tests, build system)
+LIBKSBA_LICENSE = LGPLv3+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system)
LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
LIBKSBA_INSTALL_STAGING = YES
LIBKSBA_DEPENDENCIES = libgpg-error
diff --git a/package/libllcp/libllcp.mk b/package/libllcp/libllcp.mk
index 2c2014a..ad4fca6 100644
--- a/package/libllcp/libllcp.mk
+++ b/package/libllcp/libllcp.mk
@@ -10,7 +10,7 @@ LIBLLCP_DEPENDENCIES = host-pkgconf libnfc
# There's no ./configure in the repository, so we need to autoreconf
LIBLLCP_AUTORECONF = YES
LIBLLCP_INSTALL_STAGING = YES
-LIBLLCP_LICENSE = GPLv3+
+LIBLLCP_LICENSE = GPL-3.0+
LIBLLCP_LICENSE_FILES = COPYING
# ensure graphviz isn't used
LIBLLCP_CONF_ENV = ac_cv_path_DOT=
diff --git a/package/libsigrok/libsigrok.mk b/package/libsigrok/libsigrok.mk
index e4e079d..9137165 100644
--- a/package/libsigrok/libsigrok.mk
+++ b/package/libsigrok/libsigrok.mk
@@ -6,7 +6,7 @@
LIBSIGROK_VERSION = 0.4.0
LIBSIGROK_SITE = http://sigrok.org/download/source/libsigrok
-LIBSIGROK_LICENSE = GPLv3+
+LIBSIGROK_LICENSE = GPL-3.0+
LIBSIGROK_LICENSE_FILES = COPYING
LIBSIGROK_INSTALL_STAGING = YES
LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf
diff --git a/package/libsigrokdecode/libsigrokdecode.mk b/package/libsigrokdecode/libsigrokdecode.mk
index 7006b0c..ac53e7e 100644
--- a/package/libsigrokdecode/libsigrokdecode.mk
+++ b/package/libsigrokdecode/libsigrokdecode.mk
@@ -6,7 +6,7 @@
LIBSIGROKDECODE_VERSION = 0.4.1
LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode
-LIBSIGROKDECODE_LICENSE = GPLv3+
+LIBSIGROKDECODE_LICENSE = GPL-3.0+
LIBSIGROKDECODE_LICENSE_FILES = COPYING
LIBSIGROKDECODE_INSTALL_STAGING = YES
LIBSIGROKDECODE_DEPENDENCIES = host-pkgconf libglib2 python3
diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk
index 60e29d3..0dd7c89 100644
--- a/package/libstrophe/libstrophe.mk
+++ b/package/libstrophe/libstrophe.mk
@@ -9,7 +9,7 @@ LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION))
LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf
# Doesn't ship configure
LIBSTROPHE_AUTORECONF = YES
-LIBSTROPHE_LICENSE = MIT or GPLv3
+LIBSTROPHE_LICENSE = MIT or GPL-3.0
LIBSTROPHE_LICENSE_FILES = MIT-LICENSE.txt GPL-LICENSE.txt
LIBSTROPHE_INSTALL_STAGING = YES
LIBSTROPHE_PATCH = https://github.com/msantos/libstrophe/commit/b08766c8e46956daba010044b00c97f78b598780.patch
diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk
index ac99868..f471a51 100644
--- a/package/libtasn1/libtasn1.mk
+++ b/package/libtasn1/libtasn1.mk
@@ -7,7 +7,7 @@
LIBTASN1_VERSION = 4.9
LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1
LIBTASN1_DEPENDENCIES = host-bison
-LIBTASN1_LICENSE = GPLv3+ (tests, tools), LGPLv2.1+ (library)
+LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPLv2.1+ (library)
LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB
LIBTASN1_INSTALL_STAGING = YES
# 'missing' fallback logic botched so disable it completely
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index 9092c79..da2ba35 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -7,7 +7,7 @@
LIBURCU_VERSION = 0.9.2
LIBURCU_SITE = http://lttng.org/files/urcu
LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
-LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPLv3 (few *.m4 files)
+LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files)
LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE
LIBURCU_INSTALL_STAGING = YES
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index d53f7cb..849e7f4 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -7,7 +7,7 @@
M4_VERSION = 1.4.18
M4_SOURCE = m4-$(M4_VERSION).tar.xz
M4_SITE = $(BR2_GNU_MIRROR)/m4
-M4_LICENSE = GPLv3+
+M4_LICENSE = GPL-3.0+
M4_LICENSE_FILES = COPYING
HOST_M4_CONF_OPTS = --disable-static
diff --git a/package/make/make.mk b/package/make/make.mk
index c51ce3b..41a7023 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -8,7 +8,7 @@ MAKE_VERSION = 4.2.1
MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
MAKE_SITE = $(BR2_GNU_MIRROR)/make
MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-MAKE_LICENSE = GPLv3+
+MAKE_LICENSE = GPL-3.0+
MAKE_LICENSE_FILES = COPYING
MAKE_CONF_OPTS = --without-guile
diff --git a/package/mc/mc.mk b/package/mc/mc.mk
index ff4c8ad..8139648 100644
--- a/package/mc/mc.mk
+++ b/package/mc/mc.mk
@@ -7,7 +7,7 @@
MC_VERSION = 4.8.18
MC_SOURCE = mc-$(MC_VERSION).tar.xz
MC_SITE = http://ftp.midnight-commander.org
-MC_LICENSE = GPLv3+
+MC_LICENSE = GPL-3.0+
MC_LICENSE_FILES = COPYING
MC_DEPENDENCIES = libglib2 host-pkgconf
diff --git a/package/mcrypt/mcrypt.mk b/package/mcrypt/mcrypt.mk
index b413ffa..03a1719 100644
--- a/package/mcrypt/mcrypt.mk
+++ b/package/mcrypt/mcrypt.mk
@@ -11,7 +11,7 @@ MCRYPT_DEPENDENCIES = libmcrypt libmhash \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
MCRYPT_CONF_OPTS = --with-libmcrypt-prefix=$(STAGING_DIR)/usr
-MCRYPT_LICENSE = GPLv3
+MCRYPT_LICENSE = GPL-3.0
MCRYPT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/modplugtools/modplugtools.mk b/package/modplugtools/modplugtools.mk
index e8d73af..59a2a52 100644
--- a/package/modplugtools/modplugtools.mk
+++ b/package/modplugtools/modplugtools.mk
@@ -6,7 +6,7 @@
MODPLUGTOOLS_VERSION = 0.5.3
MODPLUGTOOLS_SITE = http://downloads.sourceforge.net/project/modplug-xmms/modplug-tools
-MODPLUGTOOLS_LICENSE = GPLv3
+MODPLUGTOOLS_LICENSE = GPL-3.0
MODPLUGTOOLS_LICENSE_FILES = COPYING
MODPLUGTOOLS_DEPENDENCIES = libao libmodplug
diff --git a/package/mosh/mosh.mk b/package/mosh/mosh.mk
index 2cd358b..0da9105 100644
--- a/package/mosh/mosh.mk
+++ b/package/mosh/mosh.mk
@@ -7,7 +7,7 @@
MOSH_VERSION = 1.2.6
MOSH_SITE = https://mosh.mit.edu
MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf
-MOSH_LICENSE = GPLv3+ with exception
+MOSH_LICENSE = GPL-3.0+ with exception
MOSH_LICENSE_FILES = COPYING COPYING.iOS
ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk
index 7ede66c..1821d39 100644
--- a/package/msmtp/msmtp.mk
+++ b/package/msmtp/msmtp.mk
@@ -12,7 +12,7 @@ MSMTP_CONF_OPTS = \
--without-libidn \
--disable-gai-idn \
--without-libgsasl
-MSMTP_LICENSE = GPLv3+
+MSMTP_LICENSE = GPL-3.0+
MSMTP_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBSECRET),y)
diff --git a/package/mtdev2tuio/mtdev2tuio.mk b/package/mtdev2tuio/mtdev2tuio.mk
index d2e7040..e9085b0 100644
--- a/package/mtdev2tuio/mtdev2tuio.mk
+++ b/package/mtdev2tuio/mtdev2tuio.mk
@@ -7,7 +7,7 @@
MTDEV2TUIO_VERSION = e1e7378d86abe751158e743586133022f32fa4d1
MTDEV2TUIO_SITE = $(call github,olivopaolo,mtdev2tuio,$(MTDEV2TUIO_VERSION))
MTDEV2TUIO_DEPENDENCIES = mtdev liblo
-MTDEV2TUIO_LICENSE = GPLv3+
+MTDEV2TUIO_LICENSE = GPL-3.0+
MTDEV2TUIO_LICENSE_FILES = COPYING
# mtdev2tuio Makefile misuses $(LD) as gcc, so we need to override LD
diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk
index adba1fc..5db548f 100644
--- a/package/mtools/mtools.mk
+++ b/package/mtools/mtools.mk
@@ -7,7 +7,7 @@
MTOOLS_VERSION = 4.0.18
MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.bz2
MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools
-MTOOLS_LICENSE = GPLv3+
+MTOOLS_LICENSE = GPL-3.0+
MTOOLS_LICENSE_FILES = COPYING
MTOOLS_CONF_OPTS = --without-x
# info documentation not needed
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
index 4632bed..c20e231 100644
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -8,7 +8,7 @@ NANO_VERSION_MAJOR = 2.7
NANO_VERSION = $(NANO_VERSION_MAJOR).4
NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR)
NANO_SOURCE = nano-$(NANO_VERSION).tar.xz
-NANO_LICENSE = GPLv3+
+NANO_LICENSE = GPL-3.0+
NANO_LICENSE_FILES = COPYING
NANO_CONF_OPTS = \
--without-slang \
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
index 4797a8e..8326fc7 100644
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -9,7 +9,7 @@ NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2
NDISC6_SITE = http://www.remlab.net/files/ndisc6
NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
NDISC6_CONF_OPTS = --disable-rpath --disable-suid-install
-NDISC6_LICENSE = GPL-2.0 or GPLv3
+NDISC6_LICENSE = GPL-2.0 or GPL-3.0
NDISC6_LICENSE_FILES = COPYING
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
diff --git a/package/nmon/nmon.mk b/package/nmon/nmon.mk
index 9b9f889..2c1ff02 100644
--- a/package/nmon/nmon.mk
+++ b/package/nmon/nmon.mk
@@ -7,7 +7,7 @@
NMON_VERSION = 16f
NMON_SITE = http://sourceforge.net/projects/nmon/files
NMON_SOURCE = lmon$(NMON_VERSION).c
-NMON_LICENSE = GPLv3+
+NMON_LICENSE = GPL-3.0+
NMON_LICENSE_FILES = $(NMON_SOURCE)
NMON_DEPENDENCIES = ncurses
NMON_CFLAGS = $(TARGET_CFLAGS) -D JFS -D GETUSER -D LARGEMEM -D DEBIAN
diff --git a/package/nut/nut.mk b/package/nut/nut.mk
index 8cd4184..332ccf9 100644
--- a/package/nut/nut.mk
+++ b/package/nut/nut.mk
@@ -7,7 +7,7 @@
NUT_VERSION_MAJOR = 2.7
NUT_VERSION = $(NUT_VERSION_MAJOR).4
NUT_SITE = http://www.networkupstools.org/source/$(NUT_VERSION_MAJOR)
-NUT_LICENSE = GPL-2.0+, GPLv3+ (python scripts), GPL/Artistic (perl client)
+NUT_LICENSE = GPL-2.0+, GPL-3.0+ (python scripts), GPL/Artistic (perl client)
NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3
NUT_DEPENDENCIES = host-pkgconf
diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk
index 54b607c..3a858ef 100644
--- a/package/ocrad/ocrad.mk
+++ b/package/ocrad/ocrad.mk
@@ -7,7 +7,7 @@
OCRAD_VERSION = 0.25
OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz
OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad
-OCRAD_LICENSE = GPLv3+
+OCRAD_LICENSE = GPL-3.0+
OCRAD_LICENSE_FILES = COPYING
OCRAD_INSTALL_STAGING = YES
diff --git a/package/openzwave/openzwave.mk b/package/openzwave/openzwave.mk
index 199d9e1..5f480e9 100644
--- a/package/openzwave/openzwave.mk
+++ b/package/openzwave/openzwave.mk
@@ -6,7 +6,7 @@
OPENZWAVE_VERSION = V1.5
OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION))
-OPENZWAVE_LICENSE = LGPLv3+, GPLv3 (examples), Apache-2.0 (sh2ju.sh)
+OPENZWAVE_LICENSE = LGPLv3+, GPL-3.0 (examples), Apache-2.0 (sh2ju.sh)
OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \
license/gpl.txt license/Apache-License-2.0.txt
diff --git a/package/parted/parted.mk b/package/parted/parted.mk
index dc7ff2b..f88143b 100644
--- a/package/parted/parted.mk
+++ b/package/parted/parted.mk
@@ -12,7 +12,7 @@ PARTED_INSTALL_STAGING = YES
# For uclinux patch
PARTED_AUTORECONF = YES
PARTED_GETTEXTIZE = YES
-PARTED_LICENSE = GPLv3+
+PARTED_LICENSE = GPL-3.0+
PARTED_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_READLINE),y)
diff --git a/package/patch/patch.mk b/package/patch/patch.mk
index 3a94252..4c76a31 100644
--- a/package/patch/patch.mk
+++ b/package/patch/patch.mk
@@ -7,7 +7,7 @@
PATCH_VERSION = 2.7.5
PATCH_SOURCE = patch-$(PATCH_VERSION).tar.xz
PATCH_SITE = $(BR2_GNU_MIRROR)/patch
-PATCH_LICENSE = GPLv3+
+PATCH_LICENSE = GPL-3.0+
PATCH_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_ATTR),y)
diff --git a/package/patchelf/patchelf.mk b/package/patchelf/patchelf.mk
index cf2e43a..74e6ccc 100644
--- a/package/patchelf/patchelf.mk
+++ b/package/patchelf/patchelf.mk
@@ -7,7 +7,7 @@
PATCHELF_VERSION = 0.9
PATCHELF_SITE = http://releases.nixos.org/patchelf/patchelf-$(PATCHELF_VERSION)
PATCHELF_SOURCE = patchelf-$(PATCHELF_VERSION).tar.bz2
-PATCHELF_LICENSE = GPLv3+
+PATCHELF_LICENSE = GPL-3.0+
PATCHELF_LICENSE_FILES = COPYING
$(eval $(host-autotools-package))
diff --git a/package/pifmrds/pifmrds.mk b/package/pifmrds/pifmrds.mk
index a30c013..509ec80 100644
--- a/package/pifmrds/pifmrds.mk
+++ b/package/pifmrds/pifmrds.mk
@@ -7,7 +7,7 @@
PIFMRDS_VERSION = 0bf57f9ce0d954365a38d8af8e7be6f28521c3f2
PIFMRDS_SITE = $(call github,ChristopheJacquet,PiFmRds,$(PIFMRDS_VERSION))
PIFMRDS_DEPENDENCIES = libsndfile
-PIFMRDS_LICENSE = GPLv3+
+PIFMRDS_LICENSE = GPL-3.0+
PIFMRDS_LICENSE_FILES = LICENSE
define PIFMRDS_BUILD_CMDS
diff --git a/package/pound/pound.mk b/package/pound/pound.mk
index 4086642..6f7cc84 100644
--- a/package/pound/pound.mk
+++ b/package/pound/pound.mk
@@ -7,7 +7,7 @@
POUND_VERSION = 2.7
POUND_SITE = http://www.apsis.ch/pound
POUND_SOURCE = Pound-$(POUND_VERSION).tgz
-POUND_LICENSE = GPLv3+
+POUND_LICENSE = GPL-3.0+
POUND_LICENSE_FILES = GPL.txt
POUND_DEPENDENCIES = openssl
diff --git a/package/pulseview/pulseview.mk b/package/pulseview/pulseview.mk
index cc97187..fbcf451 100644
--- a/package/pulseview/pulseview.mk
+++ b/package/pulseview/pulseview.mk
@@ -8,7 +8,7 @@
PULSEVIEW_VERSION = 0.3.0
PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview
-PULSEVIEW_LICENSE = GPLv3+
+PULSEVIEW_LICENSE = GPL-3.0+
PULSEVIEW_LICENSE_FILES = COPYING
PULSEVIEW_DEPENDENCIES = libsigrok qt5base qt5svg boost
PULSEVIEW_CONF_OPTS = -DDISABLE_WERROR=TRUE
diff --git a/package/python-daemon/python-daemon.mk b/package/python-daemon/python-daemon.mk
index 648d549..76820b7 100644
--- a/package/python-daemon/python-daemon.mk
+++ b/package/python-daemon/python-daemon.mk
@@ -6,7 +6,7 @@
PYTHON_DAEMON_VERSION = 2.1.1
PYTHON_DAEMON_SITE = https://pypi.python.org/packages/source/p/python-daemon
-PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPLv3+ (test, build)
+PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPL-3.0+ (test, build)
PYTHON_DAEMON_LICENSE_FILES = LICENSE.ASF-2 LICENSE.GPL-3
PYTHON_DAEMON_SETUP_TYPE = setuptools
PYTHON_DAEMON_DEPENDENCIES = host-python-docutils
diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk
index 070d805..544165a 100644
--- a/package/python-docutils/python-docutils.mk
+++ b/package/python-docutils/python-docutils.mk
@@ -7,7 +7,7 @@
PYTHON_DOCUTILS_VERSION = 0.13.1
PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz
PYTHON_DOCUTILS_SITE = https://pypi.python.org/packages/05/25/7b5484aca5d46915493f1fd4ecb63c38c333bd32aa9ad6e19da8d08895ae
-PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2c, GPLv3 (emacs mode), other
+PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2c, GPL-3.0 (emacs mode), other
PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt
PYTHON_DOCUTILS_SETUP_TYPE = distutils
diff --git a/package/python-enum/python-enum.mk b/package/python-enum/python-enum.mk
index aac9328..ea602e4 100644
--- a/package/python-enum/python-enum.mk
+++ b/package/python-enum/python-enum.mk
@@ -8,7 +8,7 @@ PYTHON_ENUM_VERSION = 0.4.6
PYTHON_ENUM_SOURCE = enum-$(PYTHON_ENUM_VERSION).tar.gz
PYTHON_ENUM_SITE = https://pypi.python.org/packages/0c/4e/1ea357e7783c756bb579333c1e4a026fb331371ee771f616ffedc781e531
PYTHON_ENUM_SETUP_TYPE = setuptools
-PYTHON_ENUM_LICENSE = GPLv3+
+PYTHON_ENUM_LICENSE = GPL-3.0+
PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL-3
$(eval $(python-package))
diff --git a/package/python-mwscrape2slob/python-mwscrape2slob.mk b/package/python-mwscrape2slob/python-mwscrape2slob.mk
index 4d27d8d..519f5e5 100644
--- a/package/python-mwscrape2slob/python-mwscrape2slob.mk
+++ b/package/python-mwscrape2slob/python-mwscrape2slob.mk
@@ -6,7 +6,7 @@
PYTHON_MWSCRAPE2SLOB_VERSION = 0f9124ed62009dff6a230947d80340f5a61a6f49
PYTHON_MWSCRAPE2SLOB_SITE = $(call github,itkach,mwscrape2slob,$(PYTHON_MWSCRAPE2SLOB_VERSION))
-PYTHON_MWSCRAPE2SLOB_LICENSE = GPLv3, Apache-2.0 (MathJax), GPL (MediaWiki monobook style sheet)
+PYTHON_MWSCRAPE2SLOB_LICENSE = GPL-3.0, Apache-2.0 (MathJax), GPL (MediaWiki monobook style sheet)
PYTHON_MWSCRAPE2SLOB_SETUP_TYPE = distutils
$(eval $(python-package))
diff --git a/package/python-networkmanager/python-networkmanager.mk b/package/python-networkmanager/python-networkmanager.mk
index 875748f..d0e4011 100644
--- a/package/python-networkmanager/python-networkmanager.mk
+++ b/package/python-networkmanager/python-networkmanager.mk
@@ -7,7 +7,7 @@
PYTHON_NETWORKMANAGER_VERSION = 1.2.1
PYTHON_NETWORKMANAGER_SITE = https://pypi.python.org/packages/e7/b1/09993250ceea9e03bc65fbabcd5286540200292c011b22237b2963c11471
PYTHON_NETWORKMANAGER_SETUP_TYPE = distutils
-PYTHON_NETWORKMANAGER_LICENSE = GPLv3+
+PYTHON_NETWORKMANAGER_LICENSE = GPL-3.0+
PYTHON_NETWORKMANAGER_LICENSE_FILES = COPYING
PYTHON_NETWORKMANAGER_DEPENDENCIES = dbus-python
diff --git a/package/python-pyqt/python-pyqt.mk b/package/python-pyqt/python-pyqt.mk
index f689be6..ab658e9 100644
--- a/package/python-pyqt/python-pyqt.mk
+++ b/package/python-pyqt/python-pyqt.mk
@@ -7,7 +7,7 @@
PYTHON_PYQT_VERSION = 4.11.3
PYTHON_PYQT_SOURCE = PyQt-x11-gpl-$(PYTHON_PYQT_VERSION).tar.gz
PYTHON_PYQT_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt4/PyQt-$(PYTHON_PYQT_VERSION)
-PYTHON_PYQT_LICENSE = GPL-2.0 or GPLv3
+PYTHON_PYQT_LICENSE = GPL-2.0 or GPL-3.0
PYTHON_PYQT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3
PYTHON_PYQT_DEPENDENCIES = python-sip host-python-sip qt
diff --git a/package/python-pyqt5/python-pyqt5.mk b/package/python-pyqt5/python-pyqt5.mk
index e58ee5a..965c2d8 100644
--- a/package/python-pyqt5/python-pyqt5.mk
+++ b/package/python-pyqt5/python-pyqt5.mk
@@ -7,7 +7,7 @@
PYTHON_PYQT5_VERSION = 5.7
PYTHON_PYQT5_SOURCE = PyQt5_gpl-$(PYTHON_PYQT5_VERSION).tar.gz
PYTHON_PYQT5_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$(PYTHON_PYQT5_VERSION)
-PYTHON_PYQT5_LICENSE = GPLv3
+PYTHON_PYQT5_LICENSE = GPL-3.0
PYTHON_PYQT5_LICENSE_FILES = LICENSE
PYTHON_PYQT5_DEPENDENCIES = python-sip host-python-sip qt5base
diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk
index 60adec2..1d84e83 100644
--- a/package/python-sip/python-sip.mk
+++ b/package/python-sip/python-sip.mk
@@ -7,7 +7,7 @@
PYTHON_SIP_VERSION = 4.18
PYTHON_SIP_SOURCE = sip-$(PYTHON_SIP_VERSION).tar.gz
PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON_SIP_VERSION)
-PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPLv3
+PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0
PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3
ifeq ($(BR2_PACKAGE_QT5),y)
diff --git a/package/python-slob/python-slob.mk b/package/python-slob/python-slob.mk
index 474c0c9..2db3932 100644
--- a/package/python-slob/python-slob.mk
+++ b/package/python-slob/python-slob.mk
@@ -6,7 +6,7 @@
PYTHON_SLOB_VERSION = 31ad0e769360a5b10a4893f686587bb8e48c3895
PYTHON_SLOB_SITE = $(call github,itkach,slob,$(PYTHON_SLOB_VERSION))
-PYTHON_SLOB_LICENSE = GPLv3
+PYTHON_SLOB_LICENSE = GPL-3.0
PYTHON_SLOB_LICENSE_FILES = LICENSE
PYTHON_SLOB_SETUP_TYPE = distutils
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 1faab74..68d407e 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -21,7 +21,7 @@ QT_PATCH = https://github.com/qtproject/qtbase/commit/b8f98d956501dfa4ce03a137f1
QT_DEPENDENCIES = host-pkgconf
QT_INSTALL_STAGING = YES
-QT_LICENSE := LGPLv2.1 with exceptions or GPLv3
+QT_LICENSE := LGPLv2.1 with exceptions or GPL-3.0
ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
QT_LICENSE := $(QT_LICENSE) or Digia Qt Commercial license
endif
diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
index 77e9c53..8cac2d2 100644
--- a/package/qt5/qt53d/qt53d.mk
+++ b/package/qt5/qt53d/qt53d.mk
@@ -15,7 +15,7 @@ QT53D_DEPENDENCIES += assimp
endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT53D_LICENSE = GPL-2.0 or GPLv3 or LGPLv3
+QT53D_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv3
QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3
else
QT53D_LICENSE = Commercial license
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index b1fd6fb..a8e044a 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -50,10 +50,10 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5BASE_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5BASE_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5BASE_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk
index 7a35a76..cbdbf80 100644
--- a/package/qt5/qt5canvas3d/qt5canvas3d.mk
+++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk
@@ -11,7 +11,7 @@ QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative
QT5CANVAS3D_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5CANVAS3D_LICENSE = GPL-2.0 or GPLv3 or LGPLv3
+QT5CANVAS3D_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv3
QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
else
QT5CANVAS3D_LICENSE = Commercial license
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index f0e1e4d..08eda9f 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -12,10 +12,10 @@ QT5CONNECTIVITY_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 66a2696..63a5a63 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -12,10 +12,10 @@ QT5DECLARATIVE_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk
index dad7889..c39b953 100644
--- a/package/qt5/qt5enginio/qt5enginio.mk
+++ b/package/qt5/qt5enginio/qt5enginio.mk
@@ -13,7 +13,7 @@ QT5ENGINIO_DEPENDENCIES = openssl qt5base
QT5ENGINIO_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5ENGINIO_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5ENGINIO_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3c (examples)
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index 76d9ddc..78aa570 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -12,10 +12,10 @@ QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 802a3f4..afc7a45 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -12,10 +12,10 @@ QT5IMAGEFORMATS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index f6f413c..da55f64 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -12,10 +12,10 @@ QT5LOCATION_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5LOCATION_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5LOCATION_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 638133d..012ce1f 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -12,10 +12,10 @@ QT5MULTIMEDIA_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5MULTIMEDIA_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 0a1d632..0653ef6 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -11,7 +11,7 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv3, GFDLv1.3 (docs)
QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5QUICKCONTROLS_LICENSE = Commercial license
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index f6aca2c..1b33623 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -11,7 +11,7 @@ QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS2_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS2_LICENSE = GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPLv3, GFDLv1.3 (docs)
QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5QUICKCONTROLS2_LICENSE = Commercial license
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index 57ba6f0..43971c7 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -11,7 +11,7 @@ QT5SCRIPT_DEPENDENCIES = qt5base
QT5SCRIPT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SCRIPT_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SCRIPT_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
else
QT5SCRIPT_LICENSE = Commercial license
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index 00c0ac0..b89149c 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -12,10 +12,10 @@ QT5SENSORS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SENSORS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5SENSORS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SENSORS_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
index 636b529..0386b63 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.mk
+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -11,7 +11,7 @@ QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport
QT5SERIALBUS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SERIALBUS_LICENSE = GPL-2.0 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv3, GFDLv1.3 (docs)
QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5SERIALBUS_LICENSE = Commercial license
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index b0f0cec..d81af17 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -12,10 +12,10 @@ QT5SERIALPORT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SERIALPORT_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index e946a67..787c4aa 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -12,10 +12,10 @@ QT5SVG_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SVG_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5SVG_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SVG_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SVG_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index 1f02eb2..6a843fa 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -21,10 +21,10 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5TOOLS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5TOOLS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
-QT5TOOLS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5TOOLS_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 1d10a5c..93d3ed6 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -12,10 +12,10 @@ QT5WEBCHANNEL_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index 972fa73..be0fc87 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -12,10 +12,10 @@ QT5WEBSOCKETS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools)
+QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools)
QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3
else
-QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3
+QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3
QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index d3d409e..119d15e 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -12,10 +12,10 @@ QT5X11EXTRAS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5X11EXTRAS_LICENSE = GPL-2.0 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index d33d180..bb2f4ed 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -12,10 +12,10 @@ QT5XMLPATTERNS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5XMLPATTERNS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk
index 6238b50..6b90a2c 100644
--- a/package/qtuio/qtuio.mk
+++ b/package/qtuio/qtuio.mk
@@ -9,7 +9,7 @@ QTUIO_SITE = $(call github,x29a,qTUIO,$(QTUIO_VERSION))
QTUIO_INSTALL_STAGING = YES
QTUIO_DEPENDENCIES = qt
-QTUIO_LICENSE = GPLv3+
+QTUIO_LICENSE = GPL-3.0+
QTUIO_LICENSE_FILES = COPYING
# The pong example needs QtOpenGL support, which might become available
diff --git a/package/ranger/ranger.mk b/package/ranger/ranger.mk
index fd6809a..aaca438 100644
--- a/package/ranger/ranger.mk
+++ b/package/ranger/ranger.mk
@@ -7,7 +7,7 @@
RANGER_VERSION = 1.7.2
RANGER_SITE = http://ranger.nongnu.org
RANGER_SETUP_TYPE = distutils
-RANGER_LICENSE = GPLv3
+RANGER_LICENSE = GPL-3.0
RANGER_LICENSE_FILES = AUTHORS
# The ranger script request python to be called with -O (optimize generated
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
index 79187b5..da8a80e 100644
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -11,7 +11,7 @@ RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \
$(if $(BR2_PACKAGE_LIBAO),libao) \
$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate)
RDESKTOP_CONF_OPTS = --with-openssl=$(STAGING_DIR)/usr --disable-credssp
-RDESKTOP_LICENSE = GPLv3+
+RDESKTOP_LICENSE = GPL-3.0+
RDESKTOP_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_PCSC_LITE),y)
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index ed4e144..cc5d4f2 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -11,7 +11,7 @@ READLINE_DEPENDENCIES = ncurses
HOST_READLINE_DEPENDENCIES = host-ncurses
READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \
bash_cv_wcwidth_broken=no
-READLINE_LICENSE = GPLv3+
+READLINE_LICENSE = GPL-3.0+
READLINE_LICENSE_FILES = COPYING
define READLINE_PURGE_EXAMPLES
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index e1e850c..e6b955a 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -6,7 +6,7 @@
RSYNC_VERSION = 3.1.2
RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
-RSYNC_LICENSE = GPLv3+
+RSYNC_LICENSE = GPL-3.0+
RSYNC_LICENSE_FILES = COPYING
RSYNC_DEPENDENCIES = zlib popt
RSYNC_CONF_OPTS = \
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 3254d99..6370726 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -6,7 +6,7 @@
RSYSLOG_VERSION = 8.22.0
RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog
-RSYSLOG_LICENSE = GPLv3, LGPLv3, Apache-2.0
+RSYSLOG_LICENSE = GPL-3.0, LGPLv3, Apache-2.0
RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf
RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk
index aa7cb57..130b661 100644
--- a/package/samba4/samba4.mk
+++ b/package/samba4/samba4.mk
@@ -8,7 +8,7 @@ SAMBA4_VERSION = 4.5.7
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
SAMBA4_INSTALL_STAGING = YES
-SAMBA4_LICENSE = GPLv3+
+SAMBA4_LICENSE = GPL-3.0+
SAMBA4_LICENSE_FILES = COPYING
SAMBA4_DEPENDENCIES = \
host-e2fsprogs host-heimdal host-python \
diff --git a/package/screen/screen.mk b/package/screen/screen.mk
index e67eb4a..f22f8a6 100644
--- a/package/screen/screen.mk
+++ b/package/screen/screen.mk
@@ -6,7 +6,7 @@
SCREEN_VERSION = 4.5.1
SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
-SCREEN_LICENSE = GPLv3+
+SCREEN_LICENSE = GPL-3.0+
SCREEN_LICENSE_FILES = COPYING
SCREEN_DEPENDENCIES = ncurses
SCREEN_AUTORECONF = YES
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index 68bcb98..28df140 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -7,7 +7,7 @@
SED_VERSION = 4.4
SED_SOURCE = sed-$(SED_VERSION).tar.xz
SED_SITE = $(BR2_GNU_MIRROR)/sed
-SED_LICENSE = GPLv3
+SED_LICENSE = GPL-3.0
SED_LICENSE_FILES = COPYING
SED_CONF_OPTS = \
diff --git a/package/sigrok-cli/sigrok-cli.mk b/package/sigrok-cli/sigrok-cli.mk
index ec5c8bd..3e2d1bf 100644
--- a/package/sigrok-cli/sigrok-cli.mk
+++ b/package/sigrok-cli/sigrok-cli.mk
@@ -6,7 +6,7 @@
SIGROK_CLI_VERSION = 0.6.0
SIGROK_CLI_SITE = http://sigrok.org/download/source/sigrok-cli
-SIGROK_CLI_LICENSE = GPLv3+
+SIGROK_CLI_LICENSE = GPL-3.0+
SIGROK_CLI_LICENSE_FILES = COPYING
SIGROK_CLI_DEPENDENCIES = host-pkgconf libsigrok
diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk
index 1e0e051..74b05b1 100644
--- a/package/sngrep/sngrep.mk
+++ b/package/sngrep/sngrep.mk
@@ -6,7 +6,7 @@
SNGREP_VERSION = v1.4.2
SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION))
-SNGREP_LICENSE = GPLv3+
+SNGREP_LICENSE = GPL-3.0+
SNGREP_LICENSE_FILES = LICENSE
SNGREP_AUTORECONF = YES
SNGREP_DEPENDENCIES = libpcap ncurses host-pkgconf
diff --git a/package/squeezelite/squeezelite.mk b/package/squeezelite/squeezelite.mk
index 7a82f4a..3b23b10 100644
--- a/package/squeezelite/squeezelite.mk
+++ b/package/squeezelite/squeezelite.mk
@@ -6,7 +6,7 @@
SQUEEZELITE_VERSION = v1.8
SQUEEZELITE_SITE = $(call github,robadenshi,squeezelite,$(SQUEEZELITE_VERSION))
-SQUEEZELITE_LICENSE = GPLv3
+SQUEEZELITE_LICENSE = GPL-3.0
SQUEEZELITE_LICENSE_FILES = LICENSE.txt
SQUEEZELITE_DEPENDENCIES = alsa-lib flac libmad libvorbis faad2 mpg123
SQUEEZELITE_MAKE_OPTS = -DLINKALL
diff --git a/package/supertuxkart/supertuxkart.mk b/package/supertuxkart/supertuxkart.mk
index 037c6f3..98b9ca4 100644
--- a/package/supertuxkart/supertuxkart.mk
+++ b/package/supertuxkart/supertuxkart.mk
@@ -11,7 +11,7 @@ SUPERTUXKART_SITE = http://downloads.sourceforge.net/project/supertuxkart/SuperT
# Supertuxkart itself is GPLv3+, but it bundles a few libraries with different
# licenses. Irrlicht, bullet and angelscript have zlib license, while glew is
# BSD-3c. Since they are linked statically, the result is GPLv3+.
-SUPERTUXKART_LICENSE = GPLv3+
+SUPERTUXKART_LICENSE = GPL-3.0+
SUPERTUXKART_LICENSE_FILES = COPYING
SUPERTUXKART_DEPENDENCIES = \
diff --git a/package/swig/swig.mk b/package/swig/swig.mk
index 8fed8da..95eaeac 100644
--- a/package/swig/swig.mk
+++ b/package/swig/swig.mk
@@ -12,7 +12,7 @@ HOST_SWIG_CONF_OPTS = \
--without-pcre \
--disable-ccache \
--without-octave
-SWIG_LICENSE = GPLv3+, BSD-2c, BSD-3c
+SWIG_LICENSE = GPL-3.0+, BSD-2c, BSD-3c
SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
# CMake looks first at swig3.0, then swig2.0 and then swig. However,
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index 26f113a..cb2ddc0 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -10,7 +10,7 @@ TAR_SITE = $(BR2_GNU_MIRROR)/tar
# busybox installs in /bin, so we need tar to install as well in /bin
# so that it overrides the Busybox symlinks.
TAR_CONF_OPTS = --exec-prefix=/
-TAR_LICENSE = GPLv3+
+TAR_LICENSE = GPL-3.0+
TAR_LICENSE_FILES = COPYING
# Prefer full-blown tar over buybox's version
diff --git a/package/tcping/tcping.mk b/package/tcping/tcping.mk
index f5919bb..7edf45e 100644
--- a/package/tcping/tcping.mk
+++ b/package/tcping/tcping.mk
@@ -6,7 +6,7 @@
TCPING_VERSION = 1.3.5
TCPING_SITE = http://linuxco.de/tcping
-TCPING_LICENSE = GPLv3+
+TCPING_LICENSE = GPL-3.0+
TCPING_LICENSE_FILES = LICENSE
define TCPING_BUILD_CMDS
diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index bc572f3..df85fe1 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -6,7 +6,7 @@
TCPREPLAY_VERSION = 4.2.1
TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)
-TCPREPLAY_LICENSE = GPLv3
+TCPREPLAY_LICENSE = GPL-3.0
TCPREPLAY_LICENSE_FILES = docs/LICENSE
TCPREPLAY_CONF_ENV = \
tr_cv_libpcap_version=">= 0.7.0" \
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index fd923fe..f8abb2b 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -18,7 +18,7 @@ TRANSMISSION_AUTORECONF = YES
TRANSMISSION_CONF_OPTS = \
--disable-libnotify \
--enable-lightweight
-TRANSMISSION_LICENSE = GPL-2.0 or GPLv3 with OpenSSL exception
+TRANSMISSION_LICENSE = GPL-2.0 or GPL-3.0 with OpenSSL exception
TRANSMISSION_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y)
diff --git a/package/triggerhappy/triggerhappy.mk b/package/triggerhappy/triggerhappy.mk
index 5a29ca7..a57f1a7 100644
--- a/package/triggerhappy/triggerhappy.mk
+++ b/package/triggerhappy/triggerhappy.mk
@@ -6,7 +6,7 @@
TRIGGERHAPPY_VERSION = 7e5abc69f215678e93a6b999524981c8b40bdcd9
TRIGGERHAPPY_SITE = $(call github,wertarbyte,triggerhappy,$(TRIGGERHAPPY_VERSION))
-TRIGGERHAPPY_LICENSE = GPLv3+
+TRIGGERHAPPY_LICENSE = GPL-3.0+
TRIGGERHAPPY_LICENSE_FILES = COPYING
define TRIGGERHAPPY_BUILD_CMDS
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 42c6767..77843e2 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -6,7 +6,7 @@
TVHEADEND_VERSION = e5f5a4278949afc96e26d6cd50cf968e0e92d7b6
TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
-TVHEADEND_LICENSE = GPLv3+
+TVHEADEND_LICENSE = GPL-3.0+
TVHEADEND_LICENSE_FILES = LICENSE.md
TVHEADEND_DEPENDENCIES = \
host-gettext \
diff --git a/package/udpxy/udpxy.mk b/package/udpxy/udpxy.mk
index dd8c91f..36b9afd 100644
--- a/package/udpxy/udpxy.mk
+++ b/package/udpxy/udpxy.mk
@@ -7,7 +7,7 @@
UDPXY_VERSION = 1.0.23-9-prod
UDPXY_SOURCE = udpxy.$(UDPXY_VERSION).tar.gz
UDPXY_SITE = http://www.udpxy.com/download/1_23
-UDPXY_LICENSE = GPLv3+
+UDPXY_LICENSE = GPL-3.0+
UDPXY_LICENSE_FILES = README
define UDPXY_BUILD_CMDS
diff --git a/package/wavemon/wavemon.mk b/package/wavemon/wavemon.mk
index 5a1b7ee..e87ab7a 100644
--- a/package/wavemon/wavemon.mk
+++ b/package/wavemon/wavemon.mk
@@ -6,7 +6,7 @@
WAVEMON_VERSION = v0.8.1
WAVEMON_SITE = $(call github,uoaerg,wavemon,$(WAVEMON_VERSION))
-WAVEMON_LICENSE = GPLv3+
+WAVEMON_LICENSE = GPL-3.0+
WAVEMON_LICENSE_FILES = COPYING
WAVEMON_DEPENDENCIES = host-pkgconf libnl ncurses
diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index 22e057d..4cb48dc 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -8,7 +8,7 @@ WGET_VERSION = 1.19.1
WGET_SOURCE = wget-$(WGET_VERSION).tar.xz
WGET_SITE = $(BR2_GNU_MIRROR)/wget
WGET_DEPENDENCIES = host-pkgconf
-WGET_LICENSE = GPLv3+
+WGET_LICENSE = GPL-3.0+
WGET_LICENSE_FILES = COPYING
# Prefer full-blown wget over busybox
diff --git a/package/which/which.mk b/package/which/which.mk
index 938b770..c96e893 100644
--- a/package/which/which.mk
+++ b/package/which/which.mk
@@ -6,7 +6,7 @@
WHICH_VERSION = 2.21
WHICH_SITE = $(BR2_GNU_MIRROR)/which
-WHICH_LICENSE = GPLv3+
+WHICH_LICENSE = GPL-3.0+
WHICH_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk
index be19322..b502a9d 100644
--- a/package/xorriso/xorriso.mk
+++ b/package/xorriso/xorriso.mk
@@ -6,7 +6,7 @@
XORRISO_VERSION = 1.4.2
XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso
-XORRISO_LICENSE = GPLv3+
+XORRISO_LICENSE = GPL-3.0+
XORRISO_LICENSE_FILES = COPYING COPYRIGHT
# Disable everything until we actually need those features, and add the correct
# host libraries
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 4785be8..83e834c 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -9,7 +9,7 @@ XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
XZ_SITE = http://tukaani.org/xz
XZ_INSTALL_STAGING = YES
XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-XZ_LICENSE = GPL-2.0+, GPLv3+, LGPLv2.1+
+XZ_LICENSE = GPL-2.0+, GPL-3.0+, LGPLv2.1+
XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/package/yad/yad.mk b/package/yad/yad.mk
index a7f5ba2..d674316 100644
--- a/package/yad/yad.mk
+++ b/package/yad/yad.mk
@@ -7,7 +7,7 @@
YAD_VERSION = 0.33.1
YAD_SOURCE = yad-$(YAD_VERSION).tar.xz
YAD_SITE = http://sourceforge.net/projects/yad-dialog/files
-YAD_LICENSE = GPLv3
+YAD_LICENSE = GPL-3.0
YAD_LICENSE_FILES = COPYING
YAD_DEPENDENCIES = host-intltool host-pkgconf
YAD_CONF_OPTS = --enable-html=no
diff --git a/package/zynq-boot-bin/zynq-boot-bin.mk b/package/zynq-boot-bin/zynq-boot-bin.mk
index 46051fb..f5f2f10 100644
--- a/package/zynq-boot-bin/zynq-boot-bin.mk
+++ b/package/zynq-boot-bin/zynq-boot-bin.mk
@@ -7,7 +7,7 @@
ZYNQ_BOOT_BIN_VERSION = xilinx-v2015.1
ZYNQ_BOOT_BIN_SOURCE = zynq-boot-bin.py
ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/$(ZYNQ_BOOT_BIN_VERSION)/tools
-ZYNQ_BOOT_BIN_LICENSE = GPLv3+
+ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+
HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 04/21] boot, package: use SPDX short identifier for GPLv3/GPLv3+
2017-03-30 13:43 ` [Buildroot] [PATCH 04/21] boot, package: use SPDX short identifier for GPLv3/GPLv3+ Rahul Bedarkar
@ 2017-03-30 21:56 ` Arnout Vandecappelle
2017-03-31 17:28 ` Rahul Bedarkar
0 siblings, 1 reply; 34+ messages in thread
From: Arnout Vandecappelle @ 2017-03-30 21:56 UTC (permalink / raw)
To: buildroot
On 30-03-17 15:43, Rahul Bedarkar wrote:
> We want to use SPDX identifier for license string as much as possible.
> SPDX short identifier for GPLv3/GPLv3+ is GPL-3.0/GPL-3.0+.
>
> This change is done using following command.
> find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv3\>/GPL-3.0/g'
>
> Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Fully reviewed manually again, as well as with the reverse sed.
But now I have a headache :-)
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 34+ messages in thread
* [Buildroot] [PATCH 04/21] boot, package: use SPDX short identifier for GPLv3/GPLv3+
2017-03-30 21:56 ` Arnout Vandecappelle
@ 2017-03-31 17:28 ` Rahul Bedarkar
0 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-31 17:28 UTC (permalink / raw)
To: buildroot
On Fri, Mar 31, 2017 at 3:26 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>
>
> On 30-03-17 15:43, Rahul Bedarkar wrote:
>> We want to use SPDX identifier for license string as much as possible.
>> SPDX short identifier for GPLv3/GPLv3+ is GPL-3.0/GPL-3.0+.
>>
>> This change is done using following command.
>> find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv3\>/GPL-3.0/g'
>>
>> Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> Fully reviewed manually again, as well as with the reverse sed.
> But now I have a headache :-)
Thanks for your review.
Regards,
Rahul
^ permalink raw reply [flat|nested] 34+ messages in thread
* [Buildroot] [PATCH 05/21] boot, package: use SPDX short identifier for LGPLv2.1/LGPLv2.1+
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (3 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 04/21] boot, package: use SPDX short identifier for GPLv3/GPLv3+ Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 06/21] package: use SPDX short identifier for LGPLv3/LGPLv3+ Rahul Bedarkar
` (17 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for LGPLv2.1/LGPLv2.1+ is LGPL-2.1/LGPL-2.1+.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/LGPLv2.1(\+)?/LGPL-2.1\1/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
boot/gummiboot/gummiboot.mk | 2 +-
package/acl/acl.mk | 2 +-
package/acsccid/acsccid.mk | 2 +-
package/alsa-lib/alsa-lib.mk | 2 +-
package/atkmm/atkmm.mk | 2 +-
package/attr/attr.mk | 2 +-
package/audiofile/audiofile.mk | 2 +-
package/augeas/augeas.mk | 2 +-
package/avahi/avahi.mk | 2 +-
package/bc/bc.mk | 2 +-
package/beecrypt/beecrypt.mk | 2 +-
package/bellagio/bellagio.mk | 2 +-
package/binutils/binutils.mk | 2 +-
package/bluez5_utils/bluez5_utils.mk | 2 +-
package/bluez_utils/bluez_utils.mk | 2 +-
package/bustle/bustle.mk | 2 +-
package/c-icap/c-icap.mk | 2 +-
package/cairo/cairo.mk | 2 +-
package/canfestival/canfestival.mk | 2 +-
package/ccid/ccid.mk | 2 +-
package/check/check.mk | 2 +-
package/cloog/cloog.mk | 2 +-
package/collectd/collectd.mk | 2 +-
package/cppunit/cppunit.mk | 2 +-
package/cryptsetup/cryptsetup.mk | 2 +-
package/dbus-cpp/dbus-cpp.mk | 2 +-
package/dialog/dialog.mk | 2 +-
package/directfb/directfb.mk | 2 +-
package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +-
package/dovecot/dovecot.mk | 2 +-
package/dsp-tools/dsp-tools.mk | 2 +-
package/dtv-scan-tables/dtv-scan-tables.mk | 2 +-
package/duma/duma.mk | 2 +-
package/dvb-apps/dvb-apps.mk | 2 +-
package/efivar/efivar.mk | 2 +-
package/efl/efl.mk | 2 +-
package/eigen/eigen.mk | 2 +-
package/enchant/enchant.mk | 2 +-
package/eudev/eudev.mk | 2 +-
package/ffmpeg/ffmpeg.mk | 2 +-
package/flac/flac.mk | 2 +-
package/flickcurl/flickcurl.mk | 2 +-
package/freescale-imx/imx-lib/imx-lib.mk | 2 +-
package/fwts/fwts.mk | 2 +-
package/gcr/gcr.mk | 2 +-
package/geoip/geoip.mk | 2 +-
package/getent/getent.mk | 2 +-
package/gettext/gettext.mk | 2 +-
package/git/git.mk | 2 +-
package/glibc/glibc.mk | 2 +-
package/glibmm/glibmm.mk | 2 +-
package/gnutls/gnutls.mk | 2 +-
package/grantlee/grantlee.mk | 2 +-
package/graphite2/graphite2.mk | 2 +-
package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk | 2 +-
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 2 +-
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 2 +-
package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk | 2 +-
package/gstreamer/gst-plugins-good/gst-plugins-good.mk | 2 +-
package/gstreamer/gstreamer/gstreamer.mk | 2 +-
package/gstreamer1/gst-omx/gst-omx.mk | 2 +-
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +-
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +-
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +-
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +-
package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +-
package/gstreamer1/gst1-validate/gst1-validate.mk | 2 +-
package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +-
package/gtk2-engines/gtk2-engines.mk | 2 +-
package/gtkmm3/gtkmm3.mk | 2 +-
package/gtksourceview/gtksourceview.mk | 2 +-
package/igh-ethercat/igh-ethercat.mk | 2 +-
package/imx-usb-loader/imx-usb-loader.mk | 2 +-
package/jack2/jack2.mk | 2 +-
package/json-glib/json-glib.mk | 2 +-
package/keyutils/keyutils.mk | 2 +-
package/kmod/kmod.mk | 2 +-
package/lcdapi/lcdapi.mk | 2 +-
package/leafnode2/leafnode2.mk | 2 +-
package/libaacs/libaacs.mk | 2 +-
package/libaio/libaio.mk | 2 +-
package/libassuan/libassuan.mk | 2 +-
package/libatasmart/libatasmart.mk | 2 +-
package/libbdplus/libbdplus.mk | 2 +-
package/libbluray/libbluray.mk | 2 +-
package/libbroadvoice/libbroadvoice.mk | 2 +-
package/libcap-ng/libcap-ng.mk | 2 +-
package/libcgi/libcgi.mk | 2 +-
package/libcgroup/libcgroup.mk | 2 +-
package/libcli/libcli.mk | 2 +-
package/libcodec2/libcodec2.mk | 2 +-
package/libcofi/libcofi.mk | 2 +-
package/libconfig/libconfig.mk | 2 +-
package/libcroco/libcroco.mk | 2 +-
package/libdaemon/libdaemon.mk | 2 +-
package/libdcadec/libdcadec.mk | 2 +-
package/libdvbpsi/libdvbpsi.mk | 2 +-
package/libdvbsi/libdvbsi.mk | 2 +-
package/libebml/libebml.mk | 2 +-
package/libee/libee.mk | 2 +-
package/libesmtp/libesmtp.mk | 2 +-
package/libestr/libestr.mk | 2 +-
package/libexif/libexif.mk | 2 +-
| 2 +-
package/libfm/libfm.mk | 2 +-
package/libfribidi/libfribidi.mk | 2 +-
package/libfuse/libfuse.mk | 2 +-
package/libgcrypt/libgcrypt.mk | 2 +-
package/libgee/libgee.mk | 2 +-
package/libgpg-error/libgpg-error.mk | 2 +-
package/libgpgme/libgpgme.mk | 2 +-
package/libgsasl/libgsasl.mk | 2 +-
package/libgudev/libgudev.mk | 2 +-
package/libhdhomerun/libhdhomerun.mk | 2 +-
package/libical/libical.mk | 2 +-
package/libiio/libiio.mk | 2 +-
package/libimxvpuapi/libimxvpuapi.mk | 2 +-
package/libiqrf/libiqrf.mk | 2 +-
package/libiscsi/libiscsi.mk | 2 +-
package/liblo/liblo.mk | 2 +-
package/liblog4c-localtime/liblog4c-localtime.mk | 2 +-
package/libmatroska/libmatroska.mk | 2 +-
package/libmcrypt/libmcrypt.mk | 2 +-
package/libmediaart/libmediaart.mk | 2 +-
package/libmicrohttpd/libmicrohttpd.mk | 4 ++--
package/libmms/libmms.mk | 2 +-
package/libmnl/libmnl.mk | 2 +-
package/libmodbus/libmodbus.mk | 2 +-
package/libndp/libndp.mk | 2 +-
package/libnetfilter_acct/libnetfilter_acct.mk | 2 +-
package/libnfs/libnfs.mk | 2 +-
package/libnice/libnice.mk | 2 +-
package/libnl/libnl.mk | 2 +-
package/liboping/liboping.mk | 2 +-
package/libosip2/libosip2.mk | 2 +-
package/libplayer/libplayer.mk | 2 +-
package/libplist/libplist.mk | 2 +-
package/libpthsem/libpthsem.mk | 2 +-
package/libqrencode/libqrencode.mk | 2 +-
package/libraw/libraw.mk | 2 +-
package/libraw1394/libraw1394.mk | 2 +-
package/libreplaygain/libreplaygain.mk | 2 +-
package/libroxml/libroxml.mk | 2 +-
package/librsync/librsync.mk | 2 +-
package/libseccomp/libseccomp.mk | 2 +-
package/libsecret/libsecret.mk | 2 +-
package/libsemanage/libsemanage.mk | 2 +-
package/libsepol/libsepol.mk | 2 +-
package/libsexy/libsexy.mk | 2 +-
package/libshairplay/libshairplay.mk | 2 +-
package/libsigc/libsigc.mk | 2 +-
package/libsndfile/libsndfile.mk | 2 +-
package/libsoc/libsoc.mk | 2 +-
package/libsocketcan/libsocketcan.mk | 2 +-
package/libsoundtouch/libsoundtouch.mk | 2 +-
package/libsoxr/libsoxr.mk | 2 +-
package/libssh/libssh.mk | 2 +-
package/libsvg-cairo/libsvg-cairo.mk | 2 +-
package/libsysfs/libsysfs.mk | 2 +-
package/libtasn1/libtasn1.mk | 2 +-
package/libuci/libuci.mk | 2 +-
package/libuio/libuio.mk | 2 +-
package/liburcu/liburcu.mk | 2 +-
package/libusb-compat/libusb-compat.mk | 2 +-
package/libusb/libusb.mk | 2 +-
package/libusbgx/libusbgx.mk | 2 +-
package/libv4l/libv4l.mk | 2 +-
package/libvips/libvips.mk | 2 +-
package/libwebsockets/libwebsockets.mk | 2 +-
package/libxmlpp/libxmlpp.mk | 2 +-
package/lite/lite.mk | 2 +-
package/live555/live555.mk | 2 +-
package/lksctp-tools/lksctp-tools.mk | 2 +-
package/lm-sensors/lm-sensors.mk | 2 +-
package/lockdev/lockdev.mk | 2 +-
package/log4cpp/log4cpp.mk | 2 +-
package/lttng-babeltrace/lttng-babeltrace.mk | 2 +-
package/lttng-libust/lttng-libust.mk | 2 +-
package/lttng-modules/lttng-modules.mk | 2 +-
package/lttng-tools/lttng-tools.mk | 2 +-
package/lvm2/lvm2.mk | 2 +-
package/lxc/lxc.mk | 2 +-
package/matchbox-lib/matchbox-lib.mk | 2 +-
| 2 +-
package/midori/midori.mk | 2 +-
package/miraclecast/miraclecast.mk | 2 +-
package/mpg123/mpg123.mk | 2 +-
package/musepack/musepack.mk | 2 +-
package/nss-mdns/nss-mdns.mk | 2 +-
package/nss-pam-ldapd/nss-pam-ldapd.mk | 2 +-
package/numactl/numactl.mk | 2 +-
.../nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk | 2 +-
package/ola/ola.mk | 2 +-
package/olsr/olsr.mk | 2 +-
package/omniorb/omniorb.mk | 2 +-
package/openobex/openobex.mk | 2 +-
package/openpgm/openpgm.mk | 2 +-
package/openvmtools/openvmtools.mk | 2 +-
package/ortp/ortp.mk | 2 +-
package/p7zip/p7zip.mk | 2 +-
package/pangomm/pangomm.mk | 2 +-
package/pseudo/pseudo.mk | 2 +-
package/pulseaudio/pulseaudio.mk | 2 +-
package/python-chardet/python-chardet.mk | 2 +-
package/python-dialog/python-dialog.mk | 2 +-
package/python-dialog3/python-dialog3.mk | 2 +-
package/python-gobject/python-gobject.mk | 2 +-
package/python-pam/python-pam.mk | 2 +-
package/python-paramiko/python-paramiko.mk | 2 +-
package/python-pygame/python-pygame.mk | 2 +-
package/python-pyudev/python-pyudev.mk | 2 +-
package/python-urwid/python-urwid.mk | 2 +-
package/qemu/qemu.mk | 2 +-
package/qjson/qjson.mk | 2 +-
package/qt/qt.mk | 2 +-
package/qt5/qt5base/qt5base.mk | 2 +-
package/qt5/qt5connectivity/qt5connectivity.mk | 2 +-
package/qt5/qt5declarative/qt5declarative.mk | 2 +-
package/qt5/qt5enginio/qt5enginio.mk | 2 +-
package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 2 +-
package/qt5/qt5imageformats/qt5imageformats.mk | 2 +-
package/qt5/qt5location/qt5location.mk | 2 +-
package/qt5/qt5multimedia/qt5multimedia.mk | 2 +-
package/qt5/qt5script/qt5script.mk | 2 +-
package/qt5/qt5sensors/qt5sensors.mk | 2 +-
package/qt5/qt5serialport/qt5serialport.mk | 2 +-
package/qt5/qt5svg/qt5svg.mk | 2 +-
package/qt5/qt5tools/qt5tools.mk | 2 +-
package/qt5/qt5webchannel/qt5webchannel.mk | 2 +-
package/qt5/qt5webkit/qt5webkit.mk | 4 ++--
package/qt5/qt5websockets/qt5websockets.mk | 2 +-
| 2 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +-
package/quazip/quazip.mk | 2 +-
package/qwt/qwt.mk | 2 +-
package/raptor/raptor.mk | 2 +-
package/rtmpdump/rtmpdump.mk | 2 +-
package/sbc/sbc.mk | 2 +-
package/sdl/sdl.mk | 2 +-
package/sdl_sound/sdl_sound.mk | 2 +-
package/setools/setools.mk | 2 +-
package/smack/smack.mk | 2 +-
package/sofia-sip/sofia-sip.mk | 2 +-
package/sox/sox.mk | 2 +-
package/spice/spice.mk | 2 +-
package/sylpheed/sylpheed.mk | 2 +-
package/syslog-ng/syslog-ng.mk | 2 +-
package/systemd-bootchart/systemd-bootchart.mk | 2 +-
package/systemd/systemd.mk | 2 +-
package/taglib/taglib.mk | 2 +-
package/tn5250/tn5250.mk | 2 +-
package/trace-cmd/trace-cmd.mk | 2 +-
package/twolame/twolame.mk | 2 +-
package/ubus/ubus.mk | 2 +-
package/uclibc-ng-test/uclibc-ng-test.mk | 2 +-
package/uclibc/uclibc.mk | 2 +-
package/unixodbc/unixodbc.mk | 2 +-
package/usbredir/usbredir.mk | 2 +-
package/util-linux/util-linux.mk | 2 +-
package/vala/vala.mk | 2 +-
package/vde2/vde2.mk | 2 +-
package/vlc/vlc.mk | 2 +-
package/webkitgtk/webkitgtk.mk | 2 +-
package/wine/wine.mk | 2 +-
package/xenomai/xenomai.mk | 2 +-
package/xz/xz.mk | 2 +-
package/zbar/zbar.mk | 2 +-
package/zlog/zlog.mk | 2 +-
268 files changed, 270 insertions(+), 270 deletions(-)
diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk
index 02ad28b..85a5daa 100644
--- a/boot/gummiboot/gummiboot.mk
+++ b/boot/gummiboot/gummiboot.mk
@@ -7,7 +7,7 @@
GUMMIBOOT_SITE = http://cgit.freedesktop.org/gummiboot
GUMMIBOOT_SITE_METHOD = git
GUMMIBOOT_VERSION = 43
-GUMMIBOOT_LICENSE = LGPLv2.1+
+GUMMIBOOT_LICENSE = LGPL-2.1+
GUMMIBOOT_LICENSE_FILES = LICENSE
# The git archive does not have the autoconf/automake stuff generated.
diff --git a/package/acl/acl.mk b/package/acl/acl.mk
index 93e20c3..edcf4fd 100644
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -10,7 +10,7 @@ ACL_SITE = http://download.savannah.gnu.org/releases/acl
ACL_INSTALL_STAGING = YES
ACL_DEPENDENCIES = attr
ACL_CONF_OPTS = --enable-gettext=no
-ACL_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (libraries)
+ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
# While the configuration system uses autoconf, the Makefiles are
diff --git a/package/acsccid/acsccid.mk b/package/acsccid/acsccid.mk
index c2e7d21..2fd2033 100644
--- a/package/acsccid/acsccid.mk
+++ b/package/acsccid/acsccid.mk
@@ -7,7 +7,7 @@
ACSCCID_VERSION = 1.1.1
ACSCCID_SOURCE = acsccid-$(ACSCCID_VERSION).tar.bz2
ACSCCID_SITE = http://downloads.sourceforge.net/acsccid
-ACSCCID_LICENSE = LGPLv2.1+
+ACSCCID_LICENSE = LGPL-2.1+
ACSCCID_LICENSE_FILES = COPYING
ACSCCID_INSTALL_STAGING = YES
ACSCCID_DEPENDENCIES = pcsc-lite host-flex host-pkgconf libusb
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 8f421a0..8651653 100644
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -7,7 +7,7 @@
ALSA_LIB_VERSION = 1.1.3
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
-ALSA_LIB_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (aserver)
+ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver)
ALSA_LIB_LICENSE_FILES = COPYING aserver/COPYING
ALSA_LIB_INSTALL_STAGING = YES
ALSA_LIB_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk
index 0f98ee0..234a937 100644
--- a/package/atkmm/atkmm.mk
+++ b/package/atkmm/atkmm.mk
@@ -8,7 +8,7 @@ ATKMM_VERSION_MAJOR = 2.24
ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).2
ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz
ATKMM_SITE = http://ftp.gnome.org/pub/gnome/sources/atkmm/$(ATKMM_VERSION_MAJOR)
-ATKMM_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (tools)
+ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
ATKMM_LICENSE_FILES = COPYING COPYING.tools
ATKMM_INSTALL_STAGING = YES
ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
index 24222b5..0c85701 100644
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -10,7 +10,7 @@ ATTR_SITE = http://download.savannah.gnu.org/releases/attr
ATTR_INSTALL_STAGING = YES
ATTR_CONF_OPTS = --enable-gettext=no
HOST_ATTR_CONF_OPTS = --enable-gettext=no
-ATTR_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (libraries)
+ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
# While the configuration system uses autoconf, the Makefiles are
diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
index 74550a3..2f2e890 100644
--- a/package/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
@@ -12,7 +12,7 @@ AUDIOFILE_CONF_OPTS = --disable-examples
AUDIOFILE_DEPENDENCIES = host-pkgconf
# configure is outdated and has old bugs because of it
AUDIOFILE_AUTORECONF = YES
-AUDIOFILE_LICENSE = GPL-2.0+, LGPLv2.1+
+AUDIOFILE_LICENSE = GPL-2.0+, LGPL-2.1+
AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL
ifeq ($(BR2_PACKAGE_FLAC),y)
diff --git a/package/augeas/augeas.mk b/package/augeas/augeas.mk
index e52ef04..4c855a3 100644
--- a/package/augeas/augeas.mk
+++ b/package/augeas/augeas.mk
@@ -7,7 +7,7 @@
AUGEAS_VERSION = 1.7.0
AUGEAS_SITE = http://download.augeas.net
AUGEAS_INSTALL_STAGING = YES
-AUGEAS_LICENSE = LGPLv2.1+
+AUGEAS_LICENSE = LGPL-2.1+
AUGEAS_LICENSE_FILES = COPYING
AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 069b45a..a356a08 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -13,7 +13,7 @@
AVAHI_VERSION = 0.6.32
AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION)
-AVAHI_LICENSE = LGPLv2.1+
+AVAHI_LICENSE = LGPL-2.1+
AVAHI_LICENSE_FILES = LICENSE
AVAHI_INSTALL_STAGING = YES
diff --git a/package/bc/bc.mk b/package/bc/bc.mk
index 3193ffa..a6446ce 100644
--- a/package/bc/bc.mk
+++ b/package/bc/bc.mk
@@ -8,7 +8,7 @@ BC_VERSION = 1.06.95
BC_SOURCE = bc-$(BC_VERSION).tar.bz2
BC_SITE = http://alpha.gnu.org/gnu/bc
BC_DEPENDENCIES = host-flex
-BC_LICENSE = GPL-2.0+, LGPLv2.1+
+BC_LICENSE = GPL-2.0+, LGPL-2.1+
BC_LICENSE_FILES = COPYING COPYING.LIB
# Build after busybox so target ends up with bc's "dc" version
diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
index bd29b3b..10dd97c 100644
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -8,7 +8,7 @@ BEECRYPT_VERSION = 4.2.1
BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION)
BEECRYPT_AUTORECONF = YES
BEECRYPT_INSTALL_STAGING = YES
-BEECRYPT_LICENSE = LGPLv2.1+
+BEECRYPT_LICENSE = LGPL-2.1+
BEECRYPT_LICENSE_FILES = COPYING.LIB
BEECRYPT_CONF_OPTS = \
diff --git a/package/bellagio/bellagio.mk b/package/bellagio/bellagio.mk
index 6db753d..4e5c691 100644
--- a/package/bellagio/bellagio.mk
+++ b/package/bellagio/bellagio.mk
@@ -9,7 +9,7 @@ BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz
BELLAGIO_SITE = http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%20$(BELLAGIO_VERSION)
BELLAGIO_AUTORECONF = YES
BELLAGIO_INSTALL_STAGING = YES
-BELLAGIO_LICENSE = LGPLv2.1+
+BELLAGIO_LICENSE = LGPL-2.1+
BELLAGIO_LICENSE_FILES = COPYING
BELLAGIO_PROVIDES = libopenmax
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
index 467db6e..c4e696f 100644
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -25,7 +25,7 @@ BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.bz2
BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
BINUTILS_INSTALL_STAGING = YES
BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-BINUTILS_LICENSE = GPL-3.0+, libiberty LGPLv2.1+
+BINUTILS_LICENSE = GPL-3.0+, libiberty LGPL-2.1+
BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB
ifeq ($(BINUTILS_FROM_GIT),y)
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
index a72899a..d19afc3 100644
--- a/package/bluez5_utils/bluez5_utils.mk
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -9,7 +9,7 @@ BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
BLUEZ5_UTILS_INSTALL_STAGING = YES
BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2
-BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPLv2.1+
+BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
BLUEZ5_UTILS_CONF_OPTS = \
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
index 2fa8f7f..8425921 100644
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -11,7 +11,7 @@ BLUEZ_UTILS_INSTALL_STAGING = YES
BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools
BLUEZ_UTILS_AUTORECONF = YES
-BLUEZ_UTILS_LICENSE = GPL-2.0+, LGPLv2.1+
+BLUEZ_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
BLUEZ_UTILS_LICENSE_FILES = COPYING COPYING.LIB
# BlueZ 3.x compatibility
diff --git a/package/bustle/bustle.mk b/package/bustle/bustle.mk
index 0b85536..4cd4460 100644
--- a/package/bustle/bustle.mk
+++ b/package/bustle/bustle.mk
@@ -6,7 +6,7 @@
BUSTLE_VERSION = 0.4.3
BUSTLE_SITE = http://www.willthompson.co.uk/bustle/releases/$(BUSTLE_VERSION)
-BUSTLE_LICENSE = LGPLv2.1+
+BUSTLE_LICENSE = LGPL-2.1+
BUSTLE_LICENSE_FILES = LICENSE
BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf
diff --git a/package/c-icap/c-icap.mk b/package/c-icap/c-icap.mk
index 3078721..17f3459 100644
--- a/package/c-icap/c-icap.mk
+++ b/package/c-icap/c-icap.mk
@@ -7,7 +7,7 @@
C_ICAP_VERSION = 0.4.2
C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz
C_ICAP_SITE = http://downloads.sourceforge.net/c-icap
-C_ICAP_LICENSE = LGPLv2.1+
+C_ICAP_LICENSE = LGPL-2.1+
C_ICAP_LICENSE_FILES = COPYING
C_ICAP_INSTALL_STAGING = YES
C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index ac91a56..8660b5a 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -6,7 +6,7 @@
CAIRO_VERSION = 1.14.8
CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
-CAIRO_LICENSE = LGPLv2.1 or MPLv1.1 (library)
+CAIRO_LICENSE = LGPL-2.1 or MPLv1.1 (library)
CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
CAIRO_SITE = http://cairographics.org/releases
CAIRO_INSTALL_STAGING = YES
diff --git a/package/canfestival/canfestival.mk b/package/canfestival/canfestival.mk
index 61578d3..4a44470 100644
--- a/package/canfestival/canfestival.mk
+++ b/package/canfestival/canfestival.mk
@@ -7,7 +7,7 @@
CANFESTIVAL_VERSION = 7740ac6fdedc23e1ed6908d3d7db54833c88572b
CANFESTIVAL_SITE = http://dev.automforge.net/CanFestival-3
CANFESTIVAL_SITE_METHOD = hg
-CANFESTIVAL_LICENSE = LGPLv2.1+
+CANFESTIVAL_LICENSE = LGPL-2.1+
CANFESTIVAL_LICENSE_FILES = COPYING LICENCE
CANFESTIVAL_INSTALL_STAGING = YES
CANFESTIVAL_INSTALLED-y = src drivers
diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk
index 18653d3..cfe6d39 100644
--- a/package/ccid/ccid.mk
+++ b/package/ccid/ccid.mk
@@ -7,7 +7,7 @@
CCID_VERSION = 1.4.18
CCID_SOURCE = ccid_$(CCID_VERSION).orig.tar.bz2
CCID_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/ccid
-CCID_LICENSE = LGPLv2.1+
+CCID_LICENSE = LGPL-2.1+
CCID_LICENSE_FILES = COPYING
CCID_INSTALL_STAGING = YES
CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb
diff --git a/package/check/check.mk b/package/check/check.mk
index ccaefa7..047beba 100644
--- a/package/check/check.mk
+++ b/package/check/check.mk
@@ -8,7 +8,7 @@ CHECK_VERSION = 0.11.0
CHECK_SITE = https://github.com/libcheck/check/releases/download/$(CHECK_VERSION)
CHECK_INSTALL_STAGING = YES
CHECK_DEPENDENCIES = host-pkgconf
-CHECK_LICENSE = LGPLv2.1+
+CHECK_LICENSE = LGPL-2.1+
CHECK_LICENSE_FILES = COPYING.LESSER
# Having checkmk in the target makes no sense
diff --git a/package/cloog/cloog.mk b/package/cloog/cloog.mk
index ef666d0..a2a1f6b 100644
--- a/package/cloog/cloog.mk
+++ b/package/cloog/cloog.mk
@@ -6,7 +6,7 @@
CLOOG_VERSION = 0.18.4
CLOOG_SITE = http://www.bastoul.net/cloog/pages/download
-CLOOG_LICENSE = LGPLv2.1+
+CLOOG_LICENSE = LGPL-2.1+
HOST_CLOOG_DEPENDENCIES = host-gmp host-isl
# Our libtool patch doesn't apply, and since this package is only
# built for the host, we don't really care about it.
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
index a3f3063..626fba8 100644
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -9,7 +9,7 @@ COLLECTD_SITE = http://collectd.org/files
COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2
COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
COLLECTD_INSTALL_STAGING = YES
-COLLECTD_LICENSE = GPL-2.0, LGPLv2.1
+COLLECTD_LICENSE = GPL-2.0, LGPL-2.1
COLLECTD_LICENSE_FILES = COPYING
# These require unmet dependencies, are fringe, pointless or deprecated
diff --git a/package/cppunit/cppunit.mk b/package/cppunit/cppunit.mk
index b8251c2..db01b70 100644
--- a/package/cppunit/cppunit.mk
+++ b/package/cppunit/cppunit.mk
@@ -7,7 +7,7 @@
CPPUNIT_VERSION = 1.13.2
CPPUNIT_SITE = http://dev-www.libreoffice.org/src
CPPUNIT_INSTALL_STAGING = YES
-CPPUNIT_LICENSE = LGPLv2.1
+CPPUNIT_LICENSE = LGPL-2.1
CPPUNIT_LICENSE_FILES = COPYING
CPPUNIT_CONF_OPTS = --disable-doxygen
diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 6791f6f..a3358a9 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -10,7 +10,7 @@ CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (library)
+CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
CRYPTSETUP_INSTALL_STAGING = YES
diff --git a/package/dbus-cpp/dbus-cpp.mk b/package/dbus-cpp/dbus-cpp.mk
index 0b51967..d8468ab 100644
--- a/package/dbus-cpp/dbus-cpp.mk
+++ b/package/dbus-cpp/dbus-cpp.mk
@@ -23,7 +23,7 @@ HOST_DBUS_CPP_CONF_OPTS = \
--disable-ecore \
--disable-glib
DBUS_CPP_AUTORECONF = YES
-DBUS_CPP_LICENSE = LGPLv2.1+
+DBUS_CPP_LICENSE = LGPL-2.1+
DBUS_CPP_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_EFL),y)
diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index f207f75..f1c0e4c 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -10,7 +10,7 @@ DIALOG_SITE = ftp://invisible-island.net/dialog
DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \
--disable-rpath-hack
DIALOG_DEPENDENCIES = host-pkgconf ncurses
-DIALOG_LICENSE = LGPLv2.1
+DIALOG_LICENSE = LGPL-2.1
DIALOG_LICENSE_FILES = COPYING
ifneq ($(BR2_ENABLE_LOCALE),y)
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 595d590..a27d6a7 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -8,7 +8,7 @@ DIRECTFB_VERSION_MAJOR = 1.7
DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7
DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
-DIRECTFB_LICENSE = LGPLv2.1+
+DIRECTFB_LICENSE = LGPL-2.1+
DIRECTFB_LICENSE_FILES = COPYING
DIRECTFB_INSTALL_STAGING = YES
DIRECTFB_AUTORECONF = YES
diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
index 1b5185f..50e148b 100644
--- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
+++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
@@ -7,7 +7,7 @@
DOVECOT_PIGEONHOLE_VERSION = 0.4.17
DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2
-DOVECOT_PIGEONHOLE_LICENSE = LGPLv2.1
+DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1
DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING
DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot
diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk
index caa6bba..a7f6de4 100644
--- a/package/dovecot/dovecot.mk
+++ b/package/dovecot/dovecot.mk
@@ -8,7 +8,7 @@ DOVECOT_VERSION_MAJOR = 2.2
DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).28
DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
DOVECOT_INSTALL_STAGING = YES
-DOVECOT_LICENSE = LGPLv2.1
+DOVECOT_LICENSE = LGPL-2.1
DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT
DOVECOT_DEPENDENCIES = \
host-pkgconf \
diff --git a/package/dsp-tools/dsp-tools.mk b/package/dsp-tools/dsp-tools.mk
index c91ed20..ec63bcd 100644
--- a/package/dsp-tools/dsp-tools.mk
+++ b/package/dsp-tools/dsp-tools.mk
@@ -7,7 +7,7 @@
DSP_TOOLS_VERSION = v2.0
DSP_TOOLS_SITE = $(call github,felipec,dsp-tools,$(DSP_TOOLS_VERSION))
DSP_TOOLS_DEPENDENCIES = tidsp-binaries
-DSP_TOOLS_LICENSE = LGPLv2.1
+DSP_TOOLS_LICENSE = LGPL-2.1
DSP_TOOLS_LICENSE_FILES = LICENSE
define DSP_TOOLS_BUILD_CMDS
diff --git a/package/dtv-scan-tables/dtv-scan-tables.mk b/package/dtv-scan-tables/dtv-scan-tables.mk
index 57fa1cd..8c1ae6d 100644
--- a/package/dtv-scan-tables/dtv-scan-tables.mk
+++ b/package/dtv-scan-tables/dtv-scan-tables.mk
@@ -14,7 +14,7 @@ DTV_SCAN_TABLES_SITE_METHOD = git
# However, the package prominently contains the COPYING and COPYING.LIB
# license files (respectively for the GPLv2 and the LGPLv2.1), so we use
# that as the licensing information.
-DTV_SCAN_TABLES_LICENSE = GPL-2.0, LGPLv2.1
+DTV_SCAN_TABLES_LICENSE = GPL-2.0, LGPL-2.1
DTV_SCAN_TABLES_LICENSE_FILES = COPYING COPYING.LGPL
# In order to avoid issues with file name encodings, we rename the
diff --git a/package/duma/duma.mk b/package/duma/duma.mk
index 88d8b75..6299691 100644
--- a/package/duma/duma.mk
+++ b/package/duma/duma.mk
@@ -7,7 +7,7 @@
DUMA_VERSION = 2.5.15
DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz
DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION)
-DUMA_LICENSE = GPL-2.0+, LGPLv2.1+
+DUMA_LICENSE = GPL-2.0+, LGPL-2.1+
DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL
DUMA_INSTALL_STAGING = YES
diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index ad38bb6..8ba1501 100644
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -7,7 +7,7 @@
DVB_APPS_VERSION = 3d43b280298c39a67d1d889e01e173f52c12da35
DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps
DVB_APPS_SITE_METHOD = hg
-DVB_APPS_LICENSE = GPL-2.0, GPL-2.0+, LGPLv2.1+
+DVB_APPS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+
DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL
ifeq ($(BR2_ENABLE_LOCALE),)
diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk
index c31d87b..d06192e 100644
--- a/package/efivar/efivar.mk
+++ b/package/efivar/efivar.mk
@@ -6,7 +6,7 @@
EFIVAR_VERSION = 30
EFIVAR_SITE = $(call github,rhinstaller,efivar,$(EFIVAR_VERSION))
-EFIVAR_LICENSE = LGPLv2.1
+EFIVAR_LICENSE = LGPL-2.1
EFIVAR_LICENSE_FILES = COPYING
EFIVAR_DEPENDENCIES = popt
EFIVAR_INSTALL_STAGING = YES
diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index ee6211d..a3443ad 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -7,7 +7,7 @@
EFL_VERSION = 1.18.4
EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
EFL_SITE = http://download.enlightenment.org/rel/libs/efl
-EFL_LICENSE = BSD-2c, LGPLv2.1+, GPL-2.0+
+EFL_LICENSE = BSD-2c, LGPL-2.1+, GPL-2.0+
EFL_LICENSE_FILES = \
COMPLIANCE \
COPYING \
diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
index 730bb5f..03eabf6 100644
--- a/package/eigen/eigen.mk
+++ b/package/eigen/eigen.mk
@@ -7,7 +7,7 @@
EIGEN_VERSION = 3.2.5
EIGEN_SITE = https://bitbucket.org/eigen/eigen
EIGEN_SITE_METHOD = hg
-EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1
+EIGEN_LICENSE = MPL2, BSD-3c, LGPL-2.1
EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README
EIGEN_INSTALL_STAGING = YES
EIGEN_INSTALL_TARGET = NO
diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index 4a23293..69402c1 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -8,7 +8,7 @@ ENCHANT_VERSION = 1.6.0
ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION)
ENCHANT_INSTALL_STAGING = YES
ENCHANT_DEPENDENCIES = libglib2 host-pkgconf
-ENCHANT_LICENSE = LGPLv2.1+
+ENCHANT_LICENSE = LGPL-2.1+
ENCHANT_LICENSE_FILES = COPYING.LIB
$(eval $(autotools-package))
diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk
index 82c11d3..6a77881 100644
--- a/package/eudev/eudev.mk
+++ b/package/eudev/eudev.mk
@@ -6,7 +6,7 @@
EUDEV_VERSION = 3.2.1
EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
-EUDEV_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (libraries)
+EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
EUDEV_LICENSE_FILES = COPYING
EUDEV_INSTALL_STAGING = YES
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index c181dfa..f1a1e0d 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -9,7 +9,7 @@ FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
-FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
+FFMPEG_LICENSE = LGPL-2.1+, libjpeg license
FFMPEG_LICENSE_FILES = LICENSE.md COPYING.LGPLv2.1
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
FFMPEG_LICENSE += and GPL-2.0+
diff --git a/package/flac/flac.mk b/package/flac/flac.mk
index 639636e..3448213 100644
--- a/package/flac/flac.mk
+++ b/package/flac/flac.mk
@@ -9,7 +9,7 @@ FLAC_SITE = http://downloads.xiph.org/releases/flac
FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz
FLAC_INSTALL_STAGING = YES
FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPLv2.1+ (other libraries)
+FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries)
FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL
# 0001-configure.ac-relax-linux-OS-detection.patch patches configure.ac
FLAC_AUTORECONF = YES
diff --git a/package/flickcurl/flickcurl.mk b/package/flickcurl/flickcurl.mk
index 87af8f4..0e194e6 100644
--- a/package/flickcurl/flickcurl.mk
+++ b/package/flickcurl/flickcurl.mk
@@ -6,7 +6,7 @@
FLICKCURL_VERSION = 1.26
FLICKCURL_SITE = http://download.dajobe.org/flickcurl
-FLICKCURL_LICENSE = LGPLv2.1+ or GPL-2.0+ or Apache 2.0+
+FLICKCURL_LICENSE = LGPL-2.1+ or GPL-2.0+ or Apache 2.0+
FLICKCURL_LICENSE_FILES = COPYING COPYING.LIB LICENSE-2.0.txt LICENSE.html
FLICKCURL_INSTALL_STAGING = YES
FLICKCURL_CONFIG_SCRIPTS = flickcurl-config
diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
index d3603ca..3e0f7d8 100644
--- a/package/freescale-imx/imx-lib/imx-lib.mk
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -6,7 +6,7 @@
IMX_LIB_VERSION = 5.4
IMX_LIB_SITE = $(FREESCALE_IMX_SITE)
-IMX_LIB_LICENSE = LGPLv2.1+
+IMX_LIB_LICENSE = LGPL-2.1+
IMX_LIB_LICENSE_FILES = COPYING-LGPL-2.1
IMX_LIB_INSTALL_STAGING = YES
diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk
index 550536e..8b0c5b0 100644
--- a/package/fwts/fwts.mk
+++ b/package/fwts/fwts.mk
@@ -7,7 +7,7 @@
FWTS_VERSION = V16.11.00
FWTS_SITE = http://fwts.ubuntu.com/release
FWTS_STRIP_COMPONENTS = 0
-FWTS_LICENSE = GPL-2.0, LGPLv2.1, Custom
+FWTS_LICENSE = GPL-2.0, LGPL-2.1, Custom
FWTS_LICENSE_FILES = debian/copyright
FWTS_AUTORECONF = YES
FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf json-c libglib2 \
diff --git a/package/gcr/gcr.mk b/package/gcr/gcr.mk
index d8cb667..7cb35af 100644
--- a/package/gcr/gcr.mk
+++ b/package/gcr/gcr.mk
@@ -15,7 +15,7 @@ GCR_CONF_OPTS = \
--disable-gtk-doc \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr
# Even though COPYING is v2 the code states v2.1+
-GCR_LICENSE = LGPLv2.1+
+GCR_LICENSE = LGPL-2.1+
GCR_LICENSE_FILES = COPYING
# Only the X11 backend is supported for the simple GUI
diff --git a/package/geoip/geoip.mk b/package/geoip/geoip.mk
index cf3bc1a..5ba4c1e 100644
--- a/package/geoip/geoip.mk
+++ b/package/geoip/geoip.mk
@@ -8,7 +8,7 @@ GEOIP_VERSION = 1.6.9
GEOIP_SOURCE = GeoIP-$(GEOIP_VERSION).tar.gz
GEOIP_SITE = https://github.com/maxmind/geoip-api-c/releases/download/v$(GEOIP_VERSION)
GEOIP_INSTALL_STAGING = YES
-GEOIP_LICENSE = LGPLv2.1+
+GEOIP_LICENSE = LGPL-2.1+
GEOIP_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/getent/getent.mk b/package/getent/getent.mk
index ed249e8..4e3eaea 100644
--- a/package/getent/getent.mk
+++ b/package/getent/getent.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GETENT_LICENSE = LGPLv2.1+
+GETENT_LICENSE = LGPL-2.1+
# For glibc toolchains, we use the getent program built/installed by
# the C library. For other toolchains, we use the wrapper script
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 34d8928..b6663a6 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -8,7 +8,7 @@ GETTEXT_VERSION = 0.19.8.1
GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
GETTEXT_SOURCE = gettext-$(GETTEXT_VERSION).tar.xz
GETTEXT_INSTALL_STAGING = YES
-GETTEXT_LICENSE = LGPLv2.1+ (libintl), GPL-3.0+ (the rest)
+GETTEXT_LICENSE = LGPL-2.1+ (libintl), GPL-3.0+ (the rest)
GETTEXT_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB
GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
diff --git a/package/git/git.mk b/package/git/git.mk
index 9a14fdc..d0e9f3b 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -7,7 +7,7 @@
GIT_VERSION = 2.12.2
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
GIT_SITE = https://www.kernel.org/pub/software/scm/git
-GIT_LICENSE = GPL-2.0, LGPLv2.1+
+GIT_LICENSE = GPL-2.0, LGPL-2.1+
GIT_LICENSE_FILES = COPYING LGPL-2.1
GIT_DEPENDENCIES = zlib host-gettext
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index 44e7459..e904bf8 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -9,7 +9,7 @@ GLIBC_SITE = $(BR2_GNU_MIRROR)/libc
GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz
GLIBC_SRC_SUBDIR = .
-GLIBC_LICENSE = GPL-2.0+ (programs), LGPLv2.1+, BSD-3c, MIT (library)
+GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3c, MIT (library)
GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES)
# glibc is part of the toolchain so disable the toolchain dependency
diff --git a/package/glibmm/glibmm.mk b/package/glibmm/glibmm.mk
index d579a0c..030ef1e 100644
--- a/package/glibmm/glibmm.mk
+++ b/package/glibmm/glibmm.mk
@@ -6,7 +6,7 @@
GLIBMM_VERSION_MAJOR = 2.50
GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).0
-GLIBMM_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (tools)
+GLIBMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
GLIBMM_LICENSE_FILES = COPYING COPYING.tools
GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz
GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJOR)
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 1d89b08..47da90f 100644
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -8,7 +8,7 @@ GNUTLS_VERSION_MAJOR = 3.5
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).10
GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
-GNUTLS_LICENSE = LGPLv2.1+ (core library), GPL-3.0+ (gnutls-openssl library)
+GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library)
GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER
GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre
GNUTLS_CONF_OPTS = \
diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk
index f921d7b..812603b 100644
--- a/package/grantlee/grantlee.mk
+++ b/package/grantlee/grantlee.mk
@@ -6,7 +6,7 @@
GRANTLEE_VERSION = 5.1.0
GRANTLEE_SITE = http://downloads.grantlee.org
GRANTLEE_INSTALL_STAGING = YES
-GRANTLEE_LICENSE = LGPLv2.1+
+GRANTLEE_LICENSE = LGPL-2.1+
GRANTLEE_LICENSE_FILES = COPYING.LIB
GRANTLEE_DEPENDENCIES = qt5base qt5script
diff --git a/package/graphite2/graphite2.mk b/package/graphite2/graphite2.mk
index 5f6848f..737e072 100644
--- a/package/graphite2/graphite2.mk
+++ b/package/graphite2/graphite2.mk
@@ -8,7 +8,7 @@ GRAPHITE2_VERSION = 1.3.9
GRAPHITE2_SOURCE = graphite2-$(GRAPHITE2_VERSION).tgz
GRAPHITE2_SITE = http://downloads.sourceforge.net/project/silgraphite/graphite2
GRAPHITE2_INSTALL_STAGING = YES
-GRAPHITE2_LICENSE = LGPLv2.1+
+GRAPHITE2_LICENSE = LGPL-2.1+
GRAPHITE2_LICENSE_FILES = LICENSE
# Avoid building docs and tests to save time
diff --git a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk
index 7fa6181..420ceda 100644
--- a/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk
+++ b/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk
@@ -10,7 +10,7 @@ GSETTINGS_DESKTOP_SCHEMAS_SOURCE = gsettings-desktop-schemas-$(GSETTINGS_DESKTOP
GSETTINGS_DESKTOP_SCHEMAS_SITE = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR)
GSETTINGS_DESKTOP_SCHEMAS_INSTALL_STAGING = YES
GSETTINGS_DESKTOP_SCHEMAS_DEPENDENCIES = host-intltool host-pkgconf libglib2
-GSETTINGS_DESKTOP_SCHEMAS_LICENSE = LGPLv2.1+
+GSETTINGS_DESKTOP_SCHEMAS_LICENSE = LGPL-2.1+
GSETTINGS_DESKTOP_SCHEMAS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index 9757f16..6f0e38d 100644
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -16,7 +16,7 @@ GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPL-3.0+ (libav)
GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3
else
GST_FFMPEG_CONF_OPTS += --enable-lgpl
-GST_FFMPEG_LICENSE = LGPLv2+ (gst-ffmpeg), LGPLv2.1+/LGPLv3+ (libav)
+GST_FFMPEG_LICENSE = LGPLv2+ (gst-ffmpeg), LGPL-2.1+/LGPLv3+ (libav)
GST_FFMPEG_LICENSE_FILES = COPYING.LIB gst-libs/ext/libav/COPYING.LGPLv2.1 gst-libs/ext/libav/COPYING.LGPLv3
endif
diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
index 65993a2..6940901 100644
--- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -9,7 +9,7 @@ GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE)
# Most is LGPLv2+, but some sources are copied from upstream and are
# LGPLv2.1+, which essentially makes it LGPLv2.1+
-GST_FSL_PLUGINS_LICENSE = LGPLv2+, LGPLv2.1+, PROPRIETARY (asf.h)
+GST_FSL_PLUGINS_LICENSE = LGPLv2+, LGPL-2.1+, PROPRIETARY (asf.h)
GST_FSL_PLUGINS_LICENSE_FILES = COPYING-LGPL-2.1 COPYING-LGPL-2
GST_FSL_PLUGINS_INSTALL_STAGING = YES
diff --git a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
index 9296dab..b9416db 100644
--- a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
@@ -8,7 +8,7 @@ GST_PLUGINS_BAD_VERSION = 0.10.23
GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz
GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
# COPYING.LIB is in fact v2, but most of the code is v2.1+
-GST_PLUGINS_BAD_LICENSE = LGPLv2.1+, GPL-2.0+
+GST_PLUGINS_BAD_LICENSE = LGPL-2.1+, GPL-2.0+
GST_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB COPYING
GST_PLUGINS_BAD_CONF_OPTS = \
diff --git a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
index a686caf..791b413 100644
--- a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
+++ b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
@@ -7,7 +7,7 @@
GST_PLUGINS_GOOD_VERSION = 0.10.31
GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz
GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
-GST_PLUGINS_GOOD_LICENSE = LGPLv2.1+
+GST_PLUGINS_GOOD_LICENSE = LGPL-2.1+
GST_PLUGINS_GOOD_LICENSE_FILES = COPYING
GST_PLUGINS_GOOD_CONF_OPTS = \
diff --git a/package/gstreamer/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer/gstreamer.mk
index cde7f8f..91230aa 100644
--- a/package/gstreamer/gstreamer/gstreamer.mk
+++ b/package/gstreamer/gstreamer/gstreamer.mk
@@ -9,7 +9,7 @@ GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.xz
GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer
GSTREAMER_INSTALL_STAGING = YES
# COPYING is in fact v2, but most of the code is v2.1+
-GSTREAMER_LICENSE = LGPLv2.1+
+GSTREAMER_LICENSE = LGPL-2.1+
GSTREAMER_LICENSE_FILES = COPYING
# Checking if unaligned memory access works correctly cannot be done when cross
diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk
index 6ce7baa..10dbe05 100644
--- a/package/gstreamer1/gst-omx/gst-omx.mk
+++ b/package/gstreamer1/gst-omx/gst-omx.mk
@@ -8,7 +8,7 @@ GST_OMX_VERSION = 1.10.4
GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz
GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx
-GST_OMX_LICENSE = LGPLv2.1
+GST_OMX_LICENSE = LGPL-2.1
GST_OMX_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index c6a151a..71ebd48 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -11,7 +11,7 @@ GST1_PLUGINS_BAD_INSTALL_STAGING = YES
GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if
# enabled.
-GST1_PLUGINS_BAD_LICENSE = LGPLv2+, LGPLv2.1+
+GST1_PLUGINS_BAD_LICENSE = LGPLv2+, LGPL-2.1+
GST1_PLUGINS_BAD_CONF_OPTS = \
--disable-examples \
diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index 6ab63a3..acb475a 100644
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -9,7 +9,7 @@ GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base
GST1_PLUGINS_BASE_INSTALL_STAGING = YES
GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB
-GST1_PLUGINS_BASE_LICENSE = LGPLv2+, LGPLv2.1+
+GST1_PLUGINS_BASE_LICENSE = LGPLv2+, LGPL-2.1+
# freetype is only used by examples, but if it is not found
# and the host has a freetype-config script, then the host
diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
index e25149a..69bb716 100644
--- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
@@ -8,7 +8,7 @@ GST1_PLUGINS_GOOD_VERSION = 1.10.4
GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good
GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
-GST1_PLUGINS_GOOD_LICENSE = LGPLv2.1+
+GST1_PLUGINS_GOOD_LICENSE = LGPL-2.1+
GST1_PLUGINS_GOOD_CONF_OPTS = \
--disable-valgrind \
diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
index 16ba229..b0d9a65 100644
--- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -9,7 +9,7 @@ GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly
GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
# GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled.
-GST1_PLUGINS_UGLY_LICENSE = LGPLv2.1+
+GST1_PLUGINS_UGLY_LICENSE = LGPL-2.1+
GST1_PLUGINS_UGLY_CONF_OPTS = --disable-examples --disable-valgrind
diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk
index 89f063d..8cb51bf 100644
--- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk
+++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk
@@ -7,7 +7,7 @@
GST1_VAAPI_VERSION = 1.10.4
GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi
GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz
-GST1_VAAPI_LICENSE = LGPLv2.1+
+GST1_VAAPI_LICENSE = LGPL-2.1+
GST1_VAAPI_LICENSE_FILES = COPYING.LIB
GST1_VAAPI_DEPENDENCIES += \
diff --git a/package/gstreamer1/gst1-validate/gst1-validate.mk b/package/gstreamer1/gst1-validate/gst1-validate.mk
index cf7a8af..f108e5d 100644
--- a/package/gstreamer1/gst1-validate/gst1-validate.mk
+++ b/package/gstreamer1/gst1-validate/gst1-validate.mk
@@ -7,7 +7,7 @@
GST1_VALIDATE_VERSION = 1.10.4
GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz
GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate
-GST1_VALIDATE_LICENSE = LGPLv2.1+
+GST1_VALIDATE_LICENSE = LGPL-2.1+
GST1_VALIDATE_LICENSE_FILES = COPYING
GST1_VALIDATE_CONF_OPTS = --disable-sphinx-doc
diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
index 5a0a369..08a736d 100644
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -9,7 +9,7 @@ GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer
GSTREAMER1_INSTALL_STAGING = YES
GSTREAMER1_LICENSE_FILES = COPYING
-GSTREAMER1_LICENSE = LGPLv2+, LGPLv2.1+
+GSTREAMER1_LICENSE = LGPLv2+, LGPL-2.1+
GSTREAMER1_CONF_OPTS = \
--disable-examples \
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index 9b285f6..5f14594 100644
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -9,7 +9,7 @@ GTK2_ENGINES_VERSION = $(GTK2_ENGINES_VERSION_MAJOR).2
GTK2_ENGINES_SOURCE = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2
GTK2_ENGINES_SITE = http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR)
GTK2_ENGINES_DEPENDENCIES = libgtk2 host-intltool
-GTK2_ENGINES_LICENSE = LGPLv2.1+
+GTK2_ENGINES_LICENSE = LGPL-2.1+
GTK2_ENGINES_LICENSE_FILES = COPYING
GTK2_ENGINES_CONF_ENV = \
diff --git a/package/gtkmm3/gtkmm3.mk b/package/gtkmm3/gtkmm3.mk
index 81a933b..0098891 100644
--- a/package/gtkmm3/gtkmm3.mk
+++ b/package/gtkmm3/gtkmm3.mk
@@ -8,7 +8,7 @@ GTKMM3_VERSION_MAJOR = 3.22
GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).0
GTKMM3_SOURCE = gtkmm-$(GTKMM3_VERSION).tar.xz
GTKMM3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(GTKMM3_VERSION_MAJOR)
-GTKMM3_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (tools)
+GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
GTKMM3_LICENSE_FILES = COPYING COPYING.tools
GTKMM3_INSTALL_STAGING = YES
GTKMM3_DEPENDENCIES = atkmm cairomm glibmm libgtk3 libsigc pangomm host-pkgconf
diff --git a/package/gtksourceview/gtksourceview.mk b/package/gtksourceview/gtksourceview.mk
index 5e4ca0d..290effb 100644
--- a/package/gtksourceview/gtksourceview.mk
+++ b/package/gtksourceview/gtksourceview.mk
@@ -9,7 +9,7 @@ GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).2
GTKSOURCEVIEW_SOURCE = gtksourceview-$(GTKSOURCEVIEW_VERSION).tar.xz
GTKSOURCEVIEW_SITE = \
http://ftp.gnome.org/pub/gnome/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR)
-GTKSOURCEVIEW_LICENSE = LGPLv2.1+
+GTKSOURCEVIEW_LICENSE = LGPL-2.1+
GTKSOURCEVIEW_LICENSE_FILES = COPYING
GTKSOURCEVIEW_INSTALL_STAGING = YES
GTKSOURCEVIEW_DEPENDENCIES = host-pkgconf libglib2 libxml2 libgtk3
diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
index 075ce97..b9771e8 100644
--- a/package/igh-ethercat/igh-ethercat.mk
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -7,7 +7,7 @@
IGH_ETHERCAT_VERSION = 1.5.2
IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat
IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
-IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPLv2.1 (libraries)
+IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPL-2.1 (libraries)
IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER
IGH_ETHERCAT_INSTALL_STAGING = YES
diff --git a/package/imx-usb-loader/imx-usb-loader.mk b/package/imx-usb-loader/imx-usb-loader.mk
index 0cd9637..1d2c23f 100644
--- a/package/imx-usb-loader/imx-usb-loader.mk
+++ b/package/imx-usb-loader/imx-usb-loader.mk
@@ -6,7 +6,7 @@
IMX_USB_LOADER_VERSION = 9b0e81cf9511c3a27cf635407714caa2793b570c
IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION))
-IMX_USB_LOADER_LICENSE = LGPLv2.1+
+IMX_USB_LOADER_LICENSE = LGPL-2.1+
IMX_USB_LOADER_LICENSE_FILES = COPYING
HOST_IMX_USB_LOADER_DEPENDENCIES = host-libusb host-pkgconf
diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk
index c877528..c57ad0e 100644
--- a/package/jack2/jack2.mk
+++ b/package/jack2/jack2.mk
@@ -6,7 +6,7 @@
JACK2_VERSION = v1.9.10
JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION))
-JACK2_LICENSE = GPL-2.0+ (jack server), LGPLv2.1+ (jack library)
+JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library)
JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python
JACK2_INSTALL_STAGING = YES
JACK2_PATCH = https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch
diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk
index c0db671..db22dc9 100644
--- a/package/json-glib/json-glib.mk
+++ b/package/json-glib/json-glib.mk
@@ -8,7 +8,7 @@ JSON_GLIB_VERSION_MAJOR = 1.2
JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).8
JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR)
JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz
-JSON_GLIB_LICENSE = LGPLv2.1+
+JSON_GLIB_LICENSE = LGPL-2.1+
JSON_GLIB_LICENSE_FILES = COPYING
JSON_GLIB_INSTALL_STAGING = YES
diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
index b7f08ce..81006ac 100644
--- a/package/keyutils/keyutils.mk
+++ b/package/keyutils/keyutils.mk
@@ -7,7 +7,7 @@
KEYUTILS_VERSION = 1.5.9
KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
-KEYUTILS_LICENSE = GPL-2.0+, LGPLv2.1+
+KEYUTILS_LICENSE = GPL-2.0+, LGPL-2.1+
KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
KEYUTILS_INSTALL_STAGING = YES
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index e2fbfa8..bd67610 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -12,7 +12,7 @@ KMOD_DEPENDENCIES = host-pkgconf
HOST_KMOD_DEPENDENCIES = host-pkgconf
# license info for libkmod only, conditionally add more below
-KMOD_LICENSE = LGPLv2.1+ (library)
+KMOD_LICENSE = LGPL-2.1+ (library)
KMOD_LICENSE_FILES = libkmod/COPYING
# --gc-sections triggers binutils ld segfault
diff --git a/package/lcdapi/lcdapi.mk b/package/lcdapi/lcdapi.mk
index 7539042..453f4b9 100644
--- a/package/lcdapi/lcdapi.mk
+++ b/package/lcdapi/lcdapi.mk
@@ -6,7 +6,7 @@
LCDAPI_VERSION = v0.10
LCDAPI_SITE = $(call github,spdawson,lcdapi,$(LCDAPI_VERSION))
-LCDAPI_LICENSE = LGPLv2.1+
+LCDAPI_LICENSE = LGPL-2.1+
LCDAPI_LICENSE_FILES = COPYING
LCDAPI_AUTORECONF = YES
LCDAPI_INSTALL_STAGING = YES
diff --git a/package/leafnode2/leafnode2.mk b/package/leafnode2/leafnode2.mk
index 0c20fd0..92039c1 100644
--- a/package/leafnode2/leafnode2.mk
+++ b/package/leafnode2/leafnode2.mk
@@ -7,7 +7,7 @@
LEAFNODE2_VERSION = 2.0.0.alpha20140727b
LEAFNODE2_SOURCE = leafnode-$(LEAFNODE2_VERSION).tar.bz2
LEAFNODE2_SITE = http://krusty.dt.e-technik.tu-dortmund.de/~ma/leafnode/beta
-LEAFNODE2_LICENSE = LGPLv2.1
+LEAFNODE2_LICENSE = LGPL-2.1
LEAFNODE2_LICENSE_FILES = COPYING COPYING.LGPL
LEAFNODE2_DEPENDENCIES = host-pcre pcre
diff --git a/package/libaacs/libaacs.mk b/package/libaacs/libaacs.mk
index df61154..a73dac6 100644
--- a/package/libaacs/libaacs.mk
+++ b/package/libaacs/libaacs.mk
@@ -7,7 +7,7 @@
LIBAACS_VERSION = 0.8.1
LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION)
LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2
-LIBAACS_LICENSE = LGPLv2.1+
+LIBAACS_LICENSE = LGPL-2.1+
LIBAACS_LICENSE_FILES = COPYING
LIBAACS_INSTALL_STAGING = YES
LIBAACS_DEPENDENCIES = host-bison host-flex libgcrypt
diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk
index 5ebe1b7..03029d8 100644
--- a/package/libaio/libaio.mk
+++ b/package/libaio/libaio.mk
@@ -8,7 +8,7 @@ LIBAIO_VERSION = 0.3.110
LIBAIO_SOURCE = libaio_$(LIBAIO_VERSION).orig.tar.gz
LIBAIO_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/liba/libaio
LIBAIO_INSTALL_STAGING = YES
-LIBAIO_LICENSE = LGPLv2.1+
+LIBAIO_LICENSE = LGPL-2.1+
LIBAIO_LICENSE_FILES = COPYING
LIBAIO_CONFIGURE_OPTS = $(TARGET_CONFIGURE_OPTS)
diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk
index 8c74e2b..0e3aca3 100644
--- a/package/libassuan/libassuan.mk
+++ b/package/libassuan/libassuan.mk
@@ -7,7 +7,7 @@
LIBASSUAN_VERSION = 2.4.3
LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan
LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2
-LIBASSUAN_LICENSE = LGPLv2.1+ (library), GPL-3.0 (tests, doc)
+LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc)
LIBASSUAN_LICENSE_FILES = COPYING.LIB COPYING
LIBASSUAN_INSTALL_STAGING = YES
LIBASSUAN_DEPENDENCIES = libgpg-error
diff --git a/package/libatasmart/libatasmart.mk b/package/libatasmart/libatasmart.mk
index 9e5de97..1d4eeaa 100644
--- a/package/libatasmart/libatasmart.mk
+++ b/package/libatasmart/libatasmart.mk
@@ -7,7 +7,7 @@
LIBATASMART_VERSION = 0.19
LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz
LIBATASMART_SITE = http://0pointer.de/public
-LIBATASMART_LICENSE = LGPLv2.1
+LIBATASMART_LICENSE = LGPL-2.1
LIBATASMART_LICENSE_FILES = LGPL
LIBATASMART_INSTALL_STAGING = YES
diff --git a/package/libbdplus/libbdplus.mk b/package/libbdplus/libbdplus.mk
index 45913ed..b0e8b14 100644
--- a/package/libbdplus/libbdplus.mk
+++ b/package/libbdplus/libbdplus.mk
@@ -7,7 +7,7 @@
LIBBDPLUS_VERSION = 0.1.2
LIBBDPLUS_SITE = http://download.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION)
LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2
-LIBBDPLUS_LICENSE = LGPLv2.1+
+LIBBDPLUS_LICENSE = LGPL-2.1+
LIBBDPLUS_LICENSE_FILES = COPYING
LIBBDPLUS_INSTALL_STAGING = YES
LIBBDPLUS_DEPENDENCIES = libgcrypt
diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk
index adce8c4..8268281 100644
--- a/package/libbluray/libbluray.mk
+++ b/package/libbluray/libbluray.mk
@@ -8,7 +8,7 @@ LIBBLURAY_VERSION = 1.0.0
LIBBLURAY_SITE = http://get.videolan.org/libbluray/$(LIBBLURAY_VERSION)
LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2
LIBBLURAY_INSTALL_STAGING = YES
-LIBBLURAY_LICENSE = LGPLv2.1+
+LIBBLURAY_LICENSE = LGPL-2.1+
LIBBLURAY_LICENSE_FILES = COPYING
LIBBLURAY_DEPENDENCIES = host-pkgconf
diff --git a/package/libbroadvoice/libbroadvoice.mk b/package/libbroadvoice/libbroadvoice.mk
index c18d3d2..9c6b4e2 100644
--- a/package/libbroadvoice/libbroadvoice.mk
+++ b/package/libbroadvoice/libbroadvoice.mk
@@ -11,7 +11,7 @@ LIBBROADVOICE_VERSION = f65b0f50c8c767229fbf1758370880abc0d78564
# usable interface, on a range of platforms."
LIBBROADVOICE_SITE = https://freeswitch.org/stash/scm/sd/libbroadvoice.git
LIBBROADVOICE_SITE_METHOD = git
-LIBBROADVOICE_LICENSE = LGPLv2.1
+LIBBROADVOICE_LICENSE = LGPL-2.1
LIBBROADVOICE_LICENSE_FILES = COPYING
LIBBROADVOICE_AUTORECONF = YES
LIBBROADVOICE_INSTALL_STAGING = YES
diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk
index 372dc92..568f167 100644
--- a/package/libcap-ng/libcap-ng.mk
+++ b/package/libcap-ng/libcap-ng.mk
@@ -6,7 +6,7 @@
LIBCAP_NG_VERSION = 0.7.8
LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng
-LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (library)
+LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB
LIBCAP_NG_INSTALL_STAGING = YES
diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk
index 7cb3417..de2a1e4 100644
--- a/package/libcgi/libcgi.mk
+++ b/package/libcgi/libcgi.mk
@@ -10,6 +10,6 @@ LIBCGI_INSTALL_STAGING = YES
# use cross CC/AR rather than host
LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)" \
$(if $(BR2_STATIC_LIBS),STATIC=1)
-LIBCGI_LICENSE = LGPLv2.1+
+LIBCGI_LICENSE = LGPL-2.1+
$(eval $(autotools-package))
diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
index a4c3084..3845627 100644
--- a/package/libcgroup/libcgroup.mk
+++ b/package/libcgroup/libcgroup.mk
@@ -7,7 +7,7 @@
LIBCGROUP_VERSION = 0.41
LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
LIBCGROUP_SITE = http://downloads.sourceforge.net/project/libcg/libcgroup/v$(LIBCGROUP_VERSION)
-LIBCGROUP_LICENSE = LGPLv2.1
+LIBCGROUP_LICENSE = LGPL-2.1
LIBCGROUP_LICENSE_FILES = COPYING
LIBCGROUP_DEPENDENCIES = host-bison host-flex
LIBCGROUP_INSTALL_STAGING = YES
diff --git a/package/libcli/libcli.mk b/package/libcli/libcli.mk
index 17eed79..0fef008 100644
--- a/package/libcli/libcli.mk
+++ b/package/libcli/libcli.mk
@@ -6,7 +6,7 @@
LIBCLI_VERSION = c63c9d35144939c8b4fa3c5394aed2e29ff517b0
LIBCLI_SITE = $(call github,dparrish,libcli,$(LIBCLI_VERSION))
-LIBCLI_LICENSE = LGPLv2.1
+LIBCLI_LICENSE = LGPL-2.1
LIBCLI_LICENSE_FILES = COPYING
LIBCLI_INSTALL_STAGING = YES
diff --git a/package/libcodec2/libcodec2.mk b/package/libcodec2/libcodec2.mk
index 73f98ca..7329b99 100644
--- a/package/libcodec2/libcodec2.mk
+++ b/package/libcodec2/libcodec2.mk
@@ -7,7 +7,7 @@
LIBCODEC2_VERSION = 392a55b4f3f8ad30d845ac6ae35e8b27343bb944
LIBCODEC2_SITE = https://freeswitch.org/stash/scm/sd/libcodec2.git
LIBCODEC2_SITE_METHOD = git
-LIBCODEC2_LICENSE = LGPLv2.1
+LIBCODEC2_LICENSE = LGPL-2.1
LIBCODEC2_LICENSE_FILES = COPYING
LIBCODEC2_AUTORECONF = YES
LIBCODEC2_INSTALL_STAGING = YES
diff --git a/package/libcofi/libcofi.mk b/package/libcofi/libcofi.mk
index 90daff2..e611db6 100644
--- a/package/libcofi/libcofi.mk
+++ b/package/libcofi/libcofi.mk
@@ -6,7 +6,7 @@
LIBCOFI_VERSION = 7313fbe12b0593034d0a1b606bf33c7cf4ababce
LIBCOFI_SITE = $(call github,simonjhall,copies-and-fills,$(LIBCOFI_VERSION))
-LIBCOFI_LICENSE = LGPLv2.1
+LIBCOFI_LICENSE = LGPL-2.1
LIBCOFI_LICENSE_FILES = README.md
define LIBCOFI_BUILD_CMDS
diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index f11937c..ed7e40f 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -6,7 +6,7 @@
LIBCONFIG_VERSION = 1.5
LIBCONFIG_SITE = http://www.hyperrealm.com/libconfig
-LIBCONFIG_LICENSE = LGPLv2.1+
+LIBCONFIG_LICENSE = LGPL-2.1+
LIBCONFIG_LICENSE_FILES = COPYING.LIB
LIBCONFIG_INSTALL_STAGING = YES
LIBCONFIG_CONF_OPTS = --disable-examples
diff --git a/package/libcroco/libcroco.mk b/package/libcroco/libcroco.mk
index 39dd527..5ea0b77 100644
--- a/package/libcroco/libcroco.mk
+++ b/package/libcroco/libcroco.mk
@@ -14,7 +14,7 @@ HOST_LIBCROCO_DEPENDENCIES = host-pkgconf host-libglib2 host-libxml2
LIBCROCO_CONFIG_SCRIPTS = croco-$(LIBCROCO_VERSION_MAJOR)-config
# NEWS states that it's only LGPL
# Source code says v2.1+ even though COPYING.LIB is v2
-LIBCROCO_LICENSE = LGPLv2.1+
+LIBCROCO_LICENSE = LGPL-2.1+
LIBCROCO_LICENSE_FILES = COPYING.LIB
$(eval $(autotools-package))
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
index 69dc0b7..a8f7510 100644
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -6,7 +6,7 @@
LIBDAEMON_VERSION = 0.14
LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon
-LIBDAEMON_LICENSE = LGPLv2.1+
+LIBDAEMON_LICENSE = LGPL-2.1+
LIBDAEMON_LICENSE_FILES = LICENSE
LIBDAEMON_INSTALL_STAGING = YES
LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no
diff --git a/package/libdcadec/libdcadec.mk b/package/libdcadec/libdcadec.mk
index 48e4a12..a5a98be 100644
--- a/package/libdcadec/libdcadec.mk
+++ b/package/libdcadec/libdcadec.mk
@@ -6,7 +6,7 @@
LIBDCADEC_VERSION = v0.2.0
LIBDCADEC_SITE = $(call github,foo86,dcadec,$(LIBDCADEC_VERSION))
-LIBDCADEC_LICENSE = LGPLv2.1+
+LIBDCADEC_LICENSE = LGPL-2.1+
LIBDCADEC_LICENSE_FILES = COPYING.LGPLv2.1
LIBDCADEC_INSTALL_STAGING = YES
diff --git a/package/libdvbpsi/libdvbpsi.mk b/package/libdvbpsi/libdvbpsi.mk
index 218c19e..9a0a4ac 100644
--- a/package/libdvbpsi/libdvbpsi.mk
+++ b/package/libdvbpsi/libdvbpsi.mk
@@ -7,7 +7,7 @@
LIBDVBPSI_VERSION = 1.3.0
LIBDVBPSI_SITE = http://download.videolan.org/pub/libdvbpsi/$(LIBDVBPSI_VERSION)
LIBDVBPSI_SOURCE = libdvbpsi-$(LIBDVBPSI_VERSION).tar.bz2
-LIBDVBPSI_LICENSE = LGPLv2.1+
+LIBDVBPSI_LICENSE = LGPL-2.1+
LIBDVBPSI_LICENSE_FILES = COPYING
LIBDVBPSI_INSTALL_STAGING = YES
diff --git a/package/libdvbsi/libdvbsi.mk b/package/libdvbsi/libdvbsi.mk
index f6469f9..bfddd64 100644
--- a/package/libdvbsi/libdvbsi.mk
+++ b/package/libdvbsi/libdvbsi.mk
@@ -8,7 +8,7 @@ LIBDVBSI_VERSION = 0.3.7
LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2
LIBDVBSI_SITE = http://www.saftware.de/libdvbsi++
LIBDVBSI_INSTALL_STAGING = YES
-LIBDVBSI_LICENSE = LGPLv2.1
+LIBDVBSI_LICENSE = LGPL-2.1
LIBDVBSI_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libebml/libebml.mk b/package/libebml/libebml.mk
index 36c8a5c..8c5dee3 100644
--- a/package/libebml/libebml.mk
+++ b/package/libebml/libebml.mk
@@ -8,7 +8,7 @@ LIBEBML_VERSION = 1.3.3
LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.bz2
LIBEBML_SITE = http://dl.matroska.org/downloads/libebml
LIBEBML_INSTALL_STAGING = YES
-LIBEBML_LICENSE = LGPLv2.1+
+LIBEBML_LICENSE = LGPL-2.1+
LIBEBML_LICENSE_FILES = LICENSE.LGPL
$(eval $(autotools-package))
diff --git a/package/libee/libee.mk b/package/libee/libee.mk
index 23441bc..9879eff 100644
--- a/package/libee/libee.mk
+++ b/package/libee/libee.mk
@@ -6,7 +6,7 @@
LIBEE_VERSION = 0.4.1
LIBEE_SITE = http://www.libee.org/download/files/download
-LIBEE_LICENSE = LGPLv2.1+
+LIBEE_LICENSE = LGPL-2.1+
LIBEE_LICENSE_FILES = COPYING
LIBEE_DEPENDENCIES = libestr host-pkgconf
LIBEE_INSTALL_STAGING = YES
diff --git a/package/libesmtp/libesmtp.mk b/package/libesmtp/libesmtp.mk
index a00d371..b0f88c7 100644
--- a/package/libesmtp/libesmtp.mk
+++ b/package/libesmtp/libesmtp.mk
@@ -10,7 +10,7 @@ LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp
LIBESMTP_INSTALL_STAGING = YES
LIBESMTP_CONFIG_SCRIPTS = libesmtp-config
LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
-LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPLv2.1+ (library)
+LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library)
LIBESMTP_LICENSE_FILES = COPYING COPYING.LIB
$(eval $(autotools-package))
diff --git a/package/libestr/libestr.mk b/package/libestr/libestr.mk
index e9783d3..dcd2094 100644
--- a/package/libestr/libestr.mk
+++ b/package/libestr/libestr.mk
@@ -6,7 +6,7 @@
LIBESTR_VERSION = 0.1.10
LIBESTR_SITE = http://libestr.adiscon.com/files/download
-LIBESTR_LICENSE = LGPLv2.1+
+LIBESTR_LICENSE = LGPL-2.1+
LIBESTR_LICENSE_FILES = COPYING
LIBESTR_INSTALL_STAGING = YES
diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk
index a71c117..a4ec5ed 100644
--- a/package/libexif/libexif.mk
+++ b/package/libexif/libexif.mk
@@ -9,7 +9,7 @@ LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2
LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION)
LIBEXIF_INSTALL_STAGING = YES
LIBEXIF_DEPENDENCIES = host-pkgconf
-LIBEXIF_LICENSE = LGPLv2.1+
+LIBEXIF_LICENSE = LGPL-2.1+
LIBEXIF_LICENSE_FILES = COPYING
$(eval $(autotools-package))
--git a/package/libfm-extra/libfm-extra.mk b/package/libfm-extra/libfm-extra.mk
index e5ef2f7..67d6dc1 100644
--- a/package/libfm-extra/libfm-extra.mk
+++ b/package/libfm-extra/libfm-extra.mk
@@ -8,7 +8,7 @@ LIBFM_EXTRA_VERSION = 1.2.4
LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz
LIBFM_EXTRA_SITE = http://sourceforge.net/projects/pcmanfm/files
LIBFM_EXTRA_DEPENDENCIES = libglib2 host-intltool
-LIBFM_EXTRA_LICENSE = GPL-2.0+, LGPLv2.1+
+LIBFM_EXTRA_LICENSE = GPL-2.0+, LGPL-2.1+
LIBFM_EXTRA_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
LIBFM_EXTRA_INSTALL_STAGING = YES
LIBFM_EXTRA_CONF_OPTS = --with-extra-only --with-gtk=no
diff --git a/package/libfm/libfm.mk b/package/libfm/libfm.mk
index a6c0e74..36d8b57 100644
--- a/package/libfm/libfm.mk
+++ b/package/libfm/libfm.mk
@@ -8,7 +8,7 @@ LIBFM_VERSION = 1.2.4
LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
LIBFM_DEPENDENCIES = menu-cache libglib2 cairo
-LIBFM_LICENSE = GPL-2.0+, LGPLv2.1+
+LIBFM_LICENSE = GPL-2.0+, LGPL-2.1+
LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
LIBFM_INSTALL_STAGING = YES
diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk
index 751a1b6..a7a8519 100644
--- a/package/libfribidi/libfribidi.mk
+++ b/package/libfribidi/libfribidi.mk
@@ -7,7 +7,7 @@
LIBFRIBIDI_VERSION = 0.19.7
LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.bz2
LIBFRIBIDI_SITE = http://www.fribidi.org/download
-LIBFRIBIDI_LICENSE = LGPLv2.1+
+LIBFRIBIDI_LICENSE = LGPL-2.1+
LIBFRIBIDI_LICENSE_FILES = COPYING
LIBFRIBIDI_INSTALL_STAGING = YES
# Ships a beta libtool version hence our patch doesn't apply.
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
index cf6912c..dc177d0 100644
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -7,7 +7,7 @@
LIBFUSE_VERSION = 2.9.7
LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION)
-LIBFUSE_LICENSE = GPL-2.0, LGPLv2.1
+LIBFUSE_LICENSE = GPL-2.0, LGPL-2.1
LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
LIBFUSE_INSTALL_STAGING = YES
LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index a034358..0ae4c6f 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -6,7 +6,7 @@
LIBGCRYPT_VERSION = 1.7.6
LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
-LIBGCRYPT_LICENSE = LGPLv2.1+
+LIBGCRYPT_LICENSE = LGPL-2.1+
LIBGCRYPT_LICENSE_FILES = COPYING.LIB
LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt
LIBGCRYPT_INSTALL_STAGING = YES
diff --git a/package/libgee/libgee.mk b/package/libgee/libgee.mk
index 1df54d2..9d87169 100644
--- a/package/libgee/libgee.mk
+++ b/package/libgee/libgee.mk
@@ -10,7 +10,7 @@ LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJ
LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz
LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2
LIBGEE_INSTALL_STAGING = YES
-LIBGEE_LICENSE = LGPLv2.1+
+LIBGEE_LICENSE = LGPL-2.1+
LIBGEE_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk
index 8f25491..183654b 100644
--- a/package/libgpg-error/libgpg-error.mk
+++ b/package/libgpg-error/libgpg-error.mk
@@ -6,7 +6,7 @@
LIBGPG_ERROR_VERSION = 1.27
LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
-LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPLv2.1+
+LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+
LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB
LIBGPG_ERROR_INSTALL_STAGING = YES
LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk
index 84f4d22..09b6fbe 100644
--- a/package/libgpgme/libgpgme.mk
+++ b/package/libgpgme/libgpgme.mk
@@ -7,7 +7,7 @@
LIBGPGME_VERSION = 1.7.1
LIBGPGME_SITE = ftp://ftp.gnupg.org/gcrypt/gpgme
LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2
-LIBGPGME_LICENSE = LGPLv2.1+
+LIBGPGME_LICENSE = LGPL-2.1+
LIBGPGME_LICENSE_FILES = COPYING.LESSER
LIBGPGME_INSTALL_STAGING = YES
LIBGPGME_DEPENDENCIES = libassuan libgpg-error
diff --git a/package/libgsasl/libgsasl.mk b/package/libgsasl/libgsasl.mk
index 057138d..9a62543 100644
--- a/package/libgsasl/libgsasl.mk
+++ b/package/libgsasl/libgsasl.mk
@@ -6,7 +6,7 @@
LIBGSASL_VERSION = 1.8.0
LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl
-LIBGSASL_LICENSE = LGPLv2.1+ (library), GPL-3.0+ (programs)
+LIBGSASL_LICENSE = LGPL-2.1+ (library), GPL-3.0+ (programs)
LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING
LIBGSASL_INSTALL_STAGING = YES
# It doesn't seem to build with our libgcrypt so better be safe
diff --git a/package/libgudev/libgudev.mk b/package/libgudev/libgudev.mk
index dce9cd8..fce710a 100644
--- a/package/libgudev/libgudev.mk
+++ b/package/libgudev/libgudev.mk
@@ -9,7 +9,7 @@ LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz
LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION)
LIBGUDEV_INSTALL_STAGING = YES
LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2
-LIBGUDEV_LICENSE = LGPLv2.1+
+LIBGUDEV_LICENSE = LGPL-2.1+
LIBGUDEV_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libhdhomerun/libhdhomerun.mk b/package/libhdhomerun/libhdhomerun.mk
index 16e34c2..a68d928 100644
--- a/package/libhdhomerun/libhdhomerun.mk
+++ b/package/libhdhomerun/libhdhomerun.mk
@@ -7,7 +7,7 @@
LIBHDHOMERUN_VERSION = 20150826
LIBHDHOMERUN_SOURCE = libhdhomerun_$(LIBHDHOMERUN_VERSION).tgz
LIBHDHOMERUN_SITE = http://download.silicondust.com/hdhomerun
-LIBHDHOMERUN_LICENSE = LGPLv2.1+
+LIBHDHOMERUN_LICENSE = LGPL-2.1+
LIBHDHOMERUN_LICENSE_FILES = lgpl.txt
LIBHDHOMERUN_INSTALL_STAGING = YES
diff --git a/package/libical/libical.mk b/package/libical/libical.mk
index a511039..3793429 100644
--- a/package/libical/libical.mk
+++ b/package/libical/libical.mk
@@ -7,7 +7,7 @@
LIBICAL_VERSION = 1.0.1
LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_VERSION)
LIBICAL_INSTALL_STAGING = YES
-LIBICAL_LICENSE = MPLv1.0 or LGPLv2.1
+LIBICAL_LICENSE = MPLv1.0 or LGPL-2.1
LIBICAL_LICENSE_FILES = LICENSE
# building without this option is broken, it is used by
diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk
index aaa6c70..35eb23d 100644
--- a/package/libiio/libiio.mk
+++ b/package/libiio/libiio.mk
@@ -7,7 +7,7 @@
LIBIIO_VERSION = 0.9
LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION))
LIBIIO_INSTALL_STAGING = YES
-LIBIIO_LICENSE = LGPLv2.1+
+LIBIIO_LICENSE = LGPL-2.1+
LIBIIO_LICENSE_FILES = COPYING.txt
LIBIIO_CONF_OPTS = -DENABLE_IPV6=ON \
diff --git a/package/libimxvpuapi/libimxvpuapi.mk b/package/libimxvpuapi/libimxvpuapi.mk
index d368d3d..bcabbf3 100644
--- a/package/libimxvpuapi/libimxvpuapi.mk
+++ b/package/libimxvpuapi/libimxvpuapi.mk
@@ -6,7 +6,7 @@
LIBIMXVPUAPI_VERSION = 0.10.3
LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION))
-LIBIMXVPUAPI_LICENSE = LGPLv2.1+
+LIBIMXVPUAPI_LICENSE = LGPL-2.1+
LIBIMXVPUAPI_LICENSE_FILES = LICENSE
LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu
LIBIMXVPUAPI_INSTALL_STAGING = YES
diff --git a/package/libiqrf/libiqrf.mk b/package/libiqrf/libiqrf.mk
index 0531602..f403a5e 100644
--- a/package/libiqrf/libiqrf.mk
+++ b/package/libiqrf/libiqrf.mk
@@ -8,6 +8,6 @@ LIBIQRF_VERSION = v0.1.2
LIBIQRF_SITE = $(call github,nandra,libiqrf,$(LIBIQRF_VERSION))
LIBIQRF_INSTALL_STAGING = YES
LIBIQRF_DEPENDENCIES = libusb
-LIBIQRF_LICENSE = LGPLv2.1+
+LIBIQRF_LICENSE = LGPL-2.1+
$(eval $(cmake-package))
diff --git a/package/libiscsi/libiscsi.mk b/package/libiscsi/libiscsi.mk
index 7ce6a47..6c86008 100644
--- a/package/libiscsi/libiscsi.mk
+++ b/package/libiscsi/libiscsi.mk
@@ -6,7 +6,7 @@
LIBISCSI_VERSION = 1.18.0
LIBISCSI_SITE = $(call github,sahlberg,libiscsi,$(LIBISCSI_VERSION))
-LIBISCSI_LICENSE = GPL-2.0+, LGPLv2.1+
+LIBISCSI_LICENSE = GPL-2.0+, LGPL-2.1+
LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt
LIBISCSI_INSTALL_STAGING = YES
LIBISCSI_AUTORECONF = YES
diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk
index a6b9075..3c852be 100644
--- a/package/liblo/liblo.mk
+++ b/package/liblo/liblo.mk
@@ -7,7 +7,7 @@
LIBLO_VERSION = 0.26
LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION)
-LIBLO_LICENSE = LGPLv2.1+
+LIBLO_LICENSE = LGPL-2.1+
LIBLO_LICENSE_FILES = COPYING
LIBLO_INSTALL_STAGING = YES
diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
index bc6d1ab..fba0d4f 100644
--- a/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -10,7 +10,7 @@ LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
LIBLOG4C_LOCALTIME_CONF_OPTS = --disable-expattest
LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
LIBLOG4C_LOCALTIME_CONFIG_SCRIPTS = log4c-config
-LIBLOG4C_LOCALTIME_LICENSE = LGPLv2.1
+LIBLOG4C_LOCALTIME_LICENSE = LGPL-2.1
LIBLOG4C_LOCALTIME_LICENSE_FILES = COPYING
LIBLOG4C_LOCALTIME_AUTORECONF = YES
diff --git a/package/libmatroska/libmatroska.mk b/package/libmatroska/libmatroska.mk
index 083cced..18ea505 100644
--- a/package/libmatroska/libmatroska.mk
+++ b/package/libmatroska/libmatroska.mk
@@ -8,7 +8,7 @@ LIBMATROSKA_VERSION = 1.4.4
LIBMATROSKA_SOURCE = libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
LIBMATROSKA_SITE = http://dl.matroska.org/downloads/libmatroska
LIBMATROSKA_INSTALL_STAGING = YES
-LIBMATROSKA_LICENSE = LGPLv2.1+
+LIBMATROSKA_LICENSE = LGPL-2.1+
LIBMATROSKA_LICENSE_FILES = LICENSE.LGPL
LIBMATROSKA_DEPENDENCIES = libebml host-pkgconf
diff --git a/package/libmcrypt/libmcrypt.mk b/package/libmcrypt/libmcrypt.mk
index 1a2645b..e93f013 100644
--- a/package/libmcrypt/libmcrypt.mk
+++ b/package/libmcrypt/libmcrypt.mk
@@ -8,7 +8,7 @@ LIBMCRYPT_VERSION = 2.5.8
LIBMCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$(LIBMCRYPT_VERSION)
LIBMCRYPT_AUTORECONF = YES
LIBMCRYPT_INSTALL_STAGING = YES
-LIBMCRYPT_LICENSE = LGPLv2.1
+LIBMCRYPT_LICENSE = LGPL-2.1
LIBMCRYPT_LICENSE_FILES = COPYING.LIB
LIBMCRYPT_CONFIG_SCRIPTS = libmcrypt-config
diff --git a/package/libmediaart/libmediaart.mk b/package/libmediaart/libmediaart.mk
index 31f5675..e98ec3a 100644
--- a/package/libmediaart/libmediaart.mk
+++ b/package/libmediaart/libmediaart.mk
@@ -9,7 +9,7 @@ LIBMEDIAART_VERSION = $(LIBMEDIAART_VERSION_MAJOR).1
LIBMEDIAART_SOURCE = libmediaart-$(LIBMEDIAART_VERSION).tar.xz
LIBMEDIAART_SITE = \
http://ftp.gnome.org/pub/gnome/sources/libmediaart/$(LIBMEDIAART_VERSION_MAJOR)
-LIBMEDIAART_LICENSE = LGPLv2.1+
+LIBMEDIAART_LICENSE = LGPL-2.1+
LIBMEDIAART_LICENSE_FILES = COPYING.LESSER
LIBMEDIAART_INSTALL_STAGING = YES
LIBMEDIAART_DEPENDENCIES = libglib2
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index 83791b3..785e886 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -22,13 +22,13 @@ endif
LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)"
ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
-LIBMICROHTTPD_LICENSE = LGPLv2.1+
+LIBMICROHTTPD_LICENSE = LGPL-2.1+
LIBMICROHTTPD_DEPENDENCIES += host-pkgconf gnutls libgcrypt
LIBMICROHTTPD_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs gnutls`"
LIBMICROHTTPD_CONF_OPTS += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr
else
-LIBMICROHTTPD_LICENSE = LGPLv2.1+ or eCos
+LIBMICROHTTPD_LICENSE = LGPL-2.1+ or eCos
LIBMICROHTTPD_CONF_OPTS += --disable-https
endif
diff --git a/package/libmms/libmms.mk b/package/libmms/libmms.mk
index 01c8d67..dd0b1df 100644
--- a/package/libmms/libmms.mk
+++ b/package/libmms/libmms.mk
@@ -8,7 +8,7 @@ LIBMMS_VERSION = 0.6.2
LIBMMS_SITE = http://downloads.sourceforge.net/project/libmms/libmms/$(LIBMMS_VERSION)
LIBMMS_INSTALL_STAGING = YES
LIBMMS_DEPENDENCIES = host-pkgconf libglib2
-LIBMMS_LICENSE = LGPLv2.1+
+LIBMMS_LICENSE = LGPL-2.1+
LIBMMS_LICENSE_FILES = COPYING.LIB
$(eval $(autotools-package))
diff --git a/package/libmnl/libmnl.mk b/package/libmnl/libmnl.mk
index 407c4f1..7fcce4c 100644
--- a/package/libmnl/libmnl.mk
+++ b/package/libmnl/libmnl.mk
@@ -8,7 +8,7 @@ LIBMNL_VERSION = 1.0.4
LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
LIBMNL_INSTALL_STAGING = YES
-LIBMNL_LICENSE = LGPLv2.1+
+LIBMNL_LICENSE = LGPL-2.1+
LIBMNL_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk
index 1f8c730..6f0f342 100644
--- a/package/libmodbus/libmodbus.mk
+++ b/package/libmodbus/libmodbus.mk
@@ -6,7 +6,7 @@
LIBMODBUS_VERSION = 3.0.6
LIBMODBUS_SITE = http://libmodbus.org/releases
-LIBMODBUS_LICENSE = LGPLv2.1+
+LIBMODBUS_LICENSE = LGPL-2.1+
LIBMODBUS_LICENSE_FILES = COPYING.LESSER
LIBMODBUS_INSTALL_STAGING = YES
diff --git a/package/libndp/libndp.mk b/package/libndp/libndp.mk
index c880b7e..4fa1d33 100644
--- a/package/libndp/libndp.mk
+++ b/package/libndp/libndp.mk
@@ -6,7 +6,7 @@
LIBNDP_VERSION = v1.5
LIBNDP_SITE = $(call github,jpirko,libndp,$(LIBNDP_VERSION))
-LIBNDP_LICENSE = LGPLv2.1+
+LIBNDP_LICENSE = LGPL-2.1+
LIBNDP_LICENSE_FILES = COPYING
LIBNDP_AUTORECONF = YES
LIBNDP_INSTALL_STAGING = YES
diff --git a/package/libnetfilter_acct/libnetfilter_acct.mk b/package/libnetfilter_acct/libnetfilter_acct.mk
index c2fa234..e791f6f 100644
--- a/package/libnetfilter_acct/libnetfilter_acct.mk
+++ b/package/libnetfilter_acct/libnetfilter_acct.mk
@@ -9,7 +9,7 @@ LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz
LIBNETFILTER_ACCT_SITE = http://www.netfilter.org/projects/libnetfilter_acct/files
LIBNETFILTER_ACCT_INSTALL_STAGING = YES
LIBNETFILTER_ACCT_DEPENDENCIES = host-pkgconf libmnl
-LIBNETFILTER_ACCT_LICENSE = LGPLv2.1+
+LIBNETFILTER_ACCT_LICENSE = LGPL-2.1+
LIBNETFILTER_ACCT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk
index e49656b..b66a9be 100644
--- a/package/libnfs/libnfs.mk
+++ b/package/libnfs/libnfs.mk
@@ -9,7 +9,7 @@ LIBNFS_SITE = $(call github,sahlberg,libnfs,$(LIBNFS_VERSION))
LIBNFS_INSTALL_STAGING = YES
LIBNFS_AUTORECONF = YES
LIBNFS_MAKE = $(MAKE1)
-LIBNFS_LICENSE = LGPLv2.1+
+LIBNFS_LICENSE = LGPL-2.1+
LIBNFS_LICENSE_FILES = LICENCE-LGPL-2.1.txt
LIBNFS_DEPENDENCIES = host-pkgconf
diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk
index 3df596a..61cfb24 100644
--- a/package/libnice/libnice.mk
+++ b/package/libnice/libnice.mk
@@ -6,7 +6,7 @@
LIBNICE_VERSION = 0.1.13
LIBNICE_SITE = http://nice.freedesktop.org/releases
-LIBNICE_LICENSE = MPLv1.1 or LGPLv2.1
+LIBNICE_LICENSE = MPLv1.1 or LGPL-2.1
LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL
LIBNICE_DEPENDENCIES = libglib2 host-pkgconf
LIBNICE_INSTALL_STAGING = YES
diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index f31a92c..6de6825 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -6,7 +6,7 @@
LIBNL_VERSION = 3.2.29
LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION))
-LIBNL_LICENSE = LGPLv2.1+
+LIBNL_LICENSE = LGPL-2.1+
LIBNL_LICENSE_FILES = COPYING
LIBNL_INSTALL_STAGING = YES
LIBNL_DEPENDENCIES = host-bison host-flex host-pkgconf
diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk
index aa478a4..895d530 100644
--- a/package/liboping/liboping.mk
+++ b/package/liboping/liboping.mk
@@ -10,7 +10,7 @@ LIBOPING_SOURCE = liboping-$(LIBOPING_VERSION).tar.bz2
LIBOPING_INSTALL_STAGING = YES
LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses)
LIBOPING_CONF_OPTS = --without-perl-bindings
-LIBOPING_LICENSE = LGPLv2.1+, GPL-2.0
+LIBOPING_LICENSE = LGPL-2.1+, GPL-2.0
LIBOPING_LICENSE_FILES = COPYING
LIBOPING_AUTORECONF = YES
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index f22dcc3..9302b99 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -7,7 +7,7 @@
LIBOSIP2_VERSION = 3.6.0
LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
LIBOSIP2_INSTALL_STAGING = YES
-LIBOSIP2_LICENSE = LGPLv2.1+
+LIBOSIP2_LICENSE = LGPL-2.1+
LIBOSIP2_LICENSE_FILES = COPYING
ifeq ($(BR2_arc),y)
diff --git a/package/libplayer/libplayer.mk b/package/libplayer/libplayer.mk
index ace1891..f4ecced 100644
--- a/package/libplayer/libplayer.mk
+++ b/package/libplayer/libplayer.mk
@@ -7,7 +7,7 @@
LIBPLAYER_VERSION = 2.0.1
LIBPLAYER_SITE = http://libplayer.geexbox.org/releases
LIBPLAYER_SOURCE = libplayer-$(LIBPLAYER_VERSION).tar.bz2
-LIBPLAYER_LICENSE = LGPLv2.1+
+LIBPLAYER_LICENSE = LGPL-2.1+
LIBPLAYER_LICENSE_FILES = COPYING
# When passing the standard buildroot configure arguments, the configure script
diff --git a/package/libplist/libplist.mk b/package/libplist/libplist.mk
index 7f60b5e..0d3e417 100644
--- a/package/libplist/libplist.mk
+++ b/package/libplist/libplist.mk
@@ -9,7 +9,7 @@ LIBPLIST_SOURCE = libplist-$(LIBPLIST_VERSION).tar.bz2
LIBPLIST_SITE = http://www.libimobiledevice.org/downloads
LIBPLIST_DEPENDENCIES = libxml2 host-pkgconf
LIBPLIST_INSTALL_STAGING = YES
-LIBPLIST_LICENSE = LGPLv2.1+
+LIBPLIST_LICENSE = LGPL-2.1+
LIBPLIST_LICENSE_FILES = COPYING
# Straight out of the git tree:
diff --git a/package/libpthsem/libpthsem.mk b/package/libpthsem/libpthsem.mk
index b8a3d7d..dfe25af 100644
--- a/package/libpthsem/libpthsem.mk
+++ b/package/libpthsem/libpthsem.mk
@@ -7,7 +7,7 @@
LIBPTHSEM_VERSION = 2.0.8
LIBPTHSEM_SOURCE = pthsem_$(LIBPTHSEM_VERSION).tar.gz
LIBPTHSEM_SITE = http://www.auto.tuwien.ac.at/~mkoegler/pth
-LIBPTHSEM_LICENSE = LGPLv2.1+
+LIBPTHSEM_LICENSE = LGPL-2.1+
LIBPTHSEM_LICENSE_FILES = COPYING
LIBPTHSEM_AUTORECONF = YES
LIBPTHSEM_INSTALL_STAGING = YES
diff --git a/package/libqrencode/libqrencode.mk b/package/libqrencode/libqrencode.mk
index 5f30e77..8f17b89 100644
--- a/package/libqrencode/libqrencode.mk
+++ b/package/libqrencode/libqrencode.mk
@@ -9,7 +9,7 @@ LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz
LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode
LIBQRENCODE_DEPENDENCIES = host-pkgconf
LIBQRENCODE_INSTALL_STAGING = YES
-LIBQRENCODE_LICENSE = LGPLv2.1+
+LIBQRENCODE_LICENSE = LGPL-2.1+
LIBQRENCODE_LICENSE_FILES = COPYING
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk
index f78ce1e..bb8edf7 100644
--- a/package/libraw/libraw.mk
+++ b/package/libraw/libraw.mk
@@ -18,7 +18,7 @@ LIBRAW_CONF_OPTS += \
--disable-openmp \
--disable-demosaic-pack-gpl2 \
--disable-demosaic-pack-gpl3
-LIBRAW_LICENSE = LGPLv2.1 or CDDL 1.0 or LibRaw Software License 27032010
+LIBRAW_LICENSE = LGPL-2.1 or CDDL 1.0 or LibRaw Software License 27032010
LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL LICENSE.LibRaw.pdf README
LIBRAW_DEPENDENCIES = host-pkgconf
LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS)
diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk
index 7123ac7..73517ed 100644
--- a/package/libraw1394/libraw1394.mk
+++ b/package/libraw1394/libraw1394.mk
@@ -9,7 +9,7 @@ LIBRAW1394_SOURCE = libraw1394-$(LIBRAW1394_VERSION).tar.xz
LIBRAW1394_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ieee1394
LIBRAW1394_PATCH = http://git.alpinelinux.org/cgit/aports/plain/main/libraw1394/fix-types.patch
LIBRAW1394_INSTALL_STAGING = YES
-LIBRAW1394_LICENSE = LGPLv2.1+
+LIBRAW1394_LICENSE = LGPL-2.1+
LIBRAW1394_LICENSE_FILES = COPYING.LIB
$(eval $(autotools-package))
diff --git a/package/libreplaygain/libreplaygain.mk b/package/libreplaygain/libreplaygain.mk
index 4775999..ff0950c 100644
--- a/package/libreplaygain/libreplaygain.mk
+++ b/package/libreplaygain/libreplaygain.mk
@@ -10,7 +10,7 @@ LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
# upstream doesn't ship configure
LIBREPLAYGAIN_AUTORECONF = YES
LIBREPLAYGAIN_INSTALL_STAGING = YES
-LIBREPLAYGAIN_LICENSE = LGPLv2.1+
+LIBREPLAYGAIN_LICENSE = LGPL-2.1+
LIBREPLAYGAIN_LICENSE_FILES = src/gain_analysis.c
$(eval $(autotools-package))
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
index 43d1d91..5582b38 100644
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -7,7 +7,7 @@
LIBROXML_VERSION = 2.3.0
LIBROXML_SITE = http://download.libroxml.net/pool/v2.x
LIBROXML_INSTALL_STAGING = YES
-LIBROXML_LICENSE = LGPLv2.1+ with static link exception
+LIBROXML_LICENSE = LGPL-2.1+ with static link exception
LIBROXML_LICENSE_FILES = License.txt
LIBROXML_CONF_OPTS = --disable-silent-rules
diff --git a/package/librsync/librsync.mk b/package/librsync/librsync.mk
index d475c73..517f871 100644
--- a/package/librsync/librsync.mk
+++ b/package/librsync/librsync.mk
@@ -6,7 +6,7 @@
LIBRSYNC_VERSION = 0.9.7
LIBRSYNC_SITE = http://downloads.sourceforge.net/project/librsync/librsync/$(LIBRSYNC_VERSION)
-LIBRSYNC_LICENSE = LGPLv2.1+
+LIBRSYNC_LICENSE = LGPL-2.1+
LIBRSYNC_LICENSE_FILES = COPYING
LIBRSYNC_INSTALL_STAGING = YES
LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
index 03fc6cf..9a241a5 100644
--- a/package/libseccomp/libseccomp.mk
+++ b/package/libseccomp/libseccomp.mk
@@ -6,7 +6,7 @@
LIBSECCOMP_VERSION = v2.3.1
LIBSECCOMP_SITE = $(call github,seccomp,libseccomp,$(LIBSECCOMP_VERSION))
-LIBSECCOMP_LICENSE = LGPLv2.1
+LIBSECCOMP_LICENSE = LGPL-2.1
LIBSECCOMP_LICENSE_FILES = LICENSE
LIBSECCOMP_INSTALL_STAGING = YES
LIBSECCOMP_AUTORECONF = YES
diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk
index 20a217f..111b553 100644
--- a/package/libsecret/libsecret.mk
+++ b/package/libsecret/libsecret.mk
@@ -16,7 +16,7 @@ LIBSECRET_CONF_OPTS = \
--disable-coverage \
--enable-introspection=no \
--enable-vala=no
-LIBSECRET_LICENSE = LGPLv2.1+
+LIBSECRET_LICENSE = LGPL-2.1+
LIBSECRET_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
diff --git a/package/libsemanage/libsemanage.mk b/package/libsemanage/libsemanage.mk
index 7545594..c9f0f57 100644
--- a/package/libsemanage/libsemanage.mk
+++ b/package/libsemanage/libsemanage.mk
@@ -6,7 +6,7 @@
LIBSEMANAGE_VERSION = 2.6
LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
-LIBSEMANAGE_LICENSE = LGPLv2.1+
+LIBSEMANAGE_LICENSE = LGPL-2.1+
LIBSEMANAGE_LICENSE_FILES = COPYING
LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux ustr bzip2
LIBSEMANAGE_INSTALL_STAGING = YES
diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk
index 61d1e61..9bdac1e 100644
--- a/package/libsepol/libsepol.mk
+++ b/package/libsepol/libsepol.mk
@@ -6,7 +6,7 @@
LIBSEPOL_VERSION = 2.6
LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
-LIBSEPOL_LICENSE = LGPLv2.1+
+LIBSEPOL_LICENSE = LGPL-2.1+
LIBSEPOL_LICENSE_FILES = COPYING
LIBSEPOL_INSTALL_STAGING = YES
diff --git a/package/libsexy/libsexy.mk b/package/libsexy/libsexy.mk
index c291d7d..b079264 100644
--- a/package/libsexy/libsexy.mk
+++ b/package/libsexy/libsexy.mk
@@ -8,7 +8,7 @@ LIBSEXY_VERSION = 0.1.11
LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy
LIBSEXY_DEPENDENCIES = libgtk2 libxml2
LIBSEXY_INSTALL_STAGING = YES
-LIBSEXY_LICENSE = LGPLv2.1+
+LIBSEXY_LICENSE = LGPL-2.1+
LIBSEXY_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libshairplay/libshairplay.mk b/package/libshairplay/libshairplay.mk
index 4bdd1a0..8360d79 100644
--- a/package/libshairplay/libshairplay.mk
+++ b/package/libshairplay/libshairplay.mk
@@ -8,7 +8,7 @@ LIBSHAIRPLAY_VERSION = ce80e005908f41d0e6fde1c4a21e9cb8ee54007b
LIBSHAIRPLAY_SITE = $(call github,juhovh,shairplay,$(LIBSHAIRPLAY_VERSION))
LIBSHAIRPLAY_INSTALL_STAGING = YES
LIBSHAIRPLAY_AUTORECONF = YES
-LIBSHAIRPLAY_LICENSE = MIT, BSD-3c, LGPLv2.1+
+LIBSHAIRPLAY_LICENSE = MIT, BSD-3c, LGPL-2.1+
LIBSHAIRPLAY_LICENSE_FILES = LICENSE
LIBSHAIRPLAY_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_LIBAO),libao)
diff --git a/package/libsigc/libsigc.mk b/package/libsigc/libsigc.mk
index 590cbaa..d7cbd36 100644
--- a/package/libsigc/libsigc.mk
+++ b/package/libsigc/libsigc.mk
@@ -10,7 +10,7 @@ LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz
LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR)
LIBSIGC_DEPENDENCIES = host-m4
LIBSIGC_INSTALL_STAGING = YES
-LIBSIGC_LICENSE = LGPLv2.1+
+LIBSIGC_LICENSE = LGPL-2.1+
LIBSIGC_LICENSE_FILES = COPYING
define LIBSIGC_INSTALL_TARGET_FIXUP
diff --git a/package/libsndfile/libsndfile.mk b/package/libsndfile/libsndfile.mk
index c5cd1de..936f4be 100644
--- a/package/libsndfile/libsndfile.mk
+++ b/package/libsndfile/libsndfile.mk
@@ -7,7 +7,7 @@
LIBSNDFILE_VERSION = 1.0.27
LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files
LIBSNDFILE_INSTALL_STAGING = YES
-LIBSNDFILE_LICENSE = LGPLv2.1+
+LIBSNDFILE_LICENSE = LGPL-2.1+
LIBSNDFILE_LICENSE_FILES = COPYING
LIBSNDFILE_CONF_OPTS = \
diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk
index 03bef04..19a8c42 100644
--- a/package/libsoc/libsoc.mk
+++ b/package/libsoc/libsoc.mk
@@ -6,7 +6,7 @@
LIBSOC_VERSION = 0.8.2
LIBSOC_SITE = $(call github,jackmitch,libsoc,$(LIBSOC_VERSION))
-LIBSOC_LICENSE = LGPLv2.1
+LIBSOC_LICENSE = LGPL-2.1
LIBSOC_LICENSE_FILES = LICENCE
LIBSOC_AUTORECONF = YES
LIBSOC_INSTALL_STAGING = YES
diff --git a/package/libsocketcan/libsocketcan.mk b/package/libsocketcan/libsocketcan.mk
index 65f3cb5..31ed0d3 100644
--- a/package/libsocketcan/libsocketcan.mk
+++ b/package/libsocketcan/libsocketcan.mk
@@ -8,6 +8,6 @@ LIBSOCKETCAN_VERSION = 0.0.10
LIBSOCKETCAN_SITE = http://www.pengutronix.de/software/libsocketcan/download
LIBSOCKETCAN_SOURCE = libsocketcan-$(LIBSOCKETCAN_VERSION).tar.bz2
LIBSOCKETCAN_INSTALL_STAGING = YES
-LIBSOCKETCAN_LICENSE = LGPLv2.1+
+LIBSOCKETCAN_LICENSE = LGPL-2.1+
$(eval $(autotools-package))
diff --git a/package/libsoundtouch/libsoundtouch.mk b/package/libsoundtouch/libsoundtouch.mk
index cdfec20..c4ac930 100644
--- a/package/libsoundtouch/libsoundtouch.mk
+++ b/package/libsoundtouch/libsoundtouch.mk
@@ -7,7 +7,7 @@
LIBSOUNDTOUCH_VERSION = 010a91a59071c7fefd316fca62c0d980ec85b4b1
LIBSOUNDTOUCH_SITE = https://freeswitch.org/stash/scm/sd/libsoundtouch.git
LIBSOUNDTOUCH_SITE_METHOD = git
-LIBSOUNDTOUCH_LICENSE = LGPLv2.1+
+LIBSOUNDTOUCH_LICENSE = LGPL-2.1+
LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT
LIBSOUNDTOUCH_AUTORECONF = YES
LIBSOUNDTOUCH_INSTALL_STAGING = YES
diff --git a/package/libsoxr/libsoxr.mk b/package/libsoxr/libsoxr.mk
index 0fdc570..c1dc4b0 100644
--- a/package/libsoxr/libsoxr.mk
+++ b/package/libsoxr/libsoxr.mk
@@ -7,7 +7,7 @@
LIBSOXR_VERSION = 0.1.2
LIBSOXR_SOURCE = soxr-$(LIBSOXR_VERSION)-Source.tar.xz
LIBSOXR_SITE = http://downloads.sourceforge.net/project/soxr
-LIBSOXR_LICENSE = LGPLv2.1+
+LIBSOXR_LICENSE = LGPL-2.1+
LIBSOXR_LICENSE_FILES = LICENCE COPYING.LGPL
LIBSOXR_INSTALL_STAGING = YES
LIBSOXR_CONF_OPTS = -DWITH_OPENMP=OFF
diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk
index 429e3c1..b6b6dbb 100644
--- a/package/libssh/libssh.mk
+++ b/package/libssh/libssh.mk
@@ -7,7 +7,7 @@
LIBSSH_VERSION = 0.7.3
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
LIBSSH_SITE = https://red.libssh.org/attachments/download/195
-LIBSSH_LICENSE = LGPLv2.1
+LIBSSH_LICENSE = LGPL-2.1
LIBSSH_LICENSE_FILES = COPYING
LIBSSH_INSTALL_STAGING = YES
LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO
diff --git a/package/libsvg-cairo/libsvg-cairo.mk b/package/libsvg-cairo/libsvg-cairo.mk
index 28c9141..f7a105e 100644
--- a/package/libsvg-cairo/libsvg-cairo.mk
+++ b/package/libsvg-cairo/libsvg-cairo.mk
@@ -8,7 +8,7 @@ LIBSVG_CAIRO_VERSION = 0.1.6
LIBSVG_CAIRO_SITE = http://cairographics.org/snapshots
LIBSVG_CAIRO_DEPENDENCIES = cairo libsvg
LIBSVG_CAIRO_INSTALL_STAGING = YES
-LIBSVG_CAIRO_LICENSE = LGPLv2.1+
+LIBSVG_CAIRO_LICENSE = LGPL-2.1+
LIBSVG_CAIRO_LICENSE_FILES = COPYING
LIBSVG_CAIRO_CONF_OPTS = --without-x
diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk
index e019583..13edc9a 100644
--- a/package/libsysfs/libsysfs.mk
+++ b/package/libsysfs/libsysfs.mk
@@ -8,7 +8,7 @@ LIBSYSFS_VERSION = 2.1.0
LIBSYSFS_SITE = http://downloads.sourceforge.net/project/linux-diag/sysfsutils/$(LIBSYSFS_VERSION)
LIBSYSFS_SOURCE = sysfsutils-$(LIBSYSFS_VERSION).tar.gz
LIBSYSFS_INSTALL_STAGING = YES
-LIBSYSFS_LICENSE = GPL-2.0 (utilities), LGPLv2.1+ (library)
+LIBSYSFS_LICENSE = GPL-2.0 (utilities), LGPL-2.1+ (library)
LIBSYSFS_LICENSE_FILES = cmd/GPL lib/LGPL
$(eval $(autotools-package))
diff --git a/package/libtasn1/libtasn1.mk b/package/libtasn1/libtasn1.mk
index f471a51..714c4f8 100644
--- a/package/libtasn1/libtasn1.mk
+++ b/package/libtasn1/libtasn1.mk
@@ -7,7 +7,7 @@
LIBTASN1_VERSION = 4.9
LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1
LIBTASN1_DEPENDENCIES = host-bison
-LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPLv2.1+ (library)
+LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPL-2.1+ (library)
LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB
LIBTASN1_INSTALL_STAGING = YES
# 'missing' fallback logic botched so disable it completely
diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk
index f1a359b..642238c 100644
--- a/package/libuci/libuci.mk
+++ b/package/libuci/libuci.mk
@@ -6,7 +6,7 @@
LIBUCI_VERSION = 49ec6efbdac4819033d34f08927d795f83a3932d
LIBUCI_SITE = git://git.openwrt.org/project/uci.git
-LIBUCI_LICENSE = LGPLv2.1, GPL-2.0 (tools)
+LIBUCI_LICENSE = LGPL-2.1, GPL-2.0 (tools)
LIBUCI_INSTALL_STAGING = YES
LIBUCI_DEPENDENCIES = libubox
diff --git a/package/libuio/libuio.mk b/package/libuio/libuio.mk
index 9e7ad6f..bdd29e3 100644
--- a/package/libuio/libuio.mk
+++ b/package/libuio/libuio.mk
@@ -7,7 +7,7 @@
# v0.2.7
LIBUIO_VERSION = 940861de278cb794bf9d775b76a4d1d4f9108607
LIBUIO_SITE = $(call github,Linutronix,libuio,$(LIBUIO_VERSION))
-LIBUIO_LICENSE = LGPLv2.1 (library), GPL-2.0 (programs)
+LIBUIO_LICENSE = LGPL-2.1 (library), GPL-2.0 (programs)
LIBUIO_LICENSE_FILES = COPYING
LIBUIO_CONF_OPTS = --with-glib=no --without-werror
LIBUIO_INSTALL_STAGING = YES
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
index da2ba35..d8579f6 100644
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -7,7 +7,7 @@
LIBURCU_VERSION = 0.9.2
LIBURCU_SITE = http://lttng.org/files/urcu
LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
-LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files)
+LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files)
LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE
LIBURCU_INSTALL_STAGING = YES
diff --git a/package/libusb-compat/libusb-compat.mk b/package/libusb-compat/libusb-compat.mk
index 26107be..61d4c20 100644
--- a/package/libusb-compat/libusb-compat.mk
+++ b/package/libusb-compat/libusb-compat.mk
@@ -12,7 +12,7 @@ LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb
HOST_LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf host-libusb
LIBUSB_COMPAT_INSTALL_STAGING = YES
LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config
-LIBUSB_COMPAT_LICENSE = LGPLv2.1+
+LIBUSB_COMPAT_LICENSE = LGPL-2.1+
LIBUSB_COMPAT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
index 26ace1b..f0bb9e3 100644
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -8,7 +8,7 @@ LIBUSB_VERSION_MAJOR = 1.0
LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).21
LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION)
-LIBUSB_LICENSE = LGPLv2.1+
+LIBUSB_LICENSE = LGPL-2.1+
LIBUSB_LICENSE_FILES = COPYING
LIBUSB_DEPENDENCIES = host-pkgconf
LIBUSB_INSTALL_STAGING = YES
diff --git a/package/libusbgx/libusbgx.mk b/package/libusbgx/libusbgx.mk
index 721245f..1964b47 100644
--- a/package/libusbgx/libusbgx.mk
+++ b/package/libusbgx/libusbgx.mk
@@ -6,7 +6,7 @@
LIBUSBGX_VERSION = 2e3d43ee098ed928d1baa61ce791ce9ff4788c5a
LIBUSBGX_SITE = $(call github,libusbgx,libusbgx,$(LIBUSBGX_VERSION))
-LIBUSBGX_LICENSE = GPL-2.0+ (examples), LGPLv2.1+ (library)
+LIBUSBGX_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library)
LIBUSBGX_LICENSE_FILES = COPYING COPYING.LGPL
LIBUSBGX_DEPENDENCIES = host-pkgconf libconfig
LIBUSBGX_AUTORECONF = YES
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index 4fe7048..465f6cc 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -15,7 +15,7 @@ LIBV4L_CONF_OPTS = --disable-doxygen-doc
LIBV4L_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
# v4l-utils components have different licences, see v4l-utils.spec for details
-LIBV4L_LICENSE = GPL-2.0+ (utilities), LGPLv2.1+ (libraries)
+LIBV4L_LICENSE = GPL-2.0+ (utilities), LGPL-2.1+ (libraries)
LIBV4L_LICENSE_FILES = COPYING COPYING.libv4l lib/libv4l1/libv4l1-kernelcode-license.txt
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk
index 5f80b2d..974a4be 100644
--- a/package/libvips/libvips.mk
+++ b/package/libvips/libvips.mk
@@ -8,7 +8,7 @@ LIBVIPS_VERSION_MAJOR = 7.42
LIBVIPS_VERSION = $(LIBVIPS_VERSION_MAJOR).2
LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz
LIBVIPS_SITE = http://www.vips.ecs.soton.ac.uk/supported/$(LIBVIPS_VERSION_MAJOR)
-LIBVIPS_LICENSE = LGPLv2.1+
+LIBVIPS_LICENSE = LGPL-2.1+
LIBVIPS_LICENSE_FILES = COPYING
# We're patching gtk-doc.make, so need to autoreconf
LIBVIPS_AUTORECONF = YES
diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index 74b6b2b..511359c 100644
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -6,7 +6,7 @@
LIBWEBSOCKETS_VERSION = v2.1.1
LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,$(LIBWEBSOCKETS_VERSION))
-LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions
+LIBWEBSOCKETS_LICENSE = LGPL-2.1 with exceptions
LIBWEBSOCKETS_LICENSE_FILES = LICENSE
LIBWEBSOCKETS_DEPENDENCIES = zlib
LIBWEBSOCKETS_INSTALL_STAGING = YES
diff --git a/package/libxmlpp/libxmlpp.mk b/package/libxmlpp/libxmlpp.mk
index d428199..cbedf61 100644
--- a/package/libxmlpp/libxmlpp.mk
+++ b/package/libxmlpp/libxmlpp.mk
@@ -6,7 +6,7 @@
LIBXMLPP_VERSION_MAJOR = 2.40
LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).1
-LIBXMLPP_LICENSE = LGPLv2.1 (library), LGPLv2+ (examples)
+LIBXMLPP_LICENSE = LGPL-2.1 (library), LGPLv2+ (examples)
LIBXMLPP_LICENSE_FILES = COPYING
LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz
LIBXMLPP_SITE = http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(LIBXMLPP_VERSION_MAJOR)
diff --git a/package/lite/lite.mk b/package/lite/lite.mk
index 9a1c917..ddb55d4 100644
--- a/package/lite/lite.mk
+++ b/package/lite/lite.mk
@@ -11,7 +11,7 @@ LITE_INSTALL_STAGING = YES
LITE_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
LITE_CONF_ENV = DFB_CFLAGS=-I$(STAGING_DIR)/usr/include/directfb
LITE_DEPENDENCIES = directfb
-LITE_LICENSE = LGPLv2.1+
+LITE_LICENSE = LGPL-2.1+
LITE_LICENSE_FILES = COPYING
define LITE_FINALIZE_INSTALL
diff --git a/package/live555/live555.mk b/package/live555/live555.mk
index f36cce3..a6dd13c 100644
--- a/package/live555/live555.mk
+++ b/package/live555/live555.mk
@@ -7,7 +7,7 @@
LIVE555_VERSION = 2016.03.16
LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
LIVE555_SITE = http://www.live555.com/liveMedia/public
-LIVE555_LICENSE = LGPLv2.1+
+LIVE555_LICENSE = LGPL-2.1+
LIVE555_LICENSE_FILES = COPYING
LIVE555_INSTALL_STAGING = YES
diff --git a/package/lksctp-tools/lksctp-tools.mk b/package/lksctp-tools/lksctp-tools.mk
index 20776a7..5ac794e 100644
--- a/package/lksctp-tools/lksctp-tools.mk
+++ b/package/lksctp-tools/lksctp-tools.mk
@@ -9,7 +9,7 @@ LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools
LKSCTP_TOOLS_INSTALL_STAGING = YES
# configure not shipped
LKSCTP_TOOLS_AUTORECONF = YES
-LKSCTP_TOOLS_LICENSE = LGPLv2.1 (library), GPL-2.0+ (programs)
+LKSCTP_TOOLS_LICENSE = LGPL-2.1 (library), GPL-2.0+ (programs)
LKSCTP_TOOLS_LICENSE_FILES = COPYING.lib COPYING
LKSCTP_TOOLS_CONF_OPTS = --disable-tests
diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index 89419bc..f581b5c 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -9,7 +9,7 @@ LM_SENSORS_SOURCE = lm-sensors_$(LM_SENSORS_VERSION).orig.tar.bz2
LM_SENSORS_SITE = http://snapshot.debian.org/archive/debian/20170208T211941Z/pool/main/l/lm-sensors
LM_SENSORS_INSTALL_STAGING = YES
LM_SENSORS_DEPENDENCIES = host-bison host-flex
-LM_SENSORS_LICENSE = LGPLv2.1+ (libsensors), GPL-2.0+ (programs)
+LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs)
LM_SENSORS_LICENSE_FILES = COPYING.LGPL COPYING
LM_SENSORS_BINS_ = bin/sensors-conf-convert
diff --git a/package/lockdev/lockdev.mk b/package/lockdev/lockdev.mk
index a45e22e..e491b13 100644
--- a/package/lockdev/lockdev.mk
+++ b/package/lockdev/lockdev.mk
@@ -9,7 +9,7 @@ LOCKDEV_VERSION = $(LOCKDEV_VERSION_MAJOR).0.3
LOCKDEV_SOURCE = lockdev_$(LOCKDEV_VERSION).orig.tar.gz
LOCKDEV_PATCH = lockdev_$(LOCKDEV_VERSION)-1.6.diff.gz
LOCKDEV_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev
-LOCKDEV_LICENSE = LGPLv2.1
+LOCKDEV_LICENSE = LGPL-2.1
LOCKDEV_LICENSE_FILES = LICENSE
LOCKDEV_INSTALL_STAGING = YES
diff --git a/package/log4cpp/log4cpp.mk b/package/log4cpp/log4cpp.mk
index df7109b..1801cff 100644
--- a/package/log4cpp/log4cpp.mk
+++ b/package/log4cpp/log4cpp.mk
@@ -9,7 +9,7 @@ LOG4CPP_VERSION = $(LOG4CPP_VERSION_MAJOR).1
LOG4CPP_SITE = http://downloads.sourceforge.net/project/log4cpp/log4cpp-1.1.x%20%28new%29/log4cpp-$(LOG4CPP_VERSION_MAJOR)
LOG4CPP_SUBDIR = log4cpp
# The "or later" is indicated in the HTML documentation
-LOG4CPP_LICENSE = LGPLv2.1+
+LOG4CPP_LICENSE = LGPL-2.1+
LOG4CPP_LICENSE_FILES = log4cpp/COPYING
LOG4CPP_INSTALL_STAGING = YES
LOG4CPP_CONF_OPTS = --enable-doxygen=no --enable-dot=no
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
index 1b2c654..cfd67de 100644
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -7,7 +7,7 @@
LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace
LTTNG_BABELTRACE_VERSION = 1.5.2
LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
-LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPL-2.0 (test code)
+LTTNG_BABELTRACE_LICENSE = MIT, LGPL-2.1 (include/babeltrace/list.h), GPL-2.0 (test code)
LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf
# The host-elfutils dependency is optional, but since we don't have
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
index a195e2f..82923de 100644
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -7,7 +7,7 @@
LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
LTTNG_LIBUST_VERSION = 2.9.0
LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
-LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
+LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
LTTNG_LIBUST_LICENSE_FILES = COPYING
LTTNG_LIBUST_INSTALL_STAGING = YES
LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
index ecc8992..9f624e5 100644
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -7,7 +7,7 @@
LTTNG_MODULES_VERSION = 2.9.1
LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules
LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
-LTTNG_MODULES_LICENSE = LGPLv2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*)
+LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*)
LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE
LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
index 808e256..1714a42 100644
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -7,7 +7,7 @@
LTTNG_TOOLS_VERSION = 2.9.4
LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools
LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
-LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPLv2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
+LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 068a400..ffc1043 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -8,7 +8,7 @@ LVM2_VERSION = 2.02.169
LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases
LVM2_INSTALL_STAGING = YES
-LVM2_LICENSE = GPL-2.0, LGPLv2.1
+LVM2_LICENSE = GPL-2.0, LGPL-2.1
LVM2_LICENSE_FILES = COPYING COPYING.LIB
# Make sure that binaries and libraries are installed with write
diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk
index b79197f..9412df5 100644
--- a/package/lxc/lxc.mk
+++ b/package/lxc/lxc.mk
@@ -6,7 +6,7 @@
LXC_VERSION = 2.0.7
LXC_SITE = https://linuxcontainers.org/downloads/lxc
-LXC_LICENSE = LGPLv2.1+
+LXC_LICENSE = LGPL-2.1+
LXC_LICENSE_FILES = COPYING
LXC_DEPENDENCIES = libcap host-pkgconf
LXC_INSTALL_STAGING = YES
diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk
index 451279e..ee206b6 100644
--- a/package/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox-lib/matchbox-lib.mk
@@ -7,7 +7,7 @@
MATCHBOX_LIB_VERSION = 1.9
MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION)
-MATCHBOX_LIB_LICENSE = LGPLv2.1+
+MATCHBOX_LIB_LICENSE = LGPL-2.1+
MATCHBOX_LIB_LICENSE_FILES = COPYING
MATCHBOX_LIB_INSTALL_STAGING = YES
MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
--git a/package/menu-cache/menu-cache.mk b/package/menu-cache/menu-cache.mk
index 1687825..b5fde99 100644
--- a/package/menu-cache/menu-cache.mk
+++ b/package/menu-cache/menu-cache.mk
@@ -9,7 +9,7 @@ MENU_CACHE_VERSION = $(MENU_CACHE_VERSION_MAJOR).1
MENU_CACHE_SOURCE = menu-cache-$(MENU_CACHE_VERSION).tar.xz
MENU_CACHE_SITE = http://sourceforge.net/projects/lxde/files/menu-cache/$(MENU_CACHE_VERSION_MAJOR)
MENU_CACHE_DEPENDENCIES = libfm-extra libglib2
-MENU_CACHE_LICENSE = LGPLv2.1
+MENU_CACHE_LICENSE = LGPL-2.1
MENU_CACHE_LICENSE_FILES = COPYING
MENU_CACHE_INSTALL_STAGING = YES
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
index 5aa83c6..395e72e 100644
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -7,7 +7,7 @@
MIDORI_VERSION = 0.5.11
MIDORI_SOURCE = midori_$(MIDORI_VERSION)_all_.tar.bz2
MIDORI_SITE = http://midori-browser.org/downloads
-MIDORI_LICENSE = LGPLv2.1+
+MIDORI_LICENSE = LGPL-2.1+
MIDORI_LICENSE_FILES = COPYING
MIDORI_DEPENDENCIES = \
host-intltool \
diff --git a/package/miraclecast/miraclecast.mk b/package/miraclecast/miraclecast.mk
index f037a2e..f75191b 100644
--- a/package/miraclecast/miraclecast.mk
+++ b/package/miraclecast/miraclecast.mk
@@ -6,7 +6,7 @@
MIRACLECAST_VERSION = c94be167c85c6ec8badd7ac79e3dea2e0b73225c
MIRACLECAST_SITE = $(call github,albfan,miraclecast,$(MIRACLECAST_VERSION))
-MIRACLECAST_LICENSE = LGPLv2.1+, GPL-2.0 (gdhcp)
+MIRACLECAST_LICENSE = LGPL-2.1+, GPL-2.0 (gdhcp)
MIRACLECAST_LICENSE_FILES = COPYING LICENSE_gdhcp LICENSE_htable LICENSE_lgpl
MIRACLECAST_DEPENDENCIES = host-pkgconf systemd gstreamer1 \
readline libglib2
diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
index 27c46dc..2431df1 100644
--- a/package/mpg123/mpg123.mk
+++ b/package/mpg123/mpg123.mk
@@ -9,7 +9,7 @@ MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
MPG123_CONF_OPTS = --disable-lfs-alias
MPG123_INSTALL_STAGING = YES
-MPG123_LICENSE = LGPLv2.1
+MPG123_LICENSE = LGPL-2.1
MPG123_LICENSE_FILES = COPYING
MPG123_DEPENDENCIES = host-pkgconf
diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk
index db613a0..14f4921 100644
--- a/package/musepack/musepack.mk
+++ b/package/musepack/musepack.mk
@@ -10,7 +10,7 @@ MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz
MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
MUSEPACK_INSTALL_STAGING = YES
MUSEPACK_MAKE = $(MAKE1)
-MUSEPACK_LICENSE = BSD-3c (*mpcdec), LGPLv2.1+ (*mpcenc)
+MUSEPACK_LICENSE = BSD-3c (*mpcdec), LGPL-2.1+ (*mpcenc)
MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c
$(eval $(cmake-package))
diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
index 9ec9c1a..407b942 100644
--- a/package/nss-mdns/nss-mdns.mk
+++ b/package/nss-mdns/nss-mdns.mk
@@ -6,7 +6,7 @@
NSS_MDNS_VERSION = 0.10
NSS_MDNS_SITE = http://0pointer.de/lennart/projects/nss-mdns
-NSS_MDNS_LICENSE = LGPLv2.1+
+NSS_MDNS_LICENSE = LGPL-2.1+
NSS_MDNS_LICENSE_FILES = LICENSE
define NSS_MDNS_INSTALL_CONFIG
diff --git a/package/nss-pam-ldapd/nss-pam-ldapd.mk b/package/nss-pam-ldapd/nss-pam-ldapd.mk
index ba25082..1c4f735 100644
--- a/package/nss-pam-ldapd/nss-pam-ldapd.mk
+++ b/package/nss-pam-ldapd/nss-pam-ldapd.mk
@@ -6,7 +6,7 @@
NSS_PAM_LDAPD_VERSION = 0.9.6
NSS_PAM_LDAPD_SITE = http://arthurdejong.org/nss-pam-ldapd
-NSS_PAM_LDAPD_LICENSE = LGPLv2.1+
+NSS_PAM_LDAPD_LICENSE = LGPL-2.1+
NSS_PAM_LDAPD_LICENSE_FILES = COPYING
NSS_PAM_LDAPD_INSTALL_STAGING = YES
diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk
index 83fdae7..b43bc89 100644
--- a/package/numactl/numactl.mk
+++ b/package/numactl/numactl.mk
@@ -9,7 +9,7 @@ NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download
NUMACTL_PATCH = \
https://github.com/numactl/numactl/commit/3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.patch \
https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b.patch
-NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPL-2.0 (programs)
+NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs)
NUMACTL_LICENSE_FILES = README
NUMACTL_INSTALL_STAGING = YES
diff --git a/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk b/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk
index 4f7cdcf..9b153b0 100644
--- a/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk
+++ b/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk
@@ -11,7 +11,7 @@ NVIDIA_TEGRA23_BINARIES_SOURCE = $(NVIDIA_TEGRA23_BASE)_R$(NVIDIA_TEGRA23_BINARI
NVIDIA_TEGRA23_BINARIES_LICENSE = License For Customer Use of NVIDIA Software
NVIDIA_TEGRA23_BINARIES_LICENSE_FILES = nv_tegra/LICENSE
ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y)
-NVIDIA_TEGRA23_BINARIES_LICENSE += LGPLv2.1
+NVIDIA_TEGRA23_BINARIES_LICENSE += LGPL-2.1
NVIDIA_TEGRA23_BINARIES_LICENSE_FILES += nv_tegra/nv_sample_apps/LICENSE.gst-openmax
endif
diff --git a/package/ola/ola.mk b/package/ola/ola.mk
index a4f3501..251dda3 100644
--- a/package/ola/ola.mk
+++ b/package/ola/ola.mk
@@ -6,7 +6,7 @@
OLA_VERSION = 0.10.2
OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION)
-OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests)
+OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests)
OLA_LICENSE_FILES = LICENCE GPL LGPL
OLA_INSTALL_STAGING = YES
OLA_AUTORECONF = YES
diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index 5a456a9..e7c3057 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -12,7 +12,7 @@ OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \
mdns nameservice p2pd pgraph secure txtinfo watchdog
# Doesn't really need quagga but not very useful without it
OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga)
-OLSR_LICENSE = BSD-3c, LGPLv2.1+
+OLSR_LICENSE = BSD-3c, LGPL-2.1+
OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE
OLSR_DEPENDENCIES = host-flex host-bison
diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk
index 98bae20..103930f 100644
--- a/package/omniorb/omniorb.mk
+++ b/package/omniorb/omniorb.mk
@@ -8,7 +8,7 @@ OMNIORB_VERSION = 4.2.1
OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION)
OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2
OMNIORB_INSTALL_STAGING = YES
-OMNIORB_LICENSE = GPL2+, LGPLv2.1+
+OMNIORB_LICENSE = GPL2+, LGPL-2.1+
OMNIORB_LICENSE_FILES = COPYING COPYING.LIB
OMNIORB_DEPENDENCIES = host-omniorb
HOST_OMNIORB_DEPENDENCIES = host-python
diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk
index b6b2bf0..94ad26a 100644
--- a/package/openobex/openobex.mk
+++ b/package/openobex/openobex.mk
@@ -10,7 +10,7 @@ OPENOBEX_SITE = http://downloads.sourceforge.net/project/openobex/openobex/$(OPE
OPENOBEX_SOURCE = openobex-$(OPENOBEX_VERSION)-Source.zip
# Libraries seems to be released under LGPLv2.1+,
# while other material is under GPLv2+.
-OPENOBEX_LICENSE = GPL-2.0+/LGPLv2.1+
+OPENOBEX_LICENSE = GPL-2.0+/LGPL-2.1+
OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
OPENOBEX_DEPENDENCIES = host-pkgconf
diff --git a/package/openpgm/openpgm.mk b/package/openpgm/openpgm.mk
index 42b0a5d..8c85344 100644
--- a/package/openpgm/openpgm.mk
+++ b/package/openpgm/openpgm.mk
@@ -6,7 +6,7 @@
OPENPGM_VERSION = release-5-2-122
OPENPGM_SITE = $(call github,steve-o,openpgm,$(OPENPGM_VERSION))
-OPENPGM_LICENSE = LGPLv2.1+
+OPENPGM_LICENSE = LGPL-2.1+
OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE
OPENPGM_INSTALL_STAGING = YES
OPENPGM_SUBDIR = openpgm/pgm
diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk
index d3eda5c..cc71324 100644
--- a/package/openvmtools/openvmtools.mk
+++ b/package/openvmtools/openvmtools.mk
@@ -7,7 +7,7 @@
OPENVMTOOLS_VERSION = 5a9033ddfa95786d867e4d02bbb9a29bac8fb64f
OPENVMTOOLS_SITE = $(call github,vmware,open-vm-tools,$(OPENVMTOOLS_VERSION))
OPENVMTOOLS_SUBDIR = open-vm-tools
-OPENVMTOOLS_LICENSE = LGPLv2.1
+OPENVMTOOLS_LICENSE = LGPL-2.1
OPENVMTOOLS_LICENSE_FILES = $(OPENVMTOOLS_SUBDIR)/COPYING
# Autoreconf needed or config/missing will run configure again at buildtime
diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk
index da17231..0bd61e8 100644
--- a/package/ortp/ortp.mk
+++ b/package/ortp/ortp.mk
@@ -9,7 +9,7 @@ ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
ORTP_CONF_OPTS = --disable-strict
ORTP_INSTALL_STAGING = YES
-ORTP_LICENSE = LGPLv2.1+
+ORTP_LICENSE = LGPL-2.1+
ORTP_LICENSE_FILES = COPYING
ORTP_DEPENDENCIES = bctoolbox
diff --git a/package/p7zip/p7zip.mk b/package/p7zip/p7zip.mk
index 15d5138..1035a0d 100644
--- a/package/p7zip/p7zip.mk
+++ b/package/p7zip/p7zip.mk
@@ -7,7 +7,7 @@
P7ZIP_VERSION = 15.14.1
P7ZIP_SOURCE = p7zip_$(P7ZIP_VERSION)_src_all.tar.bz2
P7ZIP_SITE = http://downloads.sourceforge.net/project/p7zip/p7zip/$(P7ZIP_VERSION)
-P7ZIP_LICENSE = LGPLv2.1+ with unRAR restriction
+P7ZIP_LICENSE = LGPL-2.1+ with unRAR restriction
P7ZIP_LICENSE_FILES = DOC/License.txt
# p7zip buildsystem is a mess: it plays dirty tricks with CFLAGS and
diff --git a/package/pangomm/pangomm.mk b/package/pangomm/pangomm.mk
index 7146532..9edcb16 100644
--- a/package/pangomm/pangomm.mk
+++ b/package/pangomm/pangomm.mk
@@ -8,7 +8,7 @@ PANGOMM_VERSION_MAJOR = 2.40
PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).1
PANGOMM_SOURCE = pangomm-$(PANGOMM_VERSION).tar.xz
PANGOMM_SITE = http://ftp.gnome.org/pub/gnome/sources/pangomm/$(PANGOMM_VERSION_MAJOR)
-PANGOMM_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (tools)
+PANGOMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
PANGOMM_LICENSE_FILES = COPYING COPYING.tools
PANGOMM_INSTALL_STAGING = YES
PANGOMM_DEPENDENCIES = glibmm cairomm libsigc pango host-pkgconf
diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk
index 8144cca..7a48cec 100644
--- a/package/pseudo/pseudo.mk
+++ b/package/pseudo/pseudo.mk
@@ -9,7 +9,7 @@ PSEUDO_SITE = https://git.yoctoproject.org/git/pseudo
PSEUDO_SITE_METHOD = git
# No "or later" clause.
-PSEUDO_LICENSE = LGPLv2.1
+PSEUDO_LICENSE = LGPL-2.1
PSEUDO_LICENSE_FILES = COPYING
HOST_PSEUDO_DEPENDENCIES = host-attr host-sqlite
diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
index 74a028b..0c409a7 100644
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -8,7 +8,7 @@ PULSEAUDIO_VERSION = 9.0
PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz
PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases
PULSEAUDIO_INSTALL_STAGING = YES
-PULSEAUDIO_LICENSE = LGPLv2.1+ (specific license for modules, see LICENSE file)
+PULSEAUDIO_LICENSE = LGPL-2.1+ (specific license for modules, see LICENSE file)
PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL
PULSEAUDIO_CONF_OPTS = \
--disable-default-build-tests \
diff --git a/package/python-chardet/python-chardet.mk b/package/python-chardet/python-chardet.mk
index 1962954..0a4788b 100644
--- a/package/python-chardet/python-chardet.mk
+++ b/package/python-chardet/python-chardet.mk
@@ -8,7 +8,7 @@ PYTHON_CHARDET_VERSION = 2.3.0
PYTHON_CHARDET_SOURCE = chardet-$(PYTHON_CHARDET_VERSION).tar.gz
PYTHON_CHARDET_SITE = https://pypi.python.org/packages/7d/87/4e3a3f38b2f5c578ce44f8dc2aa053217de9f0b6d737739b0ddac38ed237
PYTHON_CHARDET_SETUP_TYPE = setuptools
-PYTHON_CHARDET_LICENSE = LGPLv2.1+
+PYTHON_CHARDET_LICENSE = LGPL-2.1+
PYTHON_CHARDET_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-dialog/python-dialog.mk b/package/python-dialog/python-dialog.mk
index b75d19f..01bcb76 100644
--- a/package/python-dialog/python-dialog.mk
+++ b/package/python-dialog/python-dialog.mk
@@ -7,7 +7,7 @@
PYTHON_DIALOG_VERSION = 3.0.1
PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2
PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION)
-PYTHON_DIALOG_LICENSE = LGPLv2.1+
+PYTHON_DIALOG_LICENSE = LGPL-2.1+
PYTHON_DIALOG_LICENSE_FILES = COPYING
PYTHON_DIALOG_SETUP_TYPE = distutils
PYTHON_DIALOG_DEPENDENCIES = dialog
diff --git a/package/python-dialog3/python-dialog3.mk b/package/python-dialog3/python-dialog3.mk
index abc4a39..4048447 100644
--- a/package/python-dialog3/python-dialog3.mk
+++ b/package/python-dialog3/python-dialog3.mk
@@ -7,7 +7,7 @@
PYTHON_DIALOG3_VERSION = 3.4.0
PYTHON_DIALOG3_SOURCE = pythondialog-$(PYTHON_DIALOG3_VERSION).tar.bz2
PYTHON_DIALOG3_SITE = https://pypi.python.org/packages/fa/f4/686742f01ebb5863d4c5e1acab620acfed0fe97280a26b4ed25917f4f333
-PYTHON_DIALOG3_LICENSE = LGPLv2.1+
+PYTHON_DIALOG3_LICENSE = LGPL-2.1+
PYTHON_DIALOG3_LICENSE_FILES = COPYING
PYTHON_DIALOG3_SETUP_TYPE = distutils
PYTHON_DIALOG3_DEPENDENCIES = dialog
diff --git a/package/python-gobject/python-gobject.mk b/package/python-gobject/python-gobject.mk
index 74cb054..a52eebf 100644
--- a/package/python-gobject/python-gobject.mk
+++ b/package/python-gobject/python-gobject.mk
@@ -8,7 +8,7 @@ PYTHON_GOBJECT_VERSION_MAJOR = 2.28
PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).6
PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz
PYTHON_GOBJECT_SITE = http://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR)
-PYTHON_GOBJECT_LICENSE = LGPLv2.1+
+PYTHON_GOBJECT_LICENSE = LGPL-2.1+
PYTHON_GOBJECT_LICENSE_FILES = COPYING
PYTHON_GOBJECT_DEPENDENCIES = host-pkgconf libglib2
PYTHON_GOBJECT_CONF_OPTS = --disable-introspection
diff --git a/package/python-pam/python-pam.mk b/package/python-pam/python-pam.mk
index d737291..943e01d 100644
--- a/package/python-pam/python-pam.mk
+++ b/package/python-pam/python-pam.mk
@@ -9,7 +9,7 @@ PYTHON_PAM_SOURCE = PyPAM-$(PYTHON_PAM_VERSION).tar.gz
# pangalactic.org gone
PYTHON_PAM_SITE = http://pkgs.fedoraproject.org/repo/pkgs/PyPAM/PyPAM-0.5.0.tar.gz/f1e7c2c56421dda28a75ace59a3c8871
PYTHON_PAM_SETUP_TYPE = distutils
-PYTHON_PAM_LICENSE = LGPLv2.1
+PYTHON_PAM_LICENSE = LGPL-2.1
PYTHON_PAM_LICENSE_FILES = COPYING
PYTHON_PAM_DEPENDENCIES = linux-pam
diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk
index 6c0df4d..755a7db 100644
--- a/package/python-paramiko/python-paramiko.mk
+++ b/package/python-paramiko/python-paramiko.mk
@@ -8,7 +8,7 @@ PYTHON_PARAMIKO_VERSION = 2.1.1
PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz
PYTHON_PARAMIKO_SITE = https://pypi.python.org/packages/d1/5a/ebd00d884f30baf208359a027eb7b38372d81d0c004724bb1aa71ae43b37
PYTHON_PARAMIKO_SETUP_TYPE = setuptools
-PYTHON_PARAMIKO_LICENSE = LGPLv2.1+
+PYTHON_PARAMIKO_LICENSE = LGPL-2.1+
PYTHON_PARAMIKO_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk
index 1ef2bdf..8deb42a 100644
--- a/package/python-pygame/python-pygame.mk
+++ b/package/python-pygame/python-pygame.mk
@@ -11,7 +11,7 @@ PYTHON_PYGAME_SOURCE = pygame-$(PYTHON_PYGAME_VERSION).tar.gz
PYTHON_PYGAME_SITE = https://bitbucket.org/pygame/pygame
PYTHON_PYGAME_SITE_METHOD = hg
PYTHON_PYGAME_SETUP_TYPE = distutils
-PYTHON_PYGAME_LICENSE = LGPLv2.1+
+PYTHON_PYGAME_LICENSE = LGPL-2.1+
PYTHON_PYGAME_LICENSE_FILES = LGPL
ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y)
diff --git a/package/python-pyudev/python-pyudev.mk b/package/python-pyudev/python-pyudev.mk
index 70c4faf..db941ea 100644
--- a/package/python-pyudev/python-pyudev.mk
+++ b/package/python-pyudev/python-pyudev.mk
@@ -7,7 +7,7 @@
PYTHON_PYUDEV_VERSION = 0.18
PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz
PYTHON_PYUDEV_SITE = https://pypi.python.org/packages/source/p/pyudev
-PYTHON_PYUDEV_LICENSE = LGPLv2.1+
+PYTHON_PYUDEV_LICENSE = LGPL-2.1+
PYTHON_PYUDEV_LICENSE_FILES = COPYING
PYTHON_PYUDEV_SETUP_TYPE = setuptools
diff --git a/package/python-urwid/python-urwid.mk b/package/python-urwid/python-urwid.mk
index e52a155..4cfee47 100644
--- a/package/python-urwid/python-urwid.mk
+++ b/package/python-urwid/python-urwid.mk
@@ -7,7 +7,7 @@
PYTHON_URWID_VERSION = 1.3.1
PYTHON_URWID_SOURCE = urwid-$(PYTHON_URWID_VERSION).tar.gz
PYTHON_URWID_SITE = https://pypi.python.org/packages/source/u/urwid
-PYTHON_URWID_LICENSE = LGPLv2.1+
+PYTHON_URWID_LICENSE = LGPL-2.1+
PYTHON_URWID_LICENSE_FILES = COPYING
PYTHON_URWID_SETUP_TYPE = setuptools
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 6c42490..4dffaed 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -7,7 +7,7 @@
QEMU_VERSION = 2.8.0
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
QEMU_SITE = http://wiki.qemu.org/download
-QEMU_LICENSE = GPL-2.0, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
+QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
QEMU_LICENSE_FILES = COPYING COPYING.LIB
#?NOTE: there is no top-level license file for non-(L)GPL licenses;
# the non-(L)GPL license texts are specified in the affected
diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk
index dab2381..1777b94 100644
--- a/package/qjson/qjson.mk
+++ b/package/qjson/qjson.mk
@@ -10,7 +10,7 @@ QJSON_INSTALL_STAGING = YES
QJSON_DEPENDENCIES = \
$(if $(BR2_PACKAGE_QT),qt) \
$(if $(BR2_PACKAGE_QT5),qt5base)
-QJSON_LICENSE = LGPLv2.1
+QJSON_LICENSE = LGPL-2.1
QJSON_LICENSE_FILES = COPYING.lib
$(eval $(cmake-package))
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 68d407e..1fdb1bf 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -21,7 +21,7 @@ QT_PATCH = https://github.com/qtproject/qtbase/commit/b8f98d956501dfa4ce03a137f1
QT_DEPENDENCIES = host-pkgconf
QT_INSTALL_STAGING = YES
-QT_LICENSE := LGPLv2.1 with exceptions or GPL-3.0
+QT_LICENSE := LGPL-2.1 with exceptions or GPL-3.0
ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
QT_LICENSE := $(QT_LICENSE) or Digia Qt Commercial license
endif
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index a8e044a..706a7dc 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -53,7 +53,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5BASE_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5BASE_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index 08eda9f..11a16e7 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 63a5a63..546f13d 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk
index c39b953..8d0f385 100644
--- a/package/qt5/qt5enginio/qt5enginio.mk
+++ b/package/qt5/qt5enginio/qt5enginio.mk
@@ -13,7 +13,7 @@ QT5ENGINIO_DEPENDENCIES = openssl qt5base
QT5ENGINIO_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5ENGINIO_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3c (examples)
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index 78aa570..281c766 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index afc7a45..658ab68 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index da55f64..3b9b5d0 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5LOCATION_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 012ce1f..93b14d3 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index 43971c7..ec9b750 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -11,7 +11,7 @@ QT5SCRIPT_DEPENDENCIES = qt5base
QT5SCRIPT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SCRIPT_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SCRIPT_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
else
QT5SCRIPT_LICENSE = Commercial license
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index b89149c..bf3ab1c 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5SENSORS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index d81af17..d6a0bfb 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index 787c4aa..ec82334 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5SVG_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SVG_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index 6a843fa..d531ecf 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -24,7 +24,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5TOOLS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
-QT5TOOLS_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 93d3ed6..18544b8 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 980d2af..09d09fd 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -15,12 +15,12 @@ QT5WEBKIT_INSTALL_STAGING = YES
QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBKIT_LICENSE = LGPLv2.1+, BSD-3c, BSD-2c
+QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3c, BSD-2c
# Source files contain references to LGPL_EXCEPTION.txt but it is not included
# in the archive.
QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
else
-QT5WEBKIT_LICENSE = LGPLv2.1+ (WebCore), Commercial license
+QT5WEBKIT_LICENSE = LGPL-2.1+ (WebCore), Commercial license
QT5WEBKIT_REDISTRIBUTE = NO
endif
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index be0fc87..cbe06d8 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools)
QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3
else
-QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3
+QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3
QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index 119d15e..78f8aee 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index bb2f4ed..fa2bfa8 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/quazip/quazip.mk b/package/quazip/quazip.mk
index caf112e..09037a5 100644
--- a/package/quazip/quazip.mk
+++ b/package/quazip/quazip.mk
@@ -11,7 +11,7 @@ QUAZIP_DEPENDENCIES = \
zlib \
$(if $(BR2_PACKAGE_QT),qt) \
$(if $(BR2_PACKAGE_QT5),qt5base)
-QUAZIP_LICENSE = LGPLv2.1
+QUAZIP_LICENSE = LGPL-2.1
QUAZIP_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_QT5),y)
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
index d1bb524..d4e6d52 100644
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -16,7 +16,7 @@ QWT_DEPENDENCIES += qt5base
QWT_QMAKE = $(QT5_QMAKE)
endif
-QWT_LICENSE = LGPLv2.1 with exceptions
+QWT_LICENSE = LGPL-2.1 with exceptions
QWT_LICENSE_FILES = COPYING
QWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk
index 445d2be..4c7135f 100644
--- a/package/raptor/raptor.mk
+++ b/package/raptor/raptor.mk
@@ -8,7 +8,7 @@ RAPTOR_VERSION = 2.0.15
RAPTOR_SOURCE = raptor2-$(RAPTOR_VERSION).tar.gz
RAPTOR_SITE = http://download.librdf.org/source
RAPTOR_DEPENDENCIES = libxml2 libxslt
-RAPTOR_LICENSE = GPL-2.0+ or LGPLv2.1+ or Apache-2.0+
+RAPTOR_LICENSE = GPL-2.0+ or LGPL-2.1+ or Apache-2.0+
RAPTOR_LICENSE_FILES = LICENSE.txt
RAPTOR_INSTALL_STAGING = YES
diff --git a/package/rtmpdump/rtmpdump.mk b/package/rtmpdump/rtmpdump.mk
index 2e3428f..2472b52 100644
--- a/package/rtmpdump/rtmpdump.mk
+++ b/package/rtmpdump/rtmpdump.mk
@@ -9,7 +9,7 @@ RTMPDUMP_SITE = git://git.ffmpeg.org/rtmpdump
RTMPDUMP_INSTALL_STAGING = YES
# Note that rtmpdump is GPLv2 but librtmp has its own license and since we only
# care about librtmp, it's LGPLv2.1+
-RTMPDUMP_LICENSE = LGPLv2.1+
+RTMPDUMP_LICENSE = LGPL-2.1+
RTMPDUMP_LICENSE_FILES = librtmp/COPYING
RTMPDUMP_DEPENDENCIES = zlib
diff --git a/package/sbc/sbc.mk b/package/sbc/sbc.mk
index 6bafe03..77661c1 100644
--- a/package/sbc/sbc.mk
+++ b/package/sbc/sbc.mk
@@ -9,7 +9,7 @@ SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz
SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
SBC_INSTALL_STAGING = YES
SBC_DEPENDENCIES = libsndfile host-pkgconf
-SBC_LICENSE = GPL-2.0+ (programs), LGPLv2.1+ (library)
+SBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
SBC_LICENSE_FILES = COPYING COPYING.LIB
$(eval $(autotools-package))
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 38b4b97..0a6a7de 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -7,7 +7,7 @@
SDL_VERSION = 1.2.15
SDL_SOURCE = SDL-$(SDL_VERSION).tar.gz
SDL_SITE = http://www.libsdl.org/release
-SDL_LICENSE = LGPLv2.1+
+SDL_LICENSE = LGPL-2.1+
SDL_LICENSE_FILES = COPYING
SDL_INSTALL_STAGING = YES
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index 4fa7d9b..6c4f959 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -7,7 +7,7 @@
SDL_SOUND_VERSION = 1.0.3
SDL_SOUND_SOURCE = SDL_sound-$(SDL_SOUND_VERSION).tar.gz
SDL_SOUND_SITE = http://icculus.org/SDL_sound/downloads
-SDL_SOUND_LICENSE = LGPLv2.1+
+SDL_SOUND_LICENSE = LGPL-2.1+
SDL_SOUND_LICENSE_FILES = COPYING
SDL_SOUND_INSTALL_STAGING = YES
SDL_SOUND_DEPENDENCIES = sdl
diff --git a/package/setools/setools.mk b/package/setools/setools.mk
index 7ff14ac..532e3d0 100644
--- a/package/setools/setools.mk
+++ b/package/setools/setools.mk
@@ -9,7 +9,7 @@ SETOOLS_SOURCE = setools-$(SETOOLS_VERSION).tar.bz2
SETOOLS_SITE = https://raw.githubusercontent.com/wiki/TresysTechnology/setools3/files/dists/setools-$(SETOOLS_VERSION)
SETOOLS_DEPENDENCIES = libselinux libsepol sqlite libxml2 bzip2 host-bison host-flex
SETOOLS_INSTALL_STAGING = YES
-SETOOLS_LICENSE = GPL-2.0+, LGPLv2.1+
+SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+
SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
# configure.ac is patched by the cross compile patch,
diff --git a/package/smack/smack.mk b/package/smack/smack.mk
index 3ef4d47..7a4c722 100644
--- a/package/smack/smack.mk
+++ b/package/smack/smack.mk
@@ -6,7 +6,7 @@
SMACK_VERSION = v1.1.0
SMACK_SITE = $(call github,smack-team,smack,$(SMACK_VERSION))
-SMACK_LICENSE = LGPLv2.1
+SMACK_LICENSE = LGPL-2.1
SMACK_LICENSE_FILES = COPYING
SMACK_INSTALL_STAGING = YES
SMACK_DEPENDENCIES = host-pkgconf
diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk
index 5ece448..831b9ea 100644
--- a/package/sofia-sip/sofia-sip.mk
+++ b/package/sofia-sip/sofia-sip.mk
@@ -8,7 +8,7 @@ SOFIA_SIP_VERSION = 1.12.11
SOFIA_SIP_SITE = http://downloads.sourceforge.net/project/sofia-sip/sofia-sip/$(SOFIA_SIP_VERSION)
SOFIA_SIP_INSTALL_STAGING = YES
SOFIA_SIP_DEPENDENCIES = host-pkgconf
-SOFIA_SIP_LICENSE = LGPLv2.1+
+SOFIA_SIP_LICENSE = LGPL-2.1+
SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS
SOFIA_SIP_CONF_OPTS = --with-doxygen=no
diff --git a/package/sox/sox.mk b/package/sox/sox.mk
index 186f37d..0b3dc13 100644
--- a/package/sox/sox.mk
+++ b/package/sox/sox.mk
@@ -10,7 +10,7 @@ SOX_SOURCE = sox-$(SOX_VERSION).tar.bz2
SOX_DEPENDENCIES = host-pkgconf
SOX_CONF_OPTS = --with-distro="Buildroot" --without-ffmpeg --disable-gomp \
$(if $(BR2_TOOLCHAIN_HAS_SSP),,--disable-stack-protector)
-SOX_LICENSE = GPL-2.0+ (sox binary), LGPLv2.1+ (libraries)
+SOX_LICENSE = GPL-2.0+ (sox binary), LGPL-2.1+ (libraries)
SOX_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL
# MIPS Codescape toolchains don't support stack-smashing protection
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
index 61a9772..0474538 100644
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -7,7 +7,7 @@
SPICE_VERSION = 0.12.4
SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
SPICE_SITE = http://www.spice-space.org/download/releases
-SPICE_LICENSE = LGPLv2.1+
+SPICE_LICENSE = LGPL-2.1+
SPICE_LICENSE_FILES = COPYING
SPICE_INSTALL_STAGING = YES
SPICE_DEPENDENCIES = \
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
index ea5c42e..14107f0 100644
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -8,7 +8,7 @@ SYLPHEED_VERSION_MAJOR = 3.2
SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).0
SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
-SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPLv2.1+ (library, attachment plugin)
+SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPL-2.1+ (library, attachment plugin)
SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB
SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme
SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index 8f56f5c..192a52b 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -6,7 +6,7 @@
SYSLOG_NG_VERSION = 3.9.1
SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION)
-SYSLOG_NG_LICENSE = LGPLv2.1+ (syslog-ng core), GPL-2.0+ (modules)
+SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
SYSLOG_NG_LICENSE_FILES = COPYING
SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \
eventlog libglib2 openssl pcre
diff --git a/package/systemd-bootchart/systemd-bootchart.mk b/package/systemd-bootchart/systemd-bootchart.mk
index 31b9413..3be3918 100644
--- a/package/systemd-bootchart/systemd-bootchart.mk
+++ b/package/systemd-bootchart/systemd-bootchart.mk
@@ -10,7 +10,7 @@ SYSTEMD_BOOTCHART_SOURCE = systemd-bootchart-$(SYSTEMD_BOOTCHART_VERSION).tar.xz
# contains the generated autotools scripts. It also slightly differs with
# two missing source files... :-/
SYSTEMD_BOOTCHART_SITE = https://github.com/systemd/systemd-bootchart/releases/download/v$(SYSTEMD_BOOTCHART_VERSION)
-SYSTEMD_BOOTCHART_LICENSE = LGPLv2.1+
+SYSTEMD_BOOTCHART_LICENSE = LGPL-2.1+
SYSTEMD_BOOTCHART_LICENSE_FILES = LICENSE.LGPL2.1
SYSTEMD_BOOTCHART_DEPENDENCIES = systemd
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index d8ebec8..d8872c4 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -6,7 +6,7 @@
SYSTEMD_VERSION = 233
SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
-SYSTEMD_LICENSE = LGPLv2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README)
+SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README)
SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README
SYSTEMD_INSTALL_STAGING = YES
SYSTEMD_DEPENDENCIES = \
diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
index 58bb889..6f36347 100644
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -7,7 +7,7 @@
TAGLIB_VERSION = 1.11.1
TAGLIB_SITE = http://taglib.github.io/releases
TAGLIB_INSTALL_STAGING = YES
-TAGLIB_LICENSE = LGPLv2.1 or MPL-1.1
+TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1
TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL
ifeq ($(BR2_PACKAGE_ZLIB),y)
diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
index bbaa686..4c457a5 100644
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -8,7 +8,7 @@ TN5250_VERSION = 0.17.4
TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION)
TN5250_MAKE_OPTS = CPPFLAGS=""
TN5250_DEPENDENCIES = ncurses
-TN5250_LICENSE = LGPLv2.1+
+TN5250_LICENSE = LGPL-2.1+
TN5250_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/package/trace-cmd/trace-cmd.mk b/package/trace-cmd/trace-cmd.mk
index a4f2255..9d2154d 100644
--- a/package/trace-cmd/trace-cmd.mk
+++ b/package/trace-cmd/trace-cmd.mk
@@ -8,7 +8,7 @@ TRACE_CMD_VERSION = trace-cmd-v2.6
TRACE_CMD_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/rostedt/trace-cmd.git
TRACE_CMD_SITE_METHOD = git
TRACE_CMD_INSTALL_STAGING = YES
-TRACE_CMD_LICENSE = GPL-2.0, LGPLv2.1
+TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1
TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
TRACE_CMD_DEPENDENCIES = host-pkgconf
diff --git a/package/twolame/twolame.mk b/package/twolame/twolame.mk
index a26491f..d5628d1 100644
--- a/package/twolame/twolame.mk
+++ b/package/twolame/twolame.mk
@@ -8,7 +8,7 @@ TWOLAME_VERSION = 0.3.13
TWOLAME_SITE = http://downloads.sourceforge.net/project/twolame/twolame/$(TWOLAME_VERSION)
TWOLAME_DEPENDENCIES = host-pkgconf libsndfile
TWOLAME_INSTALL_STAGING = YES
-TWOLAME_LICENSE = LGPLv2.1+
+TWOLAME_LICENSE = LGPL-2.1+
TWOLAME_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/ubus/ubus.mk b/package/ubus/ubus.mk
index 08c9ce2..5fb57ea 100644
--- a/package/ubus/ubus.mk
+++ b/package/ubus/ubus.mk
@@ -7,7 +7,7 @@
UBUS_VERSION = 34c6e818e431cc53478a0f7c7c1eca07d194d692
UBUS_SITE = git://git.openwrt.org/project/ubus.git
-UBUS_LICENSE = LGPLv2.1
+UBUS_LICENSE = LGPL-2.1
UBUS_LICENSE_FILES = ubusd_acl.h
UBUS_INSTALL_STAGING = YES
diff --git a/package/uclibc-ng-test/uclibc-ng-test.mk b/package/uclibc-ng-test/uclibc-ng-test.mk
index 0e2b584..93736ed 100644
--- a/package/uclibc-ng-test/uclibc-ng-test.mk
+++ b/package/uclibc-ng-test/uclibc-ng-test.mk
@@ -6,7 +6,7 @@
UCLIBC_NG_TEST_VERSION = c9b9876cefc142a23aa622b821290ed16af80058
UCLIBC_NG_TEST_SITE = git://uclibc-ng.org/git/uclibc-ng-test
-UCLIBC_NG_TEST_LICENSE = LGPLv2.1+
+UCLIBC_NG_TEST_LICENSE = LGPL-2.1+
UCLIBC_NG_TEST_LICENSE_FILES = COPYING.LIB
# the math tests are recently synced from glibc and need more adaption before
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 8f6035e..91baf73 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -7,7 +7,7 @@
UCLIBC_VERSION = 1.0.22
UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
-UCLIBC_LICENSE = LGPLv2.1+
+UCLIBC_LICENSE = LGPL-2.1+
UCLIBC_LICENSE_FILES = COPYING.LIB
UCLIBC_INSTALL_STAGING = YES
diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk
index 387f804..d4aa02e 100644
--- a/package/unixodbc/unixodbc.mk
+++ b/package/unixodbc/unixodbc.mk
@@ -8,7 +8,7 @@ UNIXODBC_VERSION = 2.3.4
UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz
UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC
UNIXODBC_INSTALL_STAGING = YES
-UNIXODBC_LICENSE = LGPLv2.1+ (library), GPL-2.0+ (programs)
+UNIXODBC_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs)
UNIXODBC_LICENSE_FILES = COPYING exe/COPYING
UNIXODBC_CONF_OPTS = --enable-drivers --enable-driver-conf
diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
index ae251d6..02cd47c 100644
--- a/package/usbredir/usbredir.mk
+++ b/package/usbredir/usbredir.mk
@@ -7,7 +7,7 @@
USBREDIR_VERSION = 0.7.1
USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2
USBREDIR_SITE = http://spice-space.org/download/usbredir
-USBREDIR_LICENSE = LGPLv2.1+ (libraries)
+USBREDIR_LICENSE = LGPL-2.1+ (libraries)
USBREDIR_LICENSE_FILES = COPYING.LIB
USBREDIR_INSTALL_STAGING = YES
USBREDIR_DEPENDENCIES = host-pkgconf libusb
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 42a4a43..6989749 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -14,7 +14,7 @@ UTIL_LINUX_AUTORECONF = YES
# README.licensing claims that some files are GPLv2-only, but this is not true.
# Some files are GPLv3+ but only in tests.
-UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4c, LGPLv2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid)
+UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4c, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid)
UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3
UTIL_LINUX_INSTALL_STAGING = YES
UTIL_LINUX_DEPENDENCIES = host-pkgconf
diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index 70dc4b9..0ef3000 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -8,7 +8,7 @@ VALA_VERSION_MAJOR = 0.34
VALA_VERSION = $(VALA_VERSION_MAJOR).7
VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
-VALA_LICENSE = LGPLv2.1+
+VALA_LICENSE = LGPL-2.1+
VALA_LICENSE_FILES = COPYING
HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
index 6e0a074..ed59b6d 100644
--- a/package/vde2/vde2.mk
+++ b/package/vde2/vde2.mk
@@ -7,7 +7,7 @@
VDE2_VERSION = 2.3.2
VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
-VDE2_LICENSE = GPL-2.0+, LGPLv2.1+, BSD-3c
+VDE2_LICENSE = GPL-2.0+, LGPL-2.1+, BSD-3c
VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
VDE2_INSTALL_STAGING = YES
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index 86418c3..6fc7734 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -7,7 +7,7 @@
VLC_VERSION = 2.2.4
VLC_SITE = http://get.videolan.org/vlc/$(VLC_VERSION)
VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
-VLC_LICENSE = GPL-2.0+, LGPLv2.1+
+VLC_LICENSE = GPL-2.0+, LGPL-2.1+
VLC_LICENSE_FILES = COPYING COPYING.LIB
VLC_DEPENDENCIES = host-pkgconf
VLC_AUTORECONF = YES
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index 7843373..8e253b5 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -8,7 +8,7 @@ WEBKITGTK_VERSION = 2.12.5
WEBKITGTK_SITE = http://www.webkitgtk.org/releases
WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
WEBKITGTK_INSTALL_STAGING = YES
-WEBKITGTK_LICENSE = LGPLv2.1+, BSD-2c
+WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2c
WEBKITGTK_LICENSE_FILES = \
Source/WebCore/LICENSE-APPLE \
Source/WebCore/LICENSE-LGPL-2.1
diff --git a/package/wine/wine.mk b/package/wine/wine.mk
index f9b2e1a..5c47186 100644
--- a/package/wine/wine.mk
+++ b/package/wine/wine.mk
@@ -7,7 +7,7 @@
WINE_VERSION = 2.0
WINE_SOURCE = wine-$(WINE_VERSION).tar.bz2
WINE_SITE = https://dl.winehq.org/wine/source/2.0
-WINE_LICENSE = LGPLv2.1+
+WINE_LICENSE = LGPL-2.1+
WINE_LICENSE_FILES = COPYING.LIB LICENSE
WINE_DEPENDENCIES = host-bison host-flex host-wine
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 5125473..1b0b16c 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -13,7 +13,7 @@ endif
XENOMAI_SITE = https://xenomai.org/downloads/xenomai/stable
XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
-XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPLv2.1+ (libraries), GPL-2.0+ (kernel), GFDLv1.2+ (docs), GPL-2.0 (ipipe patch, can driver)
+XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDLv1.2+ (docs), GPL-2.0 (ipipe patch, can driver)
# GFDL is not included but refers to gnu.org
XENOMAI_LICENSE_FILES = debian/copyright include/COPYING lib/trank/COPYING kernel/cobalt/COPYING
diff --git a/package/xz/xz.mk b/package/xz/xz.mk
index 83e834c..e8116f2 100644
--- a/package/xz/xz.mk
+++ b/package/xz/xz.mk
@@ -9,7 +9,7 @@ XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
XZ_SITE = http://tukaani.org/xz
XZ_INSTALL_STAGING = YES
XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-XZ_LICENSE = GPL-2.0+, GPL-3.0+, LGPLv2.1+
+XZ_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-2.1+
XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk
index aba78d1..c8fc899 100644
--- a/package/zbar/zbar.mk
+++ b/package/zbar/zbar.mk
@@ -7,7 +7,7 @@
# github have some additional commits for compiling with recent kernel
ZBAR_VERSION = 854a5d97059e395807091ac4d80c53f7968abb8f
ZBAR_SITE = $(call github,ZBar,Zbar,$(ZBAR_VERSION))
-ZBAR_LICENSE = LGPLv2.1+
+ZBAR_LICENSE = LGPL-2.1+
ZBAR_LICENSE_FILES = LICENSE
ZBAR_INSTALL_STAGING = YES
ZBAR_AUTORECONF = YES
diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk
index 4f7f469..8e005e4 100644
--- a/package/zlog/zlog.mk
+++ b/package/zlog/zlog.mk
@@ -6,7 +6,7 @@
ZLOG_VERSION = 6ddb9bbf3ff0123e701bf60996f351576ebe9c00
ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION))
-ZLOG_LICENSE = LGPLv2.1
+ZLOG_LICENSE = LGPL-2.1
ZLOG_LICENSE_FILES = COPYING
ZLOG_INSTALL_STAGING = YES
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 06/21] package: use SPDX short identifier for LGPLv3/LGPLv3+
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (4 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 05/21] boot, package: use SPDX short identifier for LGPLv2.1/LGPLv2.1+ Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 07/21] package: use SPDX short identifier for AGPLv3 Rahul Bedarkar
` (16 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for LGPLv3/LGPLv3+ is LGPL-3.0/LGPL-3.0+.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/LGPLv3(\+)?/LGPL-3.0\1/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/4th/4th.mk | 2 +-
package/adwaita-icon-theme/adwaita-icon-theme.mk | 2 +-
package/cppcms/cppcms.mk | 2 +-
package/cxxtest/cxxtest.mk | 2 +-
package/ding-libs/ding-libs.mk | 2 +-
package/elfutils/elfutils.mk | 2 +-
package/evemu/evemu.mk | 2 +-
package/gdb/gdb.mk | 2 +-
package/gmp/gmp.mk | 2 +-
package/granite/granite.mk | 2 +-
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 2 +-
package/guile/guile.mk | 2 +-
package/kompexsqlite/kompexsqlite.mk | 2 +-
package/lensfun/lensfun.mk | 2 +-
package/libcgicc/libcgicc.mk | 2 +-
package/libfreefare/libfreefare.mk | 2 +-
package/libidn/libidn.mk | 2 +-
package/libksba/libksba.mk | 2 +-
package/libnfc/libnfc.mk | 2 +-
package/libnpth/libnpth.mk | 2 +-
package/libphidget/libphidget.mk | 2 +-
package/libserialport/libserialport.mk | 2 +-
package/libunistring/libunistring.mk | 2 +-
package/libwebsock/libwebsock.mk | 2 +-
package/lightning/lightning.mk | 2 +-
package/mpc/mpc.mk | 2 +-
package/mpfr/mpfr.mk | 2 +-
package/netatalk/netatalk.mk | 2 +-
package/nettle/nettle.mk | 2 +-
package/openzwave/openzwave.mk | 2 +-
package/phidgetwebservice/phidgetwebservice.mk | 2 +-
package/python-argh/python-argh.mk | 2 +-
package/python-can/python-can.mk | 2 +-
package/python-crc16/python-crc16.mk | 2 +-
package/python-cssutils/python-cssutils.mk | 2 +-
package/python-dominate/python-dominate.mk | 2 +-
package/python-iowait/python-iowait.mk | 2 +-
package/python-json-schema-validator/python-json-schema-validator.mk | 2 +-
package/python-pyzmq/python-pyzmq.mk | 2 +-
package/python-versiontools/python-versiontools.mk | 2 +-
package/python-web2py/python-web2py.mk | 2 +-
package/qt-webkit-kiosk/qt-webkit-kiosk.mk | 2 +-
package/qt5/qt53d/qt53d.mk | 2 +-
package/qt5/qt5base/qt5base.mk | 4 ++--
package/qt5/qt5canvas3d/qt5canvas3d.mk | 2 +-
package/qt5/qt5connectivity/qt5connectivity.mk | 4 ++--
package/qt5/qt5declarative/qt5declarative.mk | 4 ++--
package/qt5/qt5enginio/qt5enginio.mk | 2 +-
package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 ++--
package/qt5/qt5imageformats/qt5imageformats.mk | 4 ++--
package/qt5/qt5location/qt5location.mk | 4 ++--
package/qt5/qt5multimedia/qt5multimedia.mk | 4 ++--
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +-
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +-
package/qt5/qt5script/qt5script.mk | 2 +-
package/qt5/qt5sensors/qt5sensors.mk | 4 ++--
package/qt5/qt5serialbus/qt5serialbus.mk | 2 +-
package/qt5/qt5serialport/qt5serialport.mk | 4 ++--
package/qt5/qt5svg/qt5svg.mk | 4 ++--
package/qt5/qt5tools/qt5tools.mk | 4 ++--
package/qt5/qt5webchannel/qt5webchannel.mk | 4 ++--
package/qt5/qt5websockets/qt5websockets.mk | 4 ++--
| 4 ++--
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 ++--
package/riemann-c-client/riemann-c-client.mk | 2 +-
package/rsyslog/rsyslog.mk | 2 +-
package/urg/urg.mk | 2 +-
package/wiringpi/wiringpi.mk | 2 +-
package/zeromq/zeromq.mk | 2 +-
69 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/package/4th/4th.mk b/package/4th/4th.mk
index 0226db1..d7daeb3 100644
--- a/package/4th/4th.mk
+++ b/package/4th/4th.mk
@@ -7,7 +7,7 @@
4TH_VERSION = 3.62.4
4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz
4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION)
-4TH_LICENSE = GPL-3.0+, LGPLv3+
+4TH_LICENSE = GPL-3.0+, LGPL-3.0+
# The COPYING file only contains the text of the LGPLv3, but the
# source code really contains parts under GPLv3+.
4TH_LICENSE_FILES = COPYING
diff --git a/package/adwaita-icon-theme/adwaita-icon-theme.mk b/package/adwaita-icon-theme/adwaita-icon-theme.mk
index fdf66c8..8c9dec1 100644
--- a/package/adwaita-icon-theme/adwaita-icon-theme.mk
+++ b/package/adwaita-icon-theme/adwaita-icon-theme.mk
@@ -9,7 +9,7 @@ ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0
ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR)
ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz
ADWAITA_ICON_THEME_INSTALL_STAGING = YES
-ADWAITA_ICON_THEME_LICENSE = LGPLv3 or CC-BY-SA-3.0
+ADWAITA_ICON_THEME_LICENSE = LGPL-3.0 or CC-BY-SA-3.0
ADWAITA_ICON_THEME_LICENSE_FILES = COPYING COPYING_LGPL COPYING_CCBYSA3
ADWAITA_ICON_THEME_DEPENDENCIES = host-intltool host-libgtk3
diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk
index 611020c..1f6c09d 100644
--- a/package/cppcms/cppcms.mk
+++ b/package/cppcms/cppcms.mk
@@ -6,7 +6,7 @@
CPPCMS_VERSION = 1.0.5
CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2
-CPPCMS_LICENSE = LGPLv3
+CPPCMS_LICENSE = LGPL-3.0
CPPCMS_LICENSE_FILES = COPYING.TXT
CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION)
CPPCMS_INSTALL_STAGING = YES
diff --git a/package/cxxtest/cxxtest.mk b/package/cxxtest/cxxtest.mk
index 93bdd8b..4ea9adf 100644
--- a/package/cxxtest/cxxtest.mk
+++ b/package/cxxtest/cxxtest.mk
@@ -6,7 +6,7 @@
CXXTEST_VERSION = 4.4
CXXTEST_SITE = https://github.com/CxxTest/cxxtest/releases/download/$(CXXTEST_VERSION)
-CXXTEST_LICENSE = LGPLv3
+CXXTEST_LICENSE = LGPL-3.0
CXXTEST_LICENSE_FILES = COPYING
CXXTEST_INSTALL_STAGING = YES
CXXTEST_INSTALL_TARGET = NO
diff --git a/package/ding-libs/ding-libs.mk b/package/ding-libs/ding-libs.mk
index 8a6615d..4b045be 100644
--- a/package/ding-libs/ding-libs.mk
+++ b/package/ding-libs/ding-libs.mk
@@ -11,7 +11,7 @@ DING_LIBS_DEPENDENCIES = host-pkgconf \
$(if $(BR2_PACKAGE_GETTEXT),gettext) \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
DING_LIBS_INSTALL_STAGING = YES
-DING_LIBS_LICENSE = LGPLv3+ (library),GPL-3.0+ (test programs)
+DING_LIBS_LICENSE = LGPL-3.0+ (library),GPL-3.0+ (test programs)
DING_LIBS_LICENSE_FILES = COPYING COPYING.LESSER
# autoconf/automake generated files not present in tarball
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
index a7800b9..de2ef9c 100644
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -8,7 +8,7 @@ ELFUTILS_VERSION = 0.166
ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION)
ELFUTILS_INSTALL_STAGING = YES
-ELFUTILS_LICENSE = GPL-2.0+ or LGPLv3+ (library)
+ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library)
ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3
ELFUTILS_DEPENDENCIES = zlib
HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz
diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk
index 57f324b..d525207 100644
--- a/package/evemu/evemu.mk
+++ b/package/evemu/evemu.mk
@@ -7,7 +7,7 @@
EVEMU_VERSION = 2.5.0
EVEMU_SITE = http://www.freedesktop.org/software/evemu
EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz
-EVEMU_LICENSE = LGPLv3 (library), GPL-3.0 (tools)
+EVEMU_LICENSE = LGPL-3.0 (library), GPL-3.0 (tools)
EVEMU_LICENSE_FILES = COPYING
# asciidoc used to generate manpages, which we don't need, and if it's
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index f2315a9..8fc8bb7 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -20,7 +20,7 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
GDB_FROM_GIT = y
endif
-GDB_LICENSE = GPL-2.0+, LGPLv2+, GPL-3.0+, LGPLv3+
+GDB_LICENSE = GPL-2.0+, LGPLv2+, GPL-3.0+, LGPL-3.0+
GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB
# We only want gdbserver and not the entire debugger.
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index d85ab81..5ea79ae 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -8,7 +8,7 @@ GMP_VERSION = 6.1.2
GMP_SITE = $(BR2_GNU_MIRROR)/gmp
GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz
GMP_INSTALL_STAGING = YES
-GMP_LICENSE = LGPLv3+ or GPL-2.0+
+GMP_LICENSE = LGPL-3.0+ or GPL-2.0+
GMP_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2
GMP_DEPENDENCIES = host-m4
HOST_GMP_DEPENDENCIES = host-m4
diff --git a/package/granite/granite.mk b/package/granite/granite.mk
index 3faedf9..4ad64c2 100644
--- a/package/granite/granite.mk
+++ b/package/granite/granite.mk
@@ -10,7 +10,7 @@ GRANITE_SITE = https://launchpad.net/granite/$(GRANITE_VERSION_MAJOR)/$(GRANITE_
GRANITE_SOURCE = granite-$(GRANITE_VERSION).tar.xz
GRANITE_DEPENDENCIES = host-pkgconf host-vala libgee libglib2 libgtk3
GRANITE_INSTALL_STAGING = YES
-GRANITE_LICENSE = LGPLv3+
+GRANITE_LICENSE = LGPL-3.0+
GRANITE_LICENSE_FILES = COPYING
$(eval $(cmake-package))
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index 6f0e38d..b04eecb 100644
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -16,7 +16,7 @@ GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPL-3.0+ (libav)
GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3
else
GST_FFMPEG_CONF_OPTS += --enable-lgpl
-GST_FFMPEG_LICENSE = LGPLv2+ (gst-ffmpeg), LGPL-2.1+/LGPLv3+ (libav)
+GST_FFMPEG_LICENSE = LGPLv2+ (gst-ffmpeg), LGPL-2.1+/LGPL-3.0+ (libav)
GST_FFMPEG_LICENSE_FILES = COPYING.LIB gst-libs/ext/libav/COPYING.LGPLv2.1 gst-libs/ext/libav/COPYING.LGPLv3
endif
diff --git a/package/guile/guile.mk b/package/guile/guile.mk
index 88c7414..2ccd8e6 100644
--- a/package/guile/guile.mk
+++ b/package/guile/guile.mk
@@ -10,7 +10,7 @@ GUILE_SITE = $(BR2_GNU_MIRROR)/guile
GUILE_INSTALL_STAGING = YES
# For 0002-calculate-csqrt_manually.patch
GUILE_AUTORECONF = YES
-GUILE_LICENSE = LGPLv3+
+GUILE_LICENSE = LGPL-3.0+
GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER
# libtool dependency is needed because guile uses libltdl
diff --git a/package/kompexsqlite/kompexsqlite.mk b/package/kompexsqlite/kompexsqlite.mk
index 7f57680..51b80aa 100644
--- a/package/kompexsqlite/kompexsqlite.mk
+++ b/package/kompexsqlite/kompexsqlite.mk
@@ -8,7 +8,7 @@ KOMPEXSQLITE_VERSION = v1.10.12-1
KOMPEXSQLITE_SOURCE = $(KOMPEXSQLITE_VERSION).tar.gz
KOMPEXSQLITE_SITE = https://github.com/Aethelflaed/kompex-sqlite-wrapper/archive
KOMPEXSQLITE_INSTALL_STAGING = YES
-KOMPEXSQLITE_LICENSE = LGPLv3+ (wrapper), Public Domain (bundled sqlite)
+KOMPEXSQLITE_LICENSE = LGPL-3.0+ (wrapper), Public Domain (bundled sqlite)
KOMPEXSQLITE_LICENSE_FILES = LICENSE.txt
$(eval $(autotools-package))
diff --git a/package/lensfun/lensfun.mk b/package/lensfun/lensfun.mk
index c2b7ea4..175fbd9 100644
--- a/package/lensfun/lensfun.mk
+++ b/package/lensfun/lensfun.mk
@@ -6,7 +6,7 @@
LENSFUN_VERSION = 0.3.2
LENSFUN_SITE = https://sourceforge.net/projects/lensfun/files/$(LENSFUN_VERSION)
-LENSFUN_LICENSE = LGPLv3+ (libraries), GPL-3.0+ (programs)
+LENSFUN_LICENSE = LGPL-3.0+ (libraries), GPL-3.0+ (programs)
LENSFUN_LICENSE_FILES = docs/gpl-3.0.txt docs/lgpl-3.0.txt
LENSFUN_INSTALL_STAGING = YES
LENSFUN_DEPENDENCIES = libglib2
diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
index 1c36d42..9657f87 100644
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -7,7 +7,7 @@
LIBCGICC_VERSION = 3.2.16
LIBCGICC_SITE = $(BR2_GNU_MIRROR)/cgicc
LIBCGICC_SOURCE = cgicc-$(LIBCGICC_VERSION).tar.bz2
-LIBCGICC_LICENSE = LGPLv3+ (library), GFDL1.2+ (docs)
+LIBCGICC_LICENSE = LGPL-3.0+ (library), GFDL1.2+ (docs)
LIBCGICC_LICENSE_FILES = COPYING.LIB COPYING.DOC
LIBCGICC_INSTALL_STAGING = YES
LIBCGICC_AUTORECONF = YES
diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk
index e2d7bf1..13e6f2a 100644
--- a/package/libfreefare/libfreefare.mk
+++ b/package/libfreefare/libfreefare.mk
@@ -10,7 +10,7 @@ LIBFREEFARE_SOURCE = libfreefare-$(LIBFREEFARE_VERSION).tar.bz2
# the same as the one uploaded by upstream for the release.
LIBFREEFARE_SITE = https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-$(LIBFREEFARE_VERSION)
LIBFREEFARE_DEPENDENCIES = libnfc openssl
-LIBFREEFARE_LICENSE = LGPLv3+ with exception
+LIBFREEFARE_LICENSE = LGPL-3.0+ with exception
LIBFREEFARE_LICENSE_FILES = COPYING
ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
index 8145e08..18e28e0 100644
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -10,7 +10,7 @@ LIBIDN_INSTALL_STAGING = YES
LIBIDN_CONF_ENV = EMACS="no"
LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no
LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-LIBIDN_LICENSE = GPL-2.0+, GPL-3.0+, LGPLv3+
+LIBIDN_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+
LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3
define LIBIDN_REMOVE_BINARY
diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk
index 1a72cfd..25b17a4 100644
--- a/package/libksba/libksba.mk
+++ b/package/libksba/libksba.mk
@@ -7,7 +7,7 @@
LIBKSBA_VERSION = 1.3.5
LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2
LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba
-LIBKSBA_LICENSE = LGPLv3+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system)
+LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system)
LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
LIBKSBA_INSTALL_STAGING = YES
LIBKSBA_DEPENDENCIES = libgpg-error
diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
index aceedb0..b13fd69 100644
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -7,7 +7,7 @@
LIBNFC_VERSION = 1.7.1
LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.bz2
LIBNFC_SITE = https://github.com/nfc-tools/libnfc/releases/download/libnfc-$(LIBNFC_VERSION)
-LIBNFC_LICENSE = LGPLv3+
+LIBNFC_LICENSE = LGPL-3.0+
LIBNFC_LICENSE_FILES = COPYING
LIBNFC_AUTORECONF = YES
LIBNFC_INSTALL_STAGING = YES
diff --git a/package/libnpth/libnpth.mk b/package/libnpth/libnpth.mk
index 51bdc51..35111dd 100644
--- a/package/libnpth/libnpth.mk
+++ b/package/libnpth/libnpth.mk
@@ -7,7 +7,7 @@
LIBNPTH_VERSION = 1.3
LIBNPTH_SOURCE = npth-$(LIBNPTH_VERSION).tar.bz2
LIBNPTH_SITE = ftp://ftp.gnupg.org/gcrypt/npth
-LIBNPTH_LICENSE = LGPLv3+ or GPL-2.0+
+LIBNPTH_LICENSE = LGPL-3.0+ or GPL-2.0+
LIBNPTH_LICENSE_FILES = COPYING COPYING.LESSER
LIBNPTH_INSTALL_STAGING = YES
diff --git a/package/libphidget/libphidget.mk b/package/libphidget/libphidget.mk
index 1b2557d..23a320b 100644
--- a/package/libphidget/libphidget.mk
+++ b/package/libphidget/libphidget.mk
@@ -10,7 +10,7 @@ LIBPHIDGET_SITE = http://www.phidgets.com/downloads/libraries
LIBPHIDGET_DEPENDENCIES = libusb
LIBPHIDGET_CONF_OPTS = --disable-ldconfig
LIBPHIDGET_INSTALL_STAGING = YES
-LIBPHIDGET_LICENSE = LGPLv3
+LIBPHIDGET_LICENSE = LGPL-3.0
LIBPHIDGET_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libserialport/libserialport.mk b/package/libserialport/libserialport.mk
index 86ae17f..84d7a53 100644
--- a/package/libserialport/libserialport.mk
+++ b/package/libserialport/libserialport.mk
@@ -6,7 +6,7 @@
LIBSERIALPORT_VERSION = 0.1.1
LIBSERIALPORT_SITE = http://sigrok.org/download/source/libserialport
-LIBSERIALPORT_LICENSE = LGPLv3+
+LIBSERIALPORT_LICENSE = LGPL-3.0+
LIBSERIALPORT_LICENSE_FILES = COPYING
LIBSERIALPORT_INSTALL_STAGING = YES
LIBSERIALPORT_DEPENDENCIES = host-pkgconf
diff --git a/package/libunistring/libunistring.mk b/package/libunistring/libunistring.mk
index fc47ae4..9340e79 100644
--- a/package/libunistring/libunistring.mk
+++ b/package/libunistring/libunistring.mk
@@ -8,7 +8,7 @@ LIBUNISTRING_VERSION = 0.9.7
LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring
LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz
LIBUNISTRING_INSTALL_STAGING = YES
-LIBUNISTRING_LICENSE = LGPLv3+ or GPL-2.0
+LIBUNISTRING_LICENSE = LGPL-3.0+ or GPL-2.0
LIBUNISTRING_LICENSE_FILES = COPYING.LIB
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/package/libwebsock/libwebsock.mk b/package/libwebsock/libwebsock.mk
index b52293b..df3af3b 100644
--- a/package/libwebsock/libwebsock.mk
+++ b/package/libwebsock/libwebsock.mk
@@ -9,7 +9,7 @@ LIBWEBSOCK_SITE = $(call github,payden,libwebsock,$(LIBWEBSOCK_VERSION))
LIBWEBSOCK_DEPENDENCIES = libevent host-pkgconf
LIBWEBSOCK_AUTORECONF = YES
LIBWEBSOCK_INSTALL_STAGING = YES
-LIBWEBSOCK_LICENSE = LGPLv3
+LIBWEBSOCK_LICENSE = LGPL-3.0
LIBWEBSOCK_LICENSE_FILES = COPYING.lesser
ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/package/lightning/lightning.mk b/package/lightning/lightning.mk
index 052e593..0c2a101 100644
--- a/package/lightning/lightning.mk
+++ b/package/lightning/lightning.mk
@@ -6,7 +6,7 @@
LIGHTNING_VERSION = 2.1.0
LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning
-LIGHTNING_LICENSE = LGPLv3+
+LIGHTNING_LICENSE = LGPL-3.0+
LIGHTNING_LICENSE_FILES = COPYING.LESSER
LIGHTNING_INSTALL_STAGING = YES
diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk
index 579e2cc..89bbfd9 100644
--- a/package/mpc/mpc.mk
+++ b/package/mpc/mpc.mk
@@ -6,7 +6,7 @@
MPC_VERSION = 1.0.3
MPC_SITE = $(BR2_GNU_MIRROR)/mpc
-MPC_LICENSE = LGPLv3+
+MPC_LICENSE = LGPL-3.0+
MPC_LICENSE_FILES = COPYING.LESSER
MPC_INSTALL_STAGING = YES
MPC_DEPENDENCIES = gmp mpfr
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index bb78ccc..48dd487 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -7,7 +7,7 @@
MPFR_VERSION = 3.1.5
MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION)
MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz
-MPFR_LICENSE = LGPLv3+
+MPFR_LICENSE = LGPL-3.0+
MPFR_LICENSE_FILES = COPYING.LESSER
MPFR_INSTALL_STAGING = YES
MPFR_DEPENDENCIES = gmp
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
index 053a55d..8e661a0 100644
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -12,7 +12,7 @@ NETATALK_AUTORECONF = YES
NETATALK_CONFIG_SCRIPTS = netatalk-config
NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \
libevent
-NETATALK_LICENSE = GPL-2.0+, LGPLv3+, MIT-like
+NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like
NETATALK_LICENSE_FILES = COPYING COPYRIGHT
# Don't run ldconfig!
diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
index 4937f4e..e5012d2 100644
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -8,7 +8,7 @@ NETTLE_VERSION = 3.3
NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive
NETTLE_DEPENDENCIES = gmp
NETTLE_INSTALL_STAGING = YES
-NETTLE_LICENSE = Dual GPL-2.0+/LGPLv3+
+NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+
NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2
# don't include openssl support for (unused) examples as it has problems
# with static linking
diff --git a/package/openzwave/openzwave.mk b/package/openzwave/openzwave.mk
index 5f480e9..a632468 100644
--- a/package/openzwave/openzwave.mk
+++ b/package/openzwave/openzwave.mk
@@ -6,7 +6,7 @@
OPENZWAVE_VERSION = V1.5
OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION))
-OPENZWAVE_LICENSE = LGPLv3+, GPL-3.0 (examples), Apache-2.0 (sh2ju.sh)
+OPENZWAVE_LICENSE = LGPL-3.0+, GPL-3.0 (examples), Apache-2.0 (sh2ju.sh)
OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \
license/gpl.txt license/Apache-License-2.0.txt
diff --git a/package/phidgetwebservice/phidgetwebservice.mk b/package/phidgetwebservice/phidgetwebservice.mk
index f7d1b48..36c0185 100644
--- a/package/phidgetwebservice/phidgetwebservice.mk
+++ b/package/phidgetwebservice/phidgetwebservice.mk
@@ -8,7 +8,7 @@ PHIDGETWEBSERVICE_VERSION = 2.1.8.20140319
PHIDGETWEBSERVICE_SOURCE = phidgetwebservice_$(PHIDGETWEBSERVICE_VERSION).tar.gz
PHIDGETWEBSERVICE_SITE = http://www.phidgets.com/downloads/libraries
PHIDGETWEBSERVICE_DEPENDENCIES = libphidget
-PHIDGETWEBSERVICE_LICENSE = LGPLv3
+PHIDGETWEBSERVICE_LICENSE = LGPL-3.0
PHIDGETWEBSERVICE_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/python-argh/python-argh.mk b/package/python-argh/python-argh.mk
index bc5d713..ac51417 100644
--- a/package/python-argh/python-argh.mk
+++ b/package/python-argh/python-argh.mk
@@ -8,7 +8,7 @@ PYTHON_ARGH_VERSION = 0.26.2
PYTHON_ARGH_SOURCE = argh-$(PYTHON_ARGH_VERSION).tar.gz
PYTHON_ARGH_SITE = https://pypi.python.org/packages/e3/75/1183b5d1663a66aebb2c184e0398724b624cecd4f4b679cb6e25de97ed15
PYTHON_ARGH_SETUP_TYPE = setuptools
-PYTHON_ARGH_LICENSE = LGPLv3+
+PYTHON_ARGH_LICENSE = LGPL-3.0+
PYTHON_ARGH_LICENSE_FILES = README.rst
$(eval $(python-package))
diff --git a/package/python-can/python-can.mk b/package/python-can/python-can.mk
index ae9ef1a..eddefdb 100644
--- a/package/python-can/python-can.mk
+++ b/package/python-can/python-can.mk
@@ -6,7 +6,7 @@
PYTHON_CAN_VERSION = 1.4.3
PYTHON_CAN_SITE = https://pypi.python.org/packages/source/p/python-can
-PYTHON_CAN_LICENSE = LGPLv3
+PYTHON_CAN_LICENSE = LGPL-3.0
PYTHON_CAN_LICENSE_FILES = LICENSE.txt
PYTHON_CAN_SETUP_TYPE = setuptools
diff --git a/package/python-crc16/python-crc16.mk b/package/python-crc16/python-crc16.mk
index 3a292a0..9809f1e 100644
--- a/package/python-crc16/python-crc16.mk
+++ b/package/python-crc16/python-crc16.mk
@@ -6,7 +6,7 @@
PYTHON_CRC16_VERSION = 0.1.1
PYTHON_CRC16_SITE = $(call github,gennady,pycrc16,v$(PYTHON_CRC16_VERSION))
-PYTHON_CRC16_LICENSE = LGPLv3+
+PYTHON_CRC16_LICENSE = LGPL-3.0+
PYTHON_CRC16_LICENSE_FILES = COPYING.txt
PYTHON_CRC16_SETUP_TYPE = distutils
diff --git a/package/python-cssutils/python-cssutils.mk b/package/python-cssutils/python-cssutils.mk
index 3dd501a..3aa96f4 100644
--- a/package/python-cssutils/python-cssutils.mk
+++ b/package/python-cssutils/python-cssutils.mk
@@ -7,7 +7,7 @@
PYTHON_CSSUTILS_VERSION = 1.0.1
PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz
PYTHON_CSSUTILS_SITE = https://pypi.python.org/packages/22/de/6b03e0088baf0299ab7d2e95a9e26c2092e9cb3855876b958b6a62175ca2
-PYTHON_CSSUTILS_LICENSE = LGPLv3+
+PYTHON_CSSUTILS_LICENSE = LGPL-3.0+
PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER
PYTHON_CSSUTILS_SETUP_TYPE = setuptools
diff --git a/package/python-dominate/python-dominate.mk b/package/python-dominate/python-dominate.mk
index 3e264ca..70ddb06 100644
--- a/package/python-dominate/python-dominate.mk
+++ b/package/python-dominate/python-dominate.mk
@@ -8,7 +8,7 @@ PYTHON_DOMINATE_VERSION = 2.3.1
PYTHON_DOMINATE_SOURCE = dominate-$(PYTHON_DOMINATE_VERSION).tar.gz
PYTHON_DOMINATE_SITE = https://pypi.python.org/packages/43/b2/3b7d67dd59dab93ae08569384b254323516e8868b453eea5614a53835baf
PYTHON_DOMINATE_SETUP_TYPE = setuptools
-PYTHON_DOMINATE_LICENSE = LGPLv3+
+PYTHON_DOMINATE_LICENSE = LGPL-3.0+
PYTHON_DOMINATE_LICENSE_FILES = LICENSE.txt
$(eval $(python-package))
diff --git a/package/python-iowait/python-iowait.mk b/package/python-iowait/python-iowait.mk
index 99c2922..e327053 100644
--- a/package/python-iowait/python-iowait.mk
+++ b/package/python-iowait/python-iowait.mk
@@ -8,7 +8,7 @@ PYTHON_IOWAIT_VERSION = 0.2
PYTHON_IOWAIT_SOURCE = iowait-$(PYTHON_IOWAIT_VERSION).tar.gz
PYTHON_IOWAIT_SITE = https://pypi.python.org/packages/65/30/e953673fe9619938e9c74408401cf865f37716da89f61f6e5d9328c0f71e
PYTHON_IOWAIT_SETUP_TYPE = distutils
-PYTHON_IOWAIT_LICENSE = LGPLv3+
+PYTHON_IOWAIT_LICENSE = LGPL-3.0+
PYTHON_IOWAIT_LICENSE_FILES = COPYING.LESSER
$(eval $(python-package))
diff --git a/package/python-json-schema-validator/python-json-schema-validator.mk b/package/python-json-schema-validator/python-json-schema-validator.mk
index 1456c34..6accbd6 100644
--- a/package/python-json-schema-validator/python-json-schema-validator.mk
+++ b/package/python-json-schema-validator/python-json-schema-validator.mk
@@ -7,7 +7,7 @@
PYTHON_JSON_SCHEMA_VALIDATOR_VERSION = 2.4.1
PYTHON_JSON_SCHEMA_VALIDATOR_SOURCE = json-schema-validator-$(PYTHON_JSON_SCHEMA_VALIDATOR_VERSION).tar.gz
PYTHON_JSON_SCHEMA_VALIDATOR_SITE = https://pypi.python.org/packages/70/46/ba39cb7efad1898cfc89bf3588b8612f24d128f1c25b761994f524a59cef
-PYTHON_JSON_SCHEMA_VALIDATOR_LICENSE = LGPLv3
+PYTHON_JSON_SCHEMA_VALIDATOR_LICENSE = LGPL-3.0
PYTHON_JSON_SCHEMA_VALIDATOR_SETUP_TYPE = setuptools
PYTHON_JSON_SCHEMA_VALIDATOR_DEPENDENCIES = python-versiontools
diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk
index ade2d3a..4f8b5ec 100644
--- a/package/python-pyzmq/python-pyzmq.mk
+++ b/package/python-pyzmq/python-pyzmq.mk
@@ -7,7 +7,7 @@
PYTHON_PYZMQ_VERSION = 16.0.2
PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz
PYTHON_PYZMQ_SITE = https://pypi.python.org/packages/af/37/8e0bf3800823bc247c36715a52e924e8f8fd5d1432f04b44b8cd7a5d7e55
-PYTHON_PYZMQ_LICENSE = LGPLv3+, BSD-3c, Apache-2.0
+PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3c, Apache-2.0
# Apache license only online: http://www.apache.org/licenses/LICENSE-2.0
PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD
PYTHON_PYZMQ_DEPENDENCIES = zeromq
diff --git a/package/python-versiontools/python-versiontools.mk b/package/python-versiontools/python-versiontools.mk
index 4f763db..2170730 100644
--- a/package/python-versiontools/python-versiontools.mk
+++ b/package/python-versiontools/python-versiontools.mk
@@ -8,6 +8,6 @@ PYTHON_VERSIONTOOLS_VERSION = 1.9.1
PYTHON_VERSIONTOOLS_SOURCE = versiontools-$(PYTHON_VERSIONTOOLS_VERSION).tar.gz
PYTHON_VERSIONTOOLS_SITE = http://pypi.python.org/packages/source/v/versiontools
PYTHON_VERSIONTOOLS_SETUP_TYPE = setuptools
-PYTHON_VERSIONTOOLS_LICENSE = LGPLv3
+PYTHON_VERSIONTOOLS_LICENSE = LGPL-3.0
$(eval $(python-package))
diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk
index 38faabc..7fe9f82 100644
--- a/package/python-web2py/python-web2py.mk
+++ b/package/python-web2py/python-web2py.mk
@@ -6,7 +6,7 @@
PYTHON_WEB2PY_VERSION = R-2.12.3
PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION))
-PYTHON_WEB2PY_LICENSE = LGPLv3
+PYTHON_WEB2PY_LICENSE = LGPL-3.0
PYTHON_WEB2PY_LICENSE_FILES = LICENSE
PYTHON_WEB2PY_DEPENDENCIES = python python-pydal host-python-pydal
diff --git a/package/qt-webkit-kiosk/qt-webkit-kiosk.mk b/package/qt-webkit-kiosk/qt-webkit-kiosk.mk
index d54c8d5..341c20a 100644
--- a/package/qt-webkit-kiosk/qt-webkit-kiosk.mk
+++ b/package/qt-webkit-kiosk/qt-webkit-kiosk.mk
@@ -8,7 +8,7 @@ QT_WEBKIT_KIOSK_VERSION = 7fe40a350abfbe5ec194e7c6c740f7099e8704cd
QT_WEBKIT_KIOSK_SITE = https://github.com/sergey-dryabzhinsky/qt-webkit-kiosk.git
QT_WEBKIT_KIOSK_SITE_METHOD = git
QT_WEBKIT_KIOSK_DEPENDENCIES = qt5webkit qt5multimedia
-QT_WEBKIT_KIOSK_LICENSE = LGPLv3
+QT_WEBKIT_KIOSK_LICENSE = LGPL-3.0
QT_WEBKIT_KIOSK_LICENSE_FILES = doc/lgpl.html
define QT_WEBKIT_KIOSK_CONFIGURE_CMDS
diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
index 8cac2d2..9d89020 100644
--- a/package/qt5/qt53d/qt53d.mk
+++ b/package/qt5/qt53d/qt53d.mk
@@ -15,7 +15,7 @@ QT53D_DEPENDENCIES += assimp
endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT53D_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv3
+QT53D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0
QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3
else
QT53D_LICENSE = Commercial license
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 706a7dc..e949cf4 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -50,10 +50,10 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5BASE_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk
index cbdbf80..f49113b 100644
--- a/package/qt5/qt5canvas3d/qt5canvas3d.mk
+++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk
@@ -11,7 +11,7 @@ QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative
QT5CANVAS3D_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5CANVAS3D_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv3
+QT5CANVAS3D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0
QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
else
QT5CANVAS3D_LICENSE = Commercial license
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index 11a16e7..c0861c8 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -12,10 +12,10 @@ QT5CONNECTIVITY_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 546f13d..faf18ac 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -12,10 +12,10 @@ QT5DECLARATIVE_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk
index 8d0f385..468d1ff 100644
--- a/package/qt5/qt5enginio/qt5enginio.mk
+++ b/package/qt5/qt5enginio/qt5enginio.mk
@@ -13,7 +13,7 @@ QT5ENGINIO_DEPENDENCIES = openssl qt5base
QT5ENGINIO_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3c (examples)
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index 281c766..83e6c15 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -12,10 +12,10 @@ QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 658ab68..06797be 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -12,10 +12,10 @@ QT5IMAGEFORMATS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index 3b9b5d0..16927ae 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -12,10 +12,10 @@ QT5LOCATION_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5LOCATION_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index 93b14d3..e83aae2 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -12,10 +12,10 @@ QT5MULTIMEDIA_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 0653ef6..bf566fc 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -11,7 +11,7 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv3, GFDLv1.3 (docs)
+QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDLv1.3 (docs)
QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5QUICKCONTROLS_LICENSE = Commercial license
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index 1b33623..a19a05e 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -11,7 +11,7 @@ QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS2_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPLv3, GFDLv1.3 (docs)
+QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDLv1.3 (docs)
QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5QUICKCONTROLS2_LICENSE = Commercial license
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index ec9b750..7e25eb1 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -11,7 +11,7 @@ QT5SCRIPT_DEPENDENCIES = qt5base
QT5SCRIPT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SCRIPT_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SCRIPT_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
else
QT5SCRIPT_LICENSE = Commercial license
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index bf3ab1c..ee8aeba 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -12,10 +12,10 @@ QT5SENSORS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SENSORS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
index 0386b63..eb9bf65 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.mk
+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -11,7 +11,7 @@ QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport
QT5SERIALBUS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPLv3, GFDLv1.3 (docs)
+QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDLv1.3 (docs)
QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5SERIALBUS_LICENSE = Commercial license
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index d6a0bfb..49b7271 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -12,10 +12,10 @@ QT5SERIALPORT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index ec82334..74bc142 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -12,10 +12,10 @@ QT5SVG_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SVG_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index d531ecf..d02806b 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -21,10 +21,10 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5TOOLS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
-QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 18544b8..570a14b 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -12,10 +12,10 @@ QT5WEBCHANNEL_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index cbe06d8..fe34748 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -12,10 +12,10 @@ QT5WEBSOCKETS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools)
+QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools)
QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3
else
-QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3
+QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0
QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index 78f8aee..b3090cf 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -12,10 +12,10 @@ QT5X11EXTRAS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index fa2bfa8..c6d8137 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -12,10 +12,10 @@ QT5XMLPATTERNS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPLv3, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/riemann-c-client/riemann-c-client.mk b/package/riemann-c-client/riemann-c-client.mk
index c8a411c..09f7900 100644
--- a/package/riemann-c-client/riemann-c-client.mk
+++ b/package/riemann-c-client/riemann-c-client.mk
@@ -7,7 +7,7 @@
RIEMANN_C_CLIENT_VERSION = 1.9.1
RIEMANN_C_CLIENT_SOURCE = riemann-c-client-$(RIEMANN_C_CLIENT_VERSION).tar.xz
RIEMANN_C_CLIENT_SITE = https://github.com/algernon/riemann-c-client/releases/download/riemann-c-client-$(RIEMANN_C_CLIENT_VERSION)
-RIEMANN_C_CLIENT_LICENSE = LGPLv3+
+RIEMANN_C_CLIENT_LICENSE = LGPL-3.0+
RIEMANN_C_CLIENT_LICENSE_FILES = LICENSE
RIEMANN_C_CLIENT_INSTALL_STAGING = YES
RIEMANN_C_CLIENT_MAKE = $(MAKE1)
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 6370726..bbf7d95 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -6,7 +6,7 @@
RSYSLOG_VERSION = 8.22.0
RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog
-RSYSLOG_LICENSE = GPL-3.0, LGPLv3, Apache-2.0
+RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0
RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf
RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
diff --git a/package/urg/urg.mk b/package/urg/urg.mk
index 5d49aeb..4a41779 100644
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -7,7 +7,7 @@
URG_VERSION = 0.8.18
URG_SITE = http://pkgs.fedoraproject.org/repo/pkgs/urg/urg-0.8.18.zip/md5/93f90d2ccc36e784407c5282ef6bd2cb
URG_SOURCE = urg-$(URG_VERSION).zip
-URG_LICENSE = LGPLv3
+URG_LICENSE = LGPL-3.0
URG_LICENSE_FILES = COPYING
URG_INSTALL_STAGING = YES
diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk
index 3227fb2..cec34fa 100644
--- a/package/wiringpi/wiringpi.mk
+++ b/package/wiringpi/wiringpi.mk
@@ -7,7 +7,7 @@
WIRINGPI_VERSION = 2.44
WIRINGPI_SITE = git://git.drogon.net/wiringPi
-WIRINGPI_LICENSE = LGPLv3+
+WIRINGPI_LICENSE = LGPL-3.0+
WIRINGPI_LICENSE_FILES = COPYING.LESSER
WIRINGPI_INSTALL_STAGING = YES
diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
index 5c99983..1d3be4e 100644
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -9,7 +9,7 @@ ZEROMQ_SITE = https://github.com/zeromq/zeromq4-1/releases/download/v$(ZEROMQ_VE
ZEROMQ_INSTALL_STAGING = YES
ZEROMQ_DEPENDENCIES = util-linux
ZEROMQ_CONF_OPTS = --without-documentation
-ZEROMQ_LICENSE = LGPLv3+ with exceptions
+ZEROMQ_LICENSE = LGPL-3.0+ with exceptions
ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER
# For 0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch
ZEROMQ_AUTORECONF = YES
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 07/21] package: use SPDX short identifier for AGPLv3
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (5 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 06/21] package: use SPDX short identifier for LGPLv3/LGPLv3+ Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 08/21] package: use SPDX short identifier for LGPLv2/LGPLv2+ Rahul Bedarkar
` (15 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for AGPLv3 is AGPL-3.0.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/AGPLv3/AGPL-3.0/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/ghostscript/ghostscript.mk | 2 +-
package/mongodb/mongodb.mk | 2 +-
package/monit/monit.mk | 2 +-
package/python-crossbar/python-crossbar.mk | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk
index 265503e..c28cd06 100644
--- a/package/ghostscript/ghostscript.mk
+++ b/package/ghostscript/ghostscript.mk
@@ -7,7 +7,7 @@
GHOSTSCRIPT_VERSION = 9.21
GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921
GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz
-GHOSTSCRIPT_LICENSE = AGPLv3
+GHOSTSCRIPT_LICENSE = AGPL-3.0
GHOSTSCRIPT_LICENSE_FILES = LICENSE
# 0001-Fix-cross-compilation-issue.patch
GHOSTSCRIPT_AUTORECONF = YES
diff --git a/package/mongodb/mongodb.mk b/package/mongodb/mongodb.mk
index f5b2c01..54c904e 100644
--- a/package/mongodb/mongodb.mk
+++ b/package/mongodb/mongodb.mk
@@ -8,7 +8,7 @@ MONGODB_VERSION_BASE = 3.3.4
MONGODB_VERSION = r$(MONGODB_VERSION_BASE)
MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION))
-MONGODB_LICENSE = AGPLv3, Apache-2.0
+MONGODB_LICENSE = AGPL-3.0, Apache-2.0
MONGODB_LICENSE_FILES = GNU-AGPL-3.0.txt APACHE-2.0.txt
MONGODB_DEPENDENCIES = host-scons
diff --git a/package/monit/monit.mk b/package/monit/monit.mk
index f4899c3..dc202fd 100644
--- a/package/monit/monit.mk
+++ b/package/monit/monit.mk
@@ -6,7 +6,7 @@
MONIT_VERSION = 5.20.0
MONIT_SITE = http://mmonit.com/monit/dist
-MONIT_LICENSE = AGPLv3 with OpenSSL exception
+MONIT_LICENSE = AGPL-3.0 with OpenSSL exception
MONIT_LICENSE_FILES = COPYING
#
# Touching Makefile.am:
diff --git a/package/python-crossbar/python-crossbar.mk b/package/python-crossbar/python-crossbar.mk
index fa1732b..77cecfa 100644
--- a/package/python-crossbar/python-crossbar.mk
+++ b/package/python-crossbar/python-crossbar.mk
@@ -9,7 +9,7 @@
PYTHON_CROSSBAR_VERSION = 0.14.0
PYTHON_CROSSBAR_SOURCE = crossbar-$(PYTHON_CROSSBAR_VERSION).tar.gz
PYTHON_CROSSBAR_SITE = https://pypi.python.org/packages/f0/9a/e0b77e15698c47b6293655bc0e1996dd8e87bd8af7bc7434a5c8281a024e
-PYTHON_CROSSBAR_LICENSE = AGPLv3
+PYTHON_CROSSBAR_LICENSE = AGPL-3.0
PYTHON_CROSSBAR_LICENSE_FILES = LICENSE
PYTHON_CROSSBAR_SETUP_TYPE = setuptools
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 08/21] package: use SPDX short identifier for LGPLv2/LGPLv2+
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (6 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 07/21] package: use SPDX short identifier for AGPLv3 Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 09/21] boot, package: use SPDX short identifier for BSD-3c Rahul Bedarkar
` (14 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for LGPLv2/LGPLv2+ is LGPL-2.0/LGPL-2.0+.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/LGPLv2(\+)?/LGPL-2.0\1/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/argp-standalone/argp-standalone.mk | 2 +-
package/atk/atk.mk | 2 +-
package/cairomm/cairomm.mk | 2 +-
package/cups/cups.mk | 2 +-
package/fltk/fltk.mk | 2 +-
package/gamin/gamin.mk | 2 +-
package/gdb/gdb.mk | 2 +-
package/gdk-pixbuf/gdk-pixbuf.mk | 2 +-
package/glib-networking/glib-networking.mk | 2 +-
package/gssdp/gssdp.mk | 2 +-
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 2 +-
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 2 +-
package/gstreamer/gst-plugins-base/gst-plugins-base.mk | 2 +-
package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk | 2 +-
package/gstreamer1/gst1-imx/gst1-imx.mk | 2 +-
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +-
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +-
package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +-
package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +-
package/gupnp-av/gupnp-av.mk | 2 +-
package/gupnp-dlna/gupnp-dlna.mk | 2 +-
package/gupnp/gupnp.mk | 2 +-
package/gvfs/gvfs.mk | 2 +-
package/kvm-unit-tests/kvm-unit-tests.mk | 2 +-
package/lame/lame.mk | 2 +-
package/lesstif/lesstif.mk | 2 +-
package/libargtable2/libargtable2.mk | 2 +-
package/libart/libart.mk | 2 +-
package/libcddb/libcddb.mk | 2 +-
package/libftdi1/libftdi1.mk | 2 +-
package/libglade/libglade.mk | 2 +-
package/libglib2/libglib2.mk | 2 +-
package/libgtk2/libgtk2.mk | 2 +-
package/libgtk3/libgtk3.mk | 2 +-
package/libiconv/libiconv.mk | 2 +-
package/liblockfile/liblockfile.mk | 2 +-
package/libmbim/libmbim.mk | 2 +-
package/libmhash/libmhash.mk | 2 +-
package/libqmi/libqmi.mk | 2 +-
package/librsvg/librsvg.mk | 2 +-
package/libshout/libshout.mk | 2 +-
package/libsoup/libsoup.mk | 2 +-
package/libsvg/libsvg.mk | 2 +-
package/libxmlpp/libxmlpp.mk | 2 +-
package/mariadb/mariadb.mk | 2 +-
package/modem-manager/modem-manager.mk | 2 +-
package/mono-gtksharp3/mono-gtksharp3.mk | 2 +-
package/monolite/monolite.mk | 2 +-
package/mxml/mxml.mk | 2 +-
package/neon/neon.mk | 2 +-
package/network-manager/network-manager.mk | 2 +-
package/ntfs-3g/ntfs-3g.mk | 2 +-
package/openal/openal.mk | 2 +-
package/openipmi/openipmi.mk | 2 +-
package/owfs/owfs.mk | 2 +-
package/pango/pango.mk | 2 +-
package/pppd/pppd.mk | 2 +-
package/procps-ng/procps-ng.mk | 2 +-
package/rpm/rpm.mk | 2 +-
package/shapelib/shapelib.mk | 2 +-
package/startup-notification/startup-notification.mk | 2 +-
package/ustr/ustr.mk | 2 +-
package/yasm/yasm.mk | 2 +-
63 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/package/argp-standalone/argp-standalone.mk b/package/argp-standalone/argp-standalone.mk
index b87b923..7a7028c 100644
--- a/package/argp-standalone/argp-standalone.mk
+++ b/package/argp-standalone/argp-standalone.mk
@@ -7,7 +7,7 @@
ARGP_STANDALONE_VERSION = 1.3
ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive
ARGP_STANDALONE_INSTALL_STAGING = YES
-ARGP_STANDALONE_LICENSE = LGPLv2+
+ARGP_STANDALONE_LICENSE = LGPL-2.0+
ARGP_STANDALONE_CONF_ENV = \
CFLAGS="$(TARGET_CFLAGS) -fPIC"
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 90d329a..88cf5fb 100644
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -8,7 +8,7 @@ ATK_VERSION_MAJOR = 2.22
ATK_VERSION = $(ATK_VERSION_MAJOR).0
ATK_SOURCE = atk-$(ATK_VERSION).tar.xz
ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)
-ATK_LICENSE = LGPLv2+
+ATK_LICENSE = LGPL-2.0+
ATK_LICENSE_FILES = COPYING
ATK_INSTALL_STAGING = YES
ATK_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
diff --git a/package/cairomm/cairomm.mk b/package/cairomm/cairomm.mk
index 7a56a68..07aae97 100644
--- a/package/cairomm/cairomm.mk
+++ b/package/cairomm/cairomm.mk
@@ -6,7 +6,7 @@
CAIROMM_VERSION_MAJOR = 1.12
CAIROMM_VERSION = $(CAIROMM_VERSION_MAJOR).0
-CAIROMM_LICENSE = LGPLv2+
+CAIROMM_LICENSE = LGPL-2.0+
CAIROMM_LICENSE_FILES = COPYING
CAIROMM_SOURCE = cairomm-$(CAIROMM_VERSION).tar.xz
CAIROMM_SITE = http://ftp.gnome.org/pub/gnome/sources/cairomm/$(CAIROMM_VERSION_MAJOR)
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
index 4ffe6f7..292d87e 100644
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -7,7 +7,7 @@
CUPS_VERSION = 2.2.3
CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
-CUPS_LICENSE = GPL-2.0, LGPLv2
+CUPS_LICENSE = GPL-2.0, LGPL-2.0
CUPS_LICENSE_FILES = LICENSE.txt
CUPS_INSTALL_STAGING = YES
CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index 9b67bd3..7ad717b 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -19,7 +19,7 @@ FLTK_CONF_OPTS = --enable-threads --with-x --disable-gl \
--libdir=/usr/lib
FLTK_DEPENDENCIES = jpeg libpng xlib_libX11 xlib_libXext xlib_libXt
FLTK_CONFIG_SCRIPTS = fltk-config
-FLTK_LICENSE = LGPLv2 with exceptions
+FLTK_LICENSE = LGPL-2.0 with exceptions
FLTK_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_CAIRO),y)
diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index d908b90..4621b16 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -8,7 +8,7 @@ GAMIN_VERSION = 0.1.10
GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources
GAMIN_AUTORECONF = YES
GAMIN_INSTALL_STAGING = YES
-GAMIN_LICENSE = LGPLv2+
+GAMIN_LICENSE = LGPL-2.0+
GAMIN_LICENSE_FILES = COPYING
# python support broken
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 8fc8bb7..7036b4c 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -20,7 +20,7 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
GDB_FROM_GIT = y
endif
-GDB_LICENSE = GPL-2.0+, LGPLv2+, GPL-3.0+, LGPL-3.0+
+GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+
GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB
# We only want gdbserver and not the entire debugger.
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index bf83b19..a060f82 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -8,7 +8,7 @@ GDK_PIXBUF_VERSION_MAJOR = 2.36
GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).6
GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR)
-GDK_PIXBUF_LICENSE = LGPLv2+
+GDK_PIXBUF_LICENSE = LGPL-2.0+
GDK_PIXBUF_LICENSE_FILES = COPYING
GDK_PIXBUF_INSTALL_STAGING = YES
GDK_PIXBUF_DEPENDENCIES = \
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
index d3077e9..eb75c86 100644
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -16,7 +16,7 @@ GLIB_NETWORKING_DEPENDENCIES = \
libglib2
GLIB_NETWORKING_CONF_OPTS = \
--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
-GLIB_NETWORKING_LICENSE = LGPLv2+
+GLIB_NETWORKING_LICENSE = LGPL-2.0+
GLIB_NETWORKING_LICENSE_FILES = COPYING
GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \
GIO_MODULE_DIR=/usr/lib/gio/modules install
diff --git a/package/gssdp/gssdp.mk b/package/gssdp/gssdp.mk
index fa44a2c..e94c924 100644
--- a/package/gssdp/gssdp.mk
+++ b/package/gssdp/gssdp.mk
@@ -8,7 +8,7 @@ GSSDP_VERSION_MAJOR = 1.0
GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).1
GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz
GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR)
-GSSDP_LICENSE = LGPLv2+
+GSSDP_LICENSE = LGPL-2.0+
GSSDP_LICENSE_FILES = COPYING
GSSDP_INSTALL_STAGING = YES
GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index b04eecb..22911cd 100644
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -16,7 +16,7 @@ GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPL-3.0+ (libav)
GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3
else
GST_FFMPEG_CONF_OPTS += --enable-lgpl
-GST_FFMPEG_LICENSE = LGPLv2+ (gst-ffmpeg), LGPL-2.1+/LGPL-3.0+ (libav)
+GST_FFMPEG_LICENSE = LGPL-2.0+ (gst-ffmpeg), LGPL-2.1+/LGPL-3.0+ (libav)
GST_FFMPEG_LICENSE_FILES = COPYING.LIB gst-libs/ext/libav/COPYING.LGPLv2.1 gst-libs/ext/libav/COPYING.LGPLv3
endif
diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
index 6940901..967893f 100644
--- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -9,7 +9,7 @@ GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE)
# Most is LGPLv2+, but some sources are copied from upstream and are
# LGPLv2.1+, which essentially makes it LGPLv2.1+
-GST_FSL_PLUGINS_LICENSE = LGPLv2+, LGPL-2.1+, PROPRIETARY (asf.h)
+GST_FSL_PLUGINS_LICENSE = LGPL-2.0+, LGPL-2.1+, PROPRIETARY (asf.h)
GST_FSL_PLUGINS_LICENSE_FILES = COPYING-LGPL-2.1 COPYING-LGPL-2
GST_FSL_PLUGINS_INSTALL_STAGING = YES
diff --git a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
index d1738c5..fc3b203 100644
--- a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
+++ b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
@@ -8,7 +8,7 @@ GST_PLUGINS_BASE_VERSION = 0.10.36
GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.xz
GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
GST_PLUGINS_BASE_INSTALL_STAGING = YES
-GST_PLUGINS_BASE_LICENSE = GPL-2.0+, LGPLv2+
+GST_PLUGINS_BASE_LICENSE = GPL-2.0+, LGPL-2.0+
GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB
# freetype is only used by examples, but if it is not found
diff --git a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
index d145430..a61ab6e 100644
--- a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -10,7 +10,7 @@ GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
GST_PLUGINS_UGLY_PATCH = http://git.alpinelinux.org/cgit/aports/plain/main/gst-plugins-ugly0.10/cdio-cd-text-api.patch
# COPYING is in fact LGPLv2.1, but all of the code is v2+
# (except for one test, xingmux)
-GST_PLUGINS_UGLY_LICENSE = LGPLv2+, GPL-2.0+ (synaesthesia)
+GST_PLUGINS_UGLY_LICENSE = LGPL-2.0+, GPL-2.0+ (synaesthesia)
GST_PLUGINS_UGLY_LICENSE_FILES = COPYING
GST_PLUGINS_UGLY_CONF_OPTS = \
diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk
index 88429ae..a21e282 100644
--- a/package/gstreamer1/gst1-imx/gst1-imx.mk
+++ b/package/gstreamer1/gst1-imx/gst1-imx.mk
@@ -7,7 +7,7 @@
GST1_IMX_VERSION = 0.12.3
GST1_IMX_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX_VERSION))
-GST1_IMX_LICENSE = LGPLv2+
+GST1_IMX_LICENSE = LGPL-2.0+
GST1_IMX_LICENSE_FILES = LICENSE
GST1_IMX_INSTALL_STAGING = YES
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index 71ebd48..ffc9ab4 100644
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -11,7 +11,7 @@ GST1_PLUGINS_BAD_INSTALL_STAGING = YES
GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if
# enabled.
-GST1_PLUGINS_BAD_LICENSE = LGPLv2+, LGPL-2.1+
+GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+
GST1_PLUGINS_BAD_CONF_OPTS = \
--disable-examples \
diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index acb475a..8da1f42 100644
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -9,7 +9,7 @@ GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base
GST1_PLUGINS_BASE_INSTALL_STAGING = YES
GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB
-GST1_PLUGINS_BASE_LICENSE = LGPLv2+, LGPL-2.1+
+GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+
# freetype is only used by examples, but if it is not found
# and the host has a freetype-config script, then the host
diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
index bfdd4c4..5ab00d0 100644
--- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
+++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
@@ -7,7 +7,7 @@
GST1_RTSP_SERVER_VERSION = 1.10.4
GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz
GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server
-GST1_RTSP_SERVER_LICENSE = LGPLv2+
+GST1_RTSP_SERVER_LICENSE = LGPL-2.0+
GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB
GST1_RTSP_SERVER_INSTALL_STAGING = YES
GST1_RTSP_SERVER_DEPENDENCIES = \
diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
index 08a736d..fc756c3 100644
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -9,7 +9,7 @@ GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer
GSTREAMER1_INSTALL_STAGING = YES
GSTREAMER1_LICENSE_FILES = COPYING
-GSTREAMER1_LICENSE = LGPLv2+, LGPL-2.1+
+GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+
GSTREAMER1_CONF_OPTS = \
--disable-examples \
diff --git a/package/gupnp-av/gupnp-av.mk b/package/gupnp-av/gupnp-av.mk
index 40e6c8c..0940db7 100644
--- a/package/gupnp-av/gupnp-av.mk
+++ b/package/gupnp-av/gupnp-av.mk
@@ -8,7 +8,7 @@ GUPNP_AV_VERSION_MAJOR = 0.12
GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).10
GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz
GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR)
-GUPNP_AV_LICENSE = LGPLv2+
+GUPNP_AV_LICENSE = LGPL-2.0+
GUPNP_AV_LICENSE_FILES = COPYING
GUPNP_AV_INSTALL_STAGING = YES
GUPNP_AV_DEPENDENCIES = host-pkgconf libglib2 libxml2 gupnp
diff --git a/package/gupnp-dlna/gupnp-dlna.mk b/package/gupnp-dlna/gupnp-dlna.mk
index 58b5735..2d072be 100644
--- a/package/gupnp-dlna/gupnp-dlna.mk
+++ b/package/gupnp-dlna/gupnp-dlna.mk
@@ -10,7 +10,7 @@ GUPNP_DLNA_SOURCE = gupnp-dlna-$(GUPNP_DLNA_VERSION).tar.xz
GUPNP_DLNA_SITE = \
http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/$(GUPNP_DLNA_VERSION_MAJOR)
# COPYING contains LGPLv2.1 but all source files contain LPGLv2+
-GUPNP_DLNA_LICENSE = LGPLv2+
+GUPNP_DLNA_LICENSE = LGPL-2.0+
GUPNP_DLNA_LICENSE_FILES = COPYING
GUPNP_DLNA_INSTALL_STAGING = YES
GUPNP_DLNA_DEPENDENCIES = host-pkgconf libglib2 libxml2
diff --git a/package/gupnp/gupnp.mk b/package/gupnp/gupnp.mk
index 764f527..0636632 100644
--- a/package/gupnp/gupnp.mk
+++ b/package/gupnp/gupnp.mk
@@ -8,7 +8,7 @@ GUPNP_VERSION_MAJOR = 1.0
GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).1
GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz
GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR)
-GUPNP_LICENSE = LGPLv2+
+GUPNP_LICENSE = LGPL-2.0+
GUPNP_LICENSE_FILES = COPYING
GUPNP_INSTALL_STAGING = YES
GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index f3b5fc4..d6211fd 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -10,7 +10,7 @@ GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz
GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
GVFS_INSTALL_STAGING = YES
GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info
-GVFS_LICENSE = LGPLv2+
+GVFS_LICENSE = LGPL-2.0+
GVFS_LICENSE_FILES = COPYING
# Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent
diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk
index 0ddb017..3a5d0fd 100644
--- a/package/kvm-unit-tests/kvm-unit-tests.mk
+++ b/package/kvm-unit-tests/kvm-unit-tests.mk
@@ -7,7 +7,7 @@
KVM_UNIT_TESTS_VERSION = 5731572b2ac23eb410732110b93425b5bb7f27dd
KVM_UNIT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/scm/virt/kvm/kvm-unit-tests.git
KVM_UNIT_TESTS_SITE_METHOD = git
-KVM_UNIT_TESTS_LICENSE = LGPLv2
+KVM_UNIT_TESTS_LICENSE = LGPL-2.0
KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT
ifeq ($(BR2_arm),y)
diff --git a/package/lame/lame.mk b/package/lame/lame.mk
index 9345799..2d44f88 100644
--- a/package/lame/lame.mk
+++ b/package/lame/lame.mk
@@ -12,7 +12,7 @@ LAME_AUTORECONF = YES
LAME_INSTALL_STAGING = YES
LAME_CONF_ENV = GTK_CONFIG=/bin/false
LAME_CONF_OPTS = --enable-dynamic-frontends
-LAME_LICENSE = LGPLv2+
+LAME_LICENSE = LGPL-2.0+
LAME_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
diff --git a/package/lesstif/lesstif.mk b/package/lesstif/lesstif.mk
index fb04a9e..3d381ff 100644
--- a/package/lesstif/lesstif.mk
+++ b/package/lesstif/lesstif.mk
@@ -11,7 +11,7 @@ LESSTIF_DEPENDENCIES = \
xlib_libXt \
xlib_libXext \
freetype
-LESSTIF_LICENSE = LGPLv2+
+LESSTIF_LICENSE = LGPL-2.0+
LESSTIF_LICENSE_FILES = COPYING.LIB
LESSTIF_CONF_OPTS = \
--with-gnu-ld \
diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
index 6b42cc0..8215f55 100644
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@@ -13,7 +13,7 @@ LIBARGTABLE2_CONF_OPTS = \
--disable-kernel-module \
--enable-lib \
--enable-util
-LIBARGTABLE2_LICENSE = LGPLv2+
+LIBARGTABLE2_LICENSE = LGPL-2.0+
LIBARGTABLE2_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libart/libart.mk b/package/libart/libart.mk
index 85ee37c..b3c6176 100644
--- a/package/libart/libart.mk
+++ b/package/libart/libart.mk
@@ -11,7 +11,7 @@ LIBART_SITE = http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/$(LIBART_VERSIO
LIBART_AUTORECONF = YES
LIBART_INSTALL_STAGING = YES
LIBART_CONFIG_SCRIPTS = libart2-config
-LIBART_LICENSE = LGPLv2+
+LIBART_LICENSE = LGPL-2.0+
LIBART_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libcddb/libcddb.mk b/package/libcddb/libcddb.mk
index 96b265a..952a879 100644
--- a/package/libcddb/libcddb.mk
+++ b/package/libcddb/libcddb.mk
@@ -7,7 +7,7 @@
LIBCDDB_VERSION = 1.3.2
LIBCDDB_SOURCE = libcddb-$(LIBCDDB_VERSION).tar.bz2
LIBCDDB_SITE = http://downloads.sourceforge.net/libcddb
-LIBCDDB_LICENSE = LGPLv2+
+LIBCDDB_LICENSE = LGPL-2.0+
LIBCDDB_LICENSE_FILES = COPYING
LIBCDDB_INSTALL_STAGING = YES
diff --git a/package/libftdi1/libftdi1.mk b/package/libftdi1/libftdi1.mk
index 1f058bd..deeff39 100644
--- a/package/libftdi1/libftdi1.mk
+++ b/package/libftdi1/libftdi1.mk
@@ -9,7 +9,7 @@ LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2
LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download
LIBFTDI1_INSTALL_STAGING = YES
LIBFTDI1_DEPENDENCIES = libusb
-LIBFTDI1_LICENSE = LGPLv2 (libftdi1), GPL-2.0 with exception (ftdipp1)
+LIBFTDI1_LICENSE = LGPL-2.0 (libftdi1), GPL-2.0 with exception (ftdipp1)
LIBFTDI1_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LIB
LIBFTDI1_CONF_OPTS = -DDOCUMENTATION=OFF -DEXAMPLES=OFF
diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
index a6eea09..32fa595 100644
--- a/package/libglade/libglade.mk
+++ b/package/libglade/libglade.mk
@@ -10,7 +10,7 @@ LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
LIBGLADE_SITE = http://ftp.gnome.org/pub/GNOME/sources/libglade/$(LIBGLADE_VERSION_MAJOR)
LIBGLADE_INSTALL_STAGING = YES
LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2
-LIBGLADE_LICENSE = LGPLv2+
+LIBGLADE_LICENSE = LGPL-2.0+
LIBGLADE_LICENSE_FILES = COPYING
define LIBGLADE_INSTALL_FIX
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index faf6b3c..47d9f63 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -8,7 +8,7 @@ LIBGLIB2_VERSION_MAJOR = 2.50
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
-LIBGLIB2_LICENSE = LGPLv2+
+LIBGLIB2_LICENSE = LGPL-2.0+
LIBGLIB2_LICENSE_FILES = COPYING
LIBGLIB2_INSTALL_STAGING = YES
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index cf8b2f4..83f69ac 100644
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -9,7 +9,7 @@ LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).31
LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz
LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR)
LIBGTK2_INSTALL_STAGING = YES
-LIBGTK2_LICENSE = LGPLv2+
+LIBGTK2_LICENSE = LGPL-2.0+
LIBGTK2_LICENSE_FILES = COPYING
# For 0001-reduce-dependencies.patch
LIBGTK2_AUTORECONF = YES
diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
index ca88e30..ed843fc 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -8,7 +8,7 @@ LIBGTK3_VERSION_MAJOR = 3.22
LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).11
LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
-LIBGTK3_LICENSE = LGPLv2+
+LIBGTK3_LICENSE = LGPL-2.0+
LIBGTK3_LICENSE_FILES = COPYING
LIBGTK3_INSTALL_STAGING = YES
LIBGTK3_AUTORECONF = YES
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index 26fa154..af8f345 100644
--- a/package/libiconv/libiconv.mk
+++ b/package/libiconv/libiconv.mk
@@ -7,7 +7,7 @@
LIBICONV_VERSION = 1.14
LIBICONV_SITE = $(BR2_GNU_MIRROR)/libiconv
LIBICONV_INSTALL_STAGING = YES
-LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPLv2+ (library)
+LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPL-2.0+ (library)
LIBICONV_LICENSE_FILES = COPYING COPYING.LIB
# Don't build the preloadable library, as we don't need it (it's only
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index a940f21..0710868 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -9,7 +9,7 @@ LIBLOCKFILE_SOURCE = liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz
LIBLOCKFILE_SITE = http://snapshot.debian.org/archive/debian/20151026T153523Z/pool/main/libl/liblockfile
LIBLOCKFILE_PATCH = liblockfile_$(LIBLOCKFILE_VERSION)-6.debian.tar.bz2
-LIBLOCKFILE_LICENSE = LGPLv2+, GPL-2.0+ (dotlockfile)
+LIBLOCKFILE_LICENSE = LGPL-2.0+, GPL-2.0+ (dotlockfile)
LIBLOCKFILE_LICENSE_FILES = COPYRIGHT
LIBLOCKFILE_INSTALL_STAGING = YES
diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk
index 733722f..d85f589 100644
--- a/package/libmbim/libmbim.mk
+++ b/package/libmbim/libmbim.mk
@@ -7,7 +7,7 @@
LIBMBIM_VERSION = 1.14.0
LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
-LIBMBIM_LICENSE = LGPLv2+ (library), GPL-2.0+ (programs)
+LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
LIBMBIM_LICENSE_FILES = COPYING
LIBMBIM_INSTALL_STAGING = YES
diff --git a/package/libmhash/libmhash.mk b/package/libmhash/libmhash.mk
index f7b8e72..f2da10e 100644
--- a/package/libmhash/libmhash.mk
+++ b/package/libmhash/libmhash.mk
@@ -8,7 +8,7 @@ LIBMHASH_VERSION = 0.9.9.9
LIBMHASH_SITE = http://downloads.sourceforge.net/project/mhash/mhash/$(LIBMHASH_VERSION)
LIBMHASH_SOURCE = mhash-$(LIBMHASH_VERSION).tar.bz2
LIBMHASH_INSTALL_STAGING = YES
-LIBMHASH_LICENSE = LGPLv2
+LIBMHASH_LICENSE = LGPL-2.0
LIBMHASH_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
index 9151d6d..caa4398 100644
--- a/package/libqmi/libqmi.mk
+++ b/package/libqmi/libqmi.mk
@@ -7,7 +7,7 @@
LIBQMI_VERSION = 1.16.0
LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
-LIBQMI_LICENSE = LGPLv2+ (library), GPL-2.0+ (programs)
+LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
LIBQMI_LICENSE_FILES = COPYING
LIBQMI_INSTALL_STAGING = YES
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
index db57193..07c1e3a 100644
--- a/package/librsvg/librsvg.mk
+++ b/package/librsvg/librsvg.mk
@@ -14,7 +14,7 @@ HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no
LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \
$(if $(BR2_PACKAGE_LIBGTK3),libgtk3)
HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango
-LIBRSVG_LICENSE = LGPLv2+
+LIBRSVG_LICENSE = LGPL-2.0+
LIBRSVG_LICENSE_FILES = COPYING.LIB
$(eval $(autotools-package))
diff --git a/package/libshout/libshout.mk b/package/libshout/libshout.mk
index bf85595..8fd850f 100644
--- a/package/libshout/libshout.mk
+++ b/package/libshout/libshout.mk
@@ -6,7 +6,7 @@
LIBSHOUT_VERSION = 2.4.1
LIBSHOUT_SITE = http://downloads.xiph.org/releases/libshout
-LIBSHOUT_LICENSE = LGPLv2+
+LIBSHOUT_LICENSE = LGPL-2.0+
LIBSHOUT_LICENSE_FILES = COPYING
LIBSHOUT_INSTALL_STAGING = YES
LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index f6e92f8..1c27138 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -8,7 +8,7 @@ LIBSOUP_VERSION_MAJOR = 2.56
LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0
LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz
LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR)
-LIBSOUP_LICENSE = LGPLv2+
+LIBSOUP_LICENSE = LGPL-2.0+
LIBSOUP_LICENSE_FILES = COPYING
LIBSOUP_INSTALL_STAGING = YES
LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
diff --git a/package/libsvg/libsvg.mk b/package/libsvg/libsvg.mk
index 8b85d5a..45d730d 100644
--- a/package/libsvg/libsvg.mk
+++ b/package/libsvg/libsvg.mk
@@ -8,7 +8,7 @@ LIBSVG_VERSION = 0.1.4
LIBSVG_SITE = http://cairographics.org/snapshots
LIBSVG_DEPENDENCIES = host-pkgconf libpng jpeg
LIBSVG_INSTALL_STAGING = YES
-LIBSVG_LICENSE = LGPLv2+
+LIBSVG_LICENSE = LGPL-2.0+
LIBSVG_LICENSE_FILES = COPYING
# libsvg needs at last a XML parser
diff --git a/package/libxmlpp/libxmlpp.mk b/package/libxmlpp/libxmlpp.mk
index cbedf61..d0f6329 100644
--- a/package/libxmlpp/libxmlpp.mk
+++ b/package/libxmlpp/libxmlpp.mk
@@ -6,7 +6,7 @@
LIBXMLPP_VERSION_MAJOR = 2.40
LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).1
-LIBXMLPP_LICENSE = LGPL-2.1 (library), LGPLv2+ (examples)
+LIBXMLPP_LICENSE = LGPL-2.1 (library), LGPL-2.0+ (examples)
LIBXMLPP_LICENSE_FILES = COPYING
LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz
LIBXMLPP_SITE = http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(LIBXMLPP_VERSION_MAJOR)
diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk
index a17f746..5a1f06d 100644
--- a/package/mariadb/mariadb.mk
+++ b/package/mariadb/mariadb.mk
@@ -6,7 +6,7 @@
MARIADB_VERSION = 10.1.22
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
-MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library)
+MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
MARIADB_LICENSE_FILES = README COPYING COPYING.LESSER
MARIADB_INSTALL_STAGING = YES
MARIADB_PROVIDES = mysql
diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
index ecb7d3f..1eea355 100644
--- a/package/modem-manager/modem-manager.mk
+++ b/package/modem-manager/modem-manager.mk
@@ -7,7 +7,7 @@
MODEM_MANAGER_VERSION = 1.6.4
MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
-MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPLv2+ (libmm-glib)
+MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib)
MODEM_MANAGER_LICENSE_FILES = COPYING
MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool libgudev
MODEM_MANAGER_INSTALL_STAGING = YES
diff --git a/package/mono-gtksharp3/mono-gtksharp3.mk b/package/mono-gtksharp3/mono-gtksharp3.mk
index cccfcde..9ddf932 100644
--- a/package/mono-gtksharp3/mono-gtksharp3.mk
+++ b/package/mono-gtksharp3/mono-gtksharp3.mk
@@ -8,7 +8,7 @@ MONO_GTKSHARP3_VERSION_MAJOR = 2.99
MONO_GTKSHARP3_VERSION = $(MONO_GTKSHARP3_VERSION_MAJOR).3
MONO_GTKSHARP3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/$(MONO_GTKSHARP3_VERSION_MAJOR)
MONO_GTKSHARP3_SOURCE = gtk-sharp-$(MONO_GTKSHARP3_VERSION).tar.xz
-MONO_GTKSHARP3_LICENSE = LGPLv2, MIT (cairo)
+MONO_GTKSHARP3_LICENSE = LGPL-2.0, MIT (cairo)
MONO_GTKSHARP3_LICENSE_FILES = COPYING
MONO_GTKSHARP3_INSTALL_STAGING = YES
MONO_GTKSHARP3_DEPENDENCIES = mono libgtk3
diff --git a/package/monolite/monolite.mk b/package/monolite/monolite.mk
index d50d9f2..6b982b3 100644
--- a/package/monolite/monolite.mk
+++ b/package/monolite/monolite.mk
@@ -7,7 +7,7 @@
MONOLITE_VERSION = 149
MONOLITE_SITE = http://download.mono-project.com/monolite/
MONOLITE_SOURCE = monolite-$(MONOLITE_VERSION)-latest.tar.gz
-MONOLITE_LICENSE = LGPLv2 or commercial
+MONOLITE_LICENSE = LGPL-2.0 or commercial
define HOST_MONOLITE_INSTALL_CMDS
mkdir -p $(HOST_DIR)/usr/lib/monolite
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
index f36c75c..7c48380 100644
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -6,7 +6,7 @@
MXML_VERSION = 2.10
MXML_SITE = http://www.msweet.org/files/project3
-MXML_LICENSE = LGPLv2+ with exceptions
+MXML_LICENSE = LGPL-2.0+ with exceptions
MXML_LICENSE_FILES = COPYING
MXML_INSTALL_STAGING = YES
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
index 6a517a9..1b8eb36 100644
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -6,7 +6,7 @@
NEON_VERSION = 0.30.2
NEON_SITE = http://www.webdav.org/neon
-NEON_LICENSE = LGPLv2+ (library), GPL-2.0+ (manual and tests)
+NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests)
NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README
NEON_INSTALL_STAGING = YES
NEON_CONF_OPTS = --without-gssapi --disable-rpath
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
index 6e82d30..0815bdd 100644
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -11,7 +11,7 @@ NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(N
NETWORK_MANAGER_INSTALL_STAGING = YES
NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \
libgcrypt wireless_tools util-linux host-intltool readline libndp libgudev
-NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPLv2+ (libnm-util)
+NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.0+ (libnm-util)
NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING
NETWORK_MANAGER_CONF_ENV = \
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
index 0aabde7..5f23eae 100644
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -10,7 +10,7 @@ NTFS_3G_SITE = http://tuxera.com/opensource
NTFS_3G_CONF_OPTS = --disable-ldconfig
NTFS_3G_INSTALL_STAGING = YES
NTFS_3G_DEPENDENCIES = host-pkgconf
-NTFS_3G_LICENSE = GPL-2.0+, LGPLv2+
+NTFS_3G_LICENSE = GPL-2.0+, LGPL-2.0+
NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB
ifeq ($(BR2_PACKAGE_LIBFUSE),y)
diff --git a/package/openal/openal.mk b/package/openal/openal.mk
index 6384104..72ebee2 100644
--- a/package/openal/openal.mk
+++ b/package/openal/openal.mk
@@ -12,7 +12,7 @@ OPENAL_PATCH = \
https://github.com/kcat/openal-soft/commit/a52cfc804813aef8e4b304e20cf843fa6907af6c.patch \
https://github.com/kcat/openal-soft/commit/c3c283a0b5d0130afafaa2a5b6ce6fbc30b6e6a1.patch \
https://github.com/kcat/openal-soft/commit/46b3e1d08ca10e809eb2e20b6371812958b97e1f.patch
-OPENAL_LICENSE = LGPLv2+
+OPENAL_LICENSE = LGPL-2.0+
OPENAL_LICENSE_FILES = COPYING
OPENAL_INSTALL_STAGING = YES
diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk
index 25bd7fd..33c63c2 100644
--- a/package/openipmi/openipmi.mk
+++ b/package/openipmi/openipmi.mk
@@ -9,7 +9,7 @@ OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20
OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz
OPENIPMI_PATCH = \
http://sourceforge.net/p/openipmi/patches/26/attachment/0001-ui-use-standard-uint32_t.patch
-OPENIPMI_LICENSE = LGPLv2+, GPL-2.0+, BSD-3c
+OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3c
OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD
OPENIPMI_DEPENDENCIES = popt ncurses host-pkgconf
# Patching Makefile.am
diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk
index a7f9ed0..ee37a30 100644
--- a/package/owfs/owfs.mk
+++ b/package/owfs/owfs.mk
@@ -13,7 +13,7 @@ OWFS_CONF_OPTS = --disable-owperl --without-perl5 --disable-owtcl --without-tcl
OWFS_AUTORECONF = YES
# owtcl license is declared in module/ownet/c/src/include/ow_functions.h
-OWFS_LICENSE = GPL-2.0+, LGPLv2 (owtcl)
+OWFS_LICENSE = GPL-2.0+, LGPL-2.0 (owtcl)
OWFS_LICENSE_FILES = COPYING COPYING.LIB
OWFS_INSTALL_STAGING = YES
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index d4957f9..2f2d580 100644
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -10,7 +10,7 @@ PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz
PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR)
PANGO_AUTORECONF = YES
PANGO_INSTALL_STAGING = YES
-PANGO_LICENSE = LGPLv2+
+PANGO_LICENSE = LGPL-2.0+
PANGO_LICENSE_FILES = COPYING
PANGO_CONF_OPTS = --enable-explicit-deps=no
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 722146c..da957c0 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -7,7 +7,7 @@
PPPD_VERSION = 2.4.7
PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
PPPD_SITE = https://download.samba.org/pub/ppp
-PPPD_LICENSE = LGPLv2+, LGPL, BSD-4c, BSD-3c, GPL-2.0+
+PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4c, BSD-3c, GPL-2.0+
PPPD_LICENSE_FILES = \
pppd/tdb.c pppd/plugins/pppoatm/COPYING \
pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c
diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk
index d5a140b..0ab3139 100644
--- a/package/procps-ng/procps-ng.mk
+++ b/package/procps-ng/procps-ng.mk
@@ -7,7 +7,7 @@
PROCPS_NG_VERSION = 3.3.12
PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production
-PROCPS_NG_LICENSE = GPL-2.0+, LGPLv2+ (libproc and libps)
+PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps)
PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB
PROCPS_NG_INSTALL_STAGING = YES
PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index d57dd70..fdaf27c 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -9,7 +9,7 @@ RPM_VERSION = $(RPM_VERSION_MAJOR).0.1
RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2
RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x
RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib
-RPM_LICENSE = GPL-2.0 or LGPLv2 (library only)
+RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only)
RPM_LICENSE_FILES = COPYING
RPM_PATCH = \
https://github.com/rpm-software-management/rpm/commit/b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch \
diff --git a/package/shapelib/shapelib.mk b/package/shapelib/shapelib.mk
index 2e8fe6d..34b6253 100644
--- a/package/shapelib/shapelib.mk
+++ b/package/shapelib/shapelib.mk
@@ -6,7 +6,7 @@
SHAPELIB_VERSION = 1.3.0
SHAPELIB_SITE = http://download.osgeo.org/shapelib
-SHAPELIB_LICENSE = MIT or LGPLv2
+SHAPELIB_LICENSE = MIT or LGPL-2.0
SHAPELIB_LICENSE_FILES = web/license.html LICENSE.LGPL
SHAPELIB_INSTALL_STAGING = YES
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
index e8dd0a3..b331408 100644
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -12,7 +12,7 @@ STARTUP_NOTIFICATION_CONF_ENV = lf_cv_sane_realloc=yes
STARTUP_NOTIFICATION_CONF_OPTS = --with-x \
--x-includes="$(STAGING_DIR)/usr/include/X11" \
--x-libraries="$(STAGING_DIR)/usr/lib"
-STARTUP_NOTIFICATION_LICENSE = LGPLv2
+STARTUP_NOTIFICATION_LICENSE = LGPL-2.0
STARTUP_NOTIFICATION_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/ustr/ustr.mk b/package/ustr/ustr.mk
index 715914c..0051b89 100644
--- a/package/ustr/ustr.mk
+++ b/package/ustr/ustr.mk
@@ -9,7 +9,7 @@
USTR_VERSION = 1.0.4
USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2
USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION)
-USTR_LICENSE = BSD-2c, MIT, LGPLv2+
+USTR_LICENSE = BSD-2c, MIT, LGPL-2.0+
USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT
USTR_AUTORECONF = YES
USTR_PATCH = \
diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk
index 25f11de..babf2dd 100644
--- a/package/yasm/yasm.mk
+++ b/package/yasm/yasm.mk
@@ -6,7 +6,7 @@
YASM_VERSION = 1.3.0
YASM_SITE = http://www.tortall.net/projects/yasm/releases
-YASM_LICENSE = BSD-2c, BSD-3c, Artistic, GPL-2.0, LGPLv2
+YASM_LICENSE = BSD-2c, BSD-3c, Artistic, GPL-2.0, LGPL-2.0
YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0
# This sed prevents it compiling 2 programs (vsyasm and ytasm)
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 09/21] boot, package: use SPDX short identifier for BSD-3c
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (7 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 08/21] package: use SPDX short identifier for LGPLv2/LGPLv2+ Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 10/21] boot, package: use SPDX short identifier for BSD-2c Rahul Bedarkar
` (13 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for BSD-3c is BSD-3-Clause.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/BSD-3c/BSD-3-Clause/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
boot/arm-trusted-firmware/arm-trusted-firmware.mk | 2 +-
package/acpica/acpica.mk | 2 +-
package/am335x-pru-package/am335x-pru-package.mk | 2 +-
package/assimp/assimp.mk | 2 +-
package/atf/atf.mk | 2 +-
package/clapack/clapack.mk | 2 +-
package/cmake/cmake.mk | 2 +-
package/dante/dante.mk | 2 +-
package/dash/dash.mk | 2 +-
package/dawgdic/dawgdic.mk | 2 +-
package/e2fsprogs/e2fsprogs.mk | 2 +-
package/eigen/eigen.mk | 2 +-
package/elftosb/elftosb.mk | 2 +-
package/empty/empty.mk | 2 +-
package/eventlog/eventlog.mk | 2 +-
package/faifa/faifa.mk | 2 +-
package/file/file.mk | 2 +-
package/flann/flann.mk | 2 +-
package/fmlib/fmlib.mk | 2 +-
package/freescale-imx/imx-codec/imx-codec.mk | 2 +-
package/freeswitch/freeswitch.mk | 4 ++--
package/gauche/gauche.mk | 2 +-
package/gflags/gflags.mk | 2 +-
package/glibc/glibc.mk | 2 +-
package/glog/glog.mk | 2 +-
package/gnu-efi/gnu-efi.mk | 2 +-
package/go-bootstrap/go-bootstrap.mk | 2 +-
package/go/go.mk | 2 +-
package/google-breakpad/google-breakpad.mk | 2 +-
package/gpsd/gpsd.mk | 2 +-
package/gtest/gtest.mk | 2 +-
package/heimdal/heimdal.mk | 2 +-
package/hidapi/hidapi.mk | 2 +-
package/hiredis/hiredis.mk | 2 +-
package/hostapd/hostapd.mk | 2 +-
package/hplip/hplip.mk | 2 +-
package/hwloc/hwloc.mk | 2 +-
package/iperf3/iperf3.mk | 2 +-
package/ipmitool/ipmitool.mk | 2 +-
package/ipmiutil/ipmiutil.mk | 2 +-
package/iputils/iputils.mk | 2 +-
package/iqvlinux/iqvlinux.mk | 2 +-
package/jpeg-turbo/jpeg-turbo.mk | 2 +-
package/jquery-sparkline/jquery-sparkline.mk | 2 +-
package/kyua/kyua.mk | 2 +-
package/lapack/lapack.mk | 2 +-
package/leveldb/leveldb.mk | 2 +-
package/libarchive/libarchive.mk | 2 +-
package/libbsd/libbsd.mk | 2 +-
package/libcap/libcap.mk | 2 +-
package/libdnet/libdnet.mk | 2 +-
package/libedit/libedit.mk | 2 +-
package/libevent/libevent.mk | 2 +-
package/libglew/libglew.mk | 2 +-
package/libglob/libglob.mk | 2 +-
package/libjpeg/libjpeg.mk | 2 +-
package/libkcapi/libkcapi.mk | 2 +-
package/libldns/libldns.mk | 2 +-
package/liblinear/liblinear.mk | 2 +-
package/libmbus/libmbus.mk | 2 +-
package/libmemcached/libmemcached.mk | 2 +-
package/libminiupnpc/libminiupnpc.mk | 2 +-
package/libmpdclient/libmpdclient.mk | 2 +-
package/libnatpmp/libnatpmp.mk | 2 +-
package/libnet/libnet.mk | 2 +-
package/libogg/libogg.mk | 2 +-
package/libpcap/libpcap.mk | 2 +-
package/libpqxx/libpqxx.mk | 2 +-
package/libsha1/libsha1.mk | 2 +-
package/libshairplay/libshairplay.mk | 2 +-
package/libsilk/libsilk.mk | 2 +-
package/libsrtp/libsrtp.mk | 2 +-
package/libtheora/libtheora.mk | 2 +-
package/libtirpc/libtirpc.mk | 2 +-
package/libubox/libubox.mk | 2 +-
package/libupnp/libupnp.mk | 2 +-
package/liburiparser/liburiparser.mk | 2 +-
package/libuv/libuv.mk | 2 +-
package/libvorbis/libvorbis.mk | 2 +-
package/libvpx/libvpx.mk | 2 +-
package/libxmlrpc/libxmlrpc.mk | 2 +-
package/libyuv/libyuv.mk | 2 +-
package/libzip/libzip.mk | 2 +-
package/lighttpd/lighttpd.mk | 2 +-
package/linux-pam/linux-pam.mk | 2 +-
package/linux-syscall-support/linux-syscall-support.mk | 2 +-
package/lua-csnappy/lua-csnappy.mk | 2 +-
package/lutok/lutok.mk | 2 +-
package/memcached/memcached.mk | 2 +-
package/mfgtools/mfgtools.mk | 2 +-
package/minidlna/minidlna.mk | 2 +-
package/minissdpd/minissdpd.mk | 2 +-
package/mongrel2/mongrel2.mk | 2 +-
package/mrouted/mrouted.mk | 2 +-
package/musepack/musepack.mk | 2 +-
| 2 +-
package/ne10/ne10.mk | 2 +-
package/netcat-openbsd/netcat-openbsd.mk | 2 +-
package/netsurf-buildsystem/netsurf-buildsystem.mk | 2 +-
package/nginx-upload/nginx-upload.mk | 2 +-
package/olsr/olsr.mk | 2 +-
package/open-plc-utils/open-plc-utils.mk | 2 +-
package/openblas/openblas.mk | 2 +-
package/opencv/opencv.mk | 2 +-
package/opencv3/opencv3.mk | 2 +-
package/openipmi/openipmi.mk | 2 +-
package/openmpi/openmpi.mk | 2 +-
package/openntpd/openntpd.mk | 2 +-
package/openssh/openssh.mk | 2 +-
package/openswan/openswan.mk | 2 +-
package/opus/opus.mk | 2 +-
package/opusfile/opusfile.mk | 2 +-
package/orc/orc.mk | 2 +-
package/p11-kit/p11-kit.mk | 2 +-
package/paho-mqtt-c/paho-mqtt-c.mk | 2 +-
package/pcre/pcre.mk | 2 +-
package/pcsc-lite/pcsc-lite.mk | 2 +-
package/php-zmq/php-zmq.mk | 2 +-
package/pppd/pppd.mk | 2 +-
package/protobuf/protobuf.mk | 2 +-
package/pru-software-support/pru-software-support.mk | 2 +-
package/python-babel/python-babel.mk | 2 +-
package/python-cherrypy/python-cherrypy.mk | 2 +-
package/python-click/python-click.mk | 2 +-
package/python-configobj/python-configobj.mk | 2 +-
package/python-couchdb/python-couchdb.mk | 2 +-
package/python-cryptography/python-cryptography.mk | 2 +-
package/python-cssselect/python-cssselect.mk | 2 +-
package/python-dateutil/python-dateutil.mk | 2 +-
package/python-django/python-django.mk | 2 +-
package/python-dpkt/python-dpkt.mk | 2 +-
package/python-enum34/python-enum34.mk | 2 +-
package/python-flask-babel/python-flask-babel.mk | 2 +-
package/python-flask-jsonrpc/python-flask-jsonrpc.mk | 2 +-
package/python-flask/python-flask.mk | 2 +-
package/python-idna/python-idna.mk | 2 +-
package/python-ipy/python-ipy.mk | 2 +-
package/python-ipython/python-ipython.mk | 2 +-
package/python-itsdangerous/python-itsdangerous.mk | 2 +-
package/python-jinja2/python-jinja2.mk | 2 +-
package/python-logbook/python-logbook.mk | 2 +-
package/python-lxml/python-lxml.mk | 2 +-
package/python-markdown/python-markdown.mk | 2 +-
package/python-markupsafe/python-markupsafe.mk | 2 +-
package/python-mistune/python-mistune.mk | 2 +-
package/python-netaddr/python-netaddr.mk | 2 +-
package/python-numpy/python-numpy.mk | 2 +-
package/python-posix-ipc/python-posix-ipc.mk | 2 +-
package/python-prompt-toolkit/python-prompt-toolkit.mk | 2 +-
package/python-protobuf/python-protobuf.mk | 2 +-
package/python-psutil/python-psutil.mk | 2 +-
package/python-pycparser/python-pycparser.mk | 2 +-
package/python-pydal/python-pydal.mk | 2 +-
package/python-pypcap/python-pypcap.mk | 2 +-
package/python-pyqrcode/python-pyqrcode.mk | 2 +-
package/python-pysnmp-apps/python-pysnmp-apps.mk | 2 +-
package/python-pysnmp-mibs/python-pysnmp-mibs.mk | 2 +-
package/python-pysnmp/python-pysnmp.mk | 2 +-
package/python-pysocks/python-pysocks.mk | 2 +-
package/python-pytrie/python-pytrie.mk | 2 +-
package/python-pyusb/python-pyusb.mk | 2 +-
package/python-pyzmq/python-pyzmq.mk | 2 +-
package/python-setproctitle/python-setproctitle.mk | 2 +-
package/python-ujson/python-ujson.mk | 2 +-
package/python-werkzeug/python-werkzeug.mk | 2 +-
package/python-whoosh/python-whoosh.mk | 2 +-
package/python-ws4py/python-ws4py.mk | 2 +-
package/python-xlrd/python-xlrd.mk | 2 +-
package/python-xlwt/python-xlwt.mk | 2 +-
package/qemu/qemu.mk | 2 +-
package/qt5/qt5base/qt5base.mk | 2 +-
package/qt5/qt5connectivity/qt5connectivity.mk | 2 +-
package/qt5/qt5enginio/qt5enginio.mk | 2 +-
package/qt5/qt5webchannel/qt5webchannel.mk | 2 +-
package/qt5/qt5webkit/qt5webkit.mk | 2 +-
package/qt5/qt5websockets/qt5websockets.mk | 2 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 2 +-
package/redis/redis.mk | 2 +-
package/rpcbind/rpcbind.mk | 2 +-
package/rpi-firmware/rpi-firmware.mk | 2 +-
package/rpi-userland/rpi-userland.mk | 2 +-
package/rs485conf/rs485conf.mk | 2 +-
package/ruby/ruby.mk | 2 +-
package/sdparm/sdparm.mk | 2 +-
package/sg3_utils/sg3_utils.mk | 2 +-
package/shairport-sync/shairport-sync.mk | 2 +-
package/snappy/snappy.mk | 2 +-
package/socketcand/socketcand.mk | 2 +-
package/spawn-fcgi/spawn-fcgi.mk | 2 +-
package/speex/speex.mk | 2 +-
package/spice-protocol/spice-protocol.mk | 2 +-
package/strace/strace.mk | 2 +-
package/sudo/sudo.mk | 2 +-
package/swig/swig.mk | 2 +-
package/tcpdump/tcpdump.mk | 2 +-
package/tegrarcm/tegrarcm.mk | 2 +-
package/ti-utils/ti-utils.mk | 2 +-
package/tinyalsa/tinyalsa.mk | 2 +-
package/tor/tor.mk | 2 +-
package/tremor/tremor.mk | 2 +-
package/trousers/trousers.mk | 2 +-
package/unionfs/unionfs.mk | 2 +-
package/util-linux/util-linux.mk | 2 +-
package/vboot-utils/vboot-utils.mk | 2 +-
package/vde2/vde2.mk | 2 +-
package/wavpack/wavpack.mk | 2 +-
package/webp/webp.mk | 2 +-
package/webrtc-audio-processing/webrtc-audio-processing.mk | 2 +-
package/wpa_supplicant/wpa_supplicant.mk | 2 +-
package/xdotool/xdotool.mk | 2 +-
package/yasm/yasm.mk | 2 +-
211 files changed, 212 insertions(+), 212 deletions(-)
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index 5acfab3..aa19686 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -5,7 +5,7 @@
################################################################################
ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION))
-ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3c
+ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause
ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.md
ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot
diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk
index 18870c2..ebfa4b6 100644
--- a/package/acpica/acpica.mk
+++ b/package/acpica/acpica.mk
@@ -7,7 +7,7 @@
ACPICA_VERSION = 20161117
ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz
ACPICA_SITE = https://acpica.org/sites/acpica/files
-ACPICA_LICENSE = BSD-3c or GPL-2.0
+ACPICA_LICENSE = BSD-3-Clause or GPL-2.0
ACPICA_LICENSE_FILES = source/include/acpi.h
ACPICA_DEPENDENCIES = host-bison host-flex
diff --git a/package/am335x-pru-package/am335x-pru-package.mk b/package/am335x-pru-package/am335x-pru-package.mk
index d6bffb4..a2465b1 100644
--- a/package/am335x-pru-package/am335x-pru-package.mk
+++ b/package/am335x-pru-package/am335x-pru-package.mk
@@ -6,7 +6,7 @@
AM335X_PRU_PACKAGE_VERSION = 5f374ad57cc195f28bf5e585c3d446aba6ee7096
AM335X_PRU_PACKAGE_SITE = $(call github,beagleboard,am335x_pru_package,$(AM335X_PRU_PACKAGE_VERSION))
-AM335X_PRU_PACKAGE_LICENSE = BSD-3c
+AM335X_PRU_PACKAGE_LICENSE = BSD-3-Clause
AM335X_PRU_PACKAGE_LICENSE_FILES = pru_sw/utils/LICENCE.txt
AM335X_PRU_PACKAGE_DEPENDENCIES = host-am335x-pru-package
AM335X_PRU_PACKAGE_INSTALL_STAGING = YES
diff --git a/package/assimp/assimp.mk b/package/assimp/assimp.mk
index acd3701..4d44748 100644
--- a/package/assimp/assimp.mk
+++ b/package/assimp/assimp.mk
@@ -6,7 +6,7 @@
ASSIMP_VERSION = v3.2
ASSIMP_SITE = $(call github,assimp,assimp,$(ASSIMP_VERSION))
-ASSIMP_LICENSE = BSD-3c
+ASSIMP_LICENSE = BSD-3-Clause
ASSIMP_LICENSE_FILES = LICENSE
ASSIMP_DEPENDENCIES = zlib
ASSIMP_INSTALL_STAGING = YES
diff --git a/package/atf/atf.mk b/package/atf/atf.mk
index ed2080e..8eef1a8 100644
--- a/package/atf/atf.mk
+++ b/package/atf/atf.mk
@@ -7,7 +7,7 @@
ATF_VERSION = 0.21
ATF_SITE = https://github.com/jmmv/atf/releases/download/atf-$(ATF_VERSION)
ATF_INSTALL_STAGING = YES
-ATF_LICENSE = BSD-2c, BSD-3c
+ATF_LICENSE = BSD-2c, BSD-3-Clause
ATF_LICENSE_FILES = COPYING
# Ships a beta libtool version hence our patch doesn't apply.
ATF_AUTORECONF = YES
diff --git a/package/clapack/clapack.mk b/package/clapack/clapack.mk
index c3841f2..9a083f3 100644
--- a/package/clapack/clapack.mk
+++ b/package/clapack/clapack.mk
@@ -10,7 +10,7 @@ CLAPACK_SOURCE = clapack-$(CLAPACK_VERSION)-CMAKE.tgz
# - libf2c.a (not installed)
# - libblas (statically linked with libf2c.a)
# - liblapack (statically linked with libf2c.a)
-CLAPACK_LICENSE = HPND (libf2c), BSD-3c (libblas and liblapack)
+CLAPACK_LICENSE = HPND (libf2c), BSD-3-Clause (libblas and liblapack)
CLAPACK_LICENSE_FILES = F2CLIBS/libf2c/Notice COPYING
CLAPACK_SITE = http://www.netlib.org/clapack
CLAPACK_INSTALL_STAGING = YES
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index 0fd7139..d9eea32 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -7,7 +7,7 @@
CMAKE_VERSION_MAJOR = 3.7
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
-CMAKE_LICENSE = BSD-3c
+CMAKE_LICENSE = BSD-3-Clause
CMAKE_LICENSE_FILES = Copyright.txt
# CMake is a particular package:
diff --git a/package/dante/dante.mk b/package/dante/dante.mk
index 1bab648..687567e 100644
--- a/package/dante/dante.mk
+++ b/package/dante/dante.mk
@@ -6,7 +6,7 @@
DANTE_VERSION = 1.4.1
DANTE_SITE = http://www.inet.no/dante/files
-DANTE_LICENSE = BSD-3c
+DANTE_LICENSE = BSD-3-Clause
DANTE_LICENSE_FILES = LICENSE
# Dante uses a *VERY* old configure.ac
diff --git a/package/dash/dash.mk b/package/dash/dash.mk
index 26db5a8..0b58a46 100644
--- a/package/dash/dash.mk
+++ b/package/dash/dash.mk
@@ -8,7 +8,7 @@ DASH_VERSION = 0.5.8
DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz
DASH_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/d/dash
DASH_PATCH = dash_$(DASH_VERSION)-1.diff.gz
-DASH_LICENSE = BSD-3c, GPL-2.0+ (mksignames.c)
+DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
DASH_LICENSE_FILES = COPYING
# 0002-fix-parallel-build.patch
diff --git a/package/dawgdic/dawgdic.mk b/package/dawgdic/dawgdic.mk
index 2f0a53b..443782c 100644
--- a/package/dawgdic/dawgdic.mk
+++ b/package/dawgdic/dawgdic.mk
@@ -6,7 +6,7 @@
DAWGDIC_VERSION = 16ac537ba9883ff01b63b6d1fdc3072150c68fee
DAWGDIC_SITE = $(call github,stil,dawgdic,$(DAWGDIC_VERSION))
-DAWGDIC_LICENSE = BSD-3c
+DAWGDIC_LICENSE = BSD-3-Clause
DAWGDIC_LICENSE_FILES = COPYING
DAWGDIC_AUTORECONF = YES
DAWGDIC_INSTALL_STAGING = YES
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 04471c6..3f235c5 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -7,7 +7,7 @@
E2FSPROGS_VERSION = 1.43.4
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
-E2FSPROGS_LICENSE = GPL-2.0, BSD-3c (libuuid), MIT-like with advertising clause (libss and libet)
+E2FSPROGS_LICENSE = GPL-2.0, BSD-3-Clause (libuuid), MIT-like with advertising clause (libss and libet)
E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
E2FSPROGS_INSTALL_STAGING = YES
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
index 03eabf6..6ae2911 100644
--- a/package/eigen/eigen.mk
+++ b/package/eigen/eigen.mk
@@ -7,7 +7,7 @@
EIGEN_VERSION = 3.2.5
EIGEN_SITE = https://bitbucket.org/eigen/eigen
EIGEN_SITE_METHOD = hg
-EIGEN_LICENSE = MPL2, BSD-3c, LGPL-2.1
+EIGEN_LICENSE = MPL2, BSD-3-Clause, LGPL-2.1
EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README
EIGEN_INSTALL_STAGING = YES
EIGEN_INSTALL_TARGET = NO
diff --git a/package/elftosb/elftosb.mk b/package/elftosb/elftosb.mk
index ac9aa32..a24e515 100644
--- a/package/elftosb/elftosb.mk
+++ b/package/elftosb/elftosb.mk
@@ -6,7 +6,7 @@
ELFTOSB_VERSION = 10.12.01
ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
-ELFTOSB_LICENSE = BSD-3c
+ELFTOSB_LICENSE = BSD-3-Clause
ELFTOSB_LICENSE_FILES = COPYING
define HOST_ELFTOSB_BUILD_CMDS
diff --git a/package/empty/empty.mk b/package/empty/empty.mk
index 3339ff6..a1cc3c0 100644
--- a/package/empty/empty.mk
+++ b/package/empty/empty.mk
@@ -7,7 +7,7 @@
EMPTY_VERSION = 0.6.19b
EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz
EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION)
-EMPTY_LICENSE = BSD-3c
+EMPTY_LICENSE = BSD-3-Clause
EMPTY_LICENSE_FILES = COPYRIGHT
define EMPTY_BUILD_CMDS
diff --git a/package/eventlog/eventlog.mk b/package/eventlog/eventlog.mk
index 76da002..7253657 100644
--- a/package/eventlog/eventlog.mk
+++ b/package/eventlog/eventlog.mk
@@ -8,7 +8,7 @@ EVENTLOG_VERSION_MAJOR = 0.2
EVENTLOG_VERSION = $(EVENTLOG_VERSION_MAJOR).12
EVENTLOG_SOURCE = eventlog_$(EVENTLOG_VERSION).tar.gz
EVENTLOG_SITE = https://my.balabit.com/downloads/eventlog/$(EVENTLOG_VERSION_MAJOR)
-EVENTLOG_LICENSE = BSD-3c
+EVENTLOG_LICENSE = BSD-3-Clause
EVENTLOG_LICENSE_FILES = COPYING
EVENTLOG_INSTALL_STAGING = YES
diff --git a/package/faifa/faifa.mk b/package/faifa/faifa.mk
index a56a8c0..af7a174 100644
--- a/package/faifa/faifa.mk
+++ b/package/faifa/faifa.mk
@@ -8,7 +8,7 @@ FAIFA_VERSION = v0.1
FAIFA_SITE = $(call github,ffainelli,faifa,$(FAIFA_VERSION))
FAIFA_INSTALL_STAGING = YES
FAIFA_DEPENDENCIES = libpcap host-autoconf
-FAIFA_LICENSE = BSD-3c
+FAIFA_LICENSE = BSD-3-Clause
FAIFA_LICENSE_FILES = COPYING
FAIFA_MAKE_OPTS += GIT_REV=$(FAIFA_VERSION)
diff --git a/package/file/file.mk b/package/file/file.mk
index 2fa6804..48c1e9f 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -10,7 +10,7 @@ FILE_DEPENDENCIES = host-file zlib
HOST_FILE_DEPENDENCIES = host-zlib
FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
FILE_INSTALL_STAGING = YES
-FILE_LICENSE = BSD-2c, BSD-4c (one file), BSD-3c (one file)
+FILE_LICENSE = BSD-2c, BSD-4c (one file), BSD-3-Clause (one file)
FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c
$(eval $(autotools-package))
diff --git a/package/flann/flann.mk b/package/flann/flann.mk
index af86a02..abfd0cd 100644
--- a/package/flann/flann.mk
+++ b/package/flann/flann.mk
@@ -7,7 +7,7 @@
FLANN_VERSION = 3645f0c30a47267e56e5acdecfc7bac2b76bc3d5
FLANN_SITE = $(call github,mariusmuja,flann,$(FLANN_VERSION))
FLANN_INSTALL_STAGING = YES
-FLANN_LICENSE = BSD-3c
+FLANN_LICENSE = BSD-3-Clause
FLANN_LICENSE_FILES = COPYING
FLANN_CONF_OPTS = \
-DBUILD_C_BINDINGS=ON \
diff --git a/package/fmlib/fmlib.mk b/package/fmlib/fmlib.mk
index e75eeff..e67ab1e 100644
--- a/package/fmlib/fmlib.mk
+++ b/package/fmlib/fmlib.mk
@@ -6,7 +6,7 @@
FMLIB_VERSION = fsl-sdk-v2.0
FMLIB_SITE = git://git.freescale.com/ppc/sdk/fmlib.git
-FMLIB_LICENSE = BSD-3c, GPL-2.0+
+FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+
FMLIB_LICENSE_FILES = COPYING
FMLIB_DEPENDENCIES = linux
FMLIB_INSTALL_STAGING = YES
diff --git a/package/freescale-imx/imx-codec/imx-codec.mk b/package/freescale-imx/imx-codec/imx-codec.mk
index 911ad8b..44be941 100644
--- a/package/freescale-imx/imx-codec/imx-codec.mk
+++ b/package/freescale-imx/imx-codec/imx-codec.mk
@@ -9,7 +9,7 @@ IMX_CODEC_SITE = $(FREESCALE_IMX_SITE)
IMX_CODEC_SOURCE = imx-codec-$(IMX_CODEC_VERSION).bin
IMX_CODEC_INSTALL_STAGING = YES
-IMX_CODEC_LICENSE = NXP Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
+IMX_CODEC_LICENSE = NXP Semiconductor Software License Agreement, BSD-3-Clause (flac, ogg headers)
IMX_CODEC_LICENSE_FILES = EULA COPYING
IMX_CODEC_REDISTRIBUTE = NO
diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk
index fe4db68..4e81854 100644
--- a/package/freeswitch/freeswitch.mk
+++ b/package/freeswitch/freeswitch.mk
@@ -163,7 +163,7 @@ FREESWITCH_PRE_CONFIGURE_HOOKS += FREESWITCH_ENABLE_MODULES
# mod_isac supports a limited set of archs
# src/mod/codecs/mod_isac/typedefs.h
ifeq ($(BR2_i386)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_x86_64),y)
-FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3c (mod_isac)
+FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3-Clause (mod_isac)
FREESWITCH_LICENSE_FILES += src/mod/codecs/mod_isac/LICENSE
FREESWITCH_ENABLED_MODULES += codecs/mod_isac
endif
@@ -282,7 +282,7 @@ FREESWITCH_DEPENDENCIES += xz
endif
ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8)$(BR2_PACKAGE_FFMPEG),yy)
-FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3c (libvpx, libyuv)
+FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3-Clause (libvpx, libyuv)
FREESWITCH_LICENSE_FILES += libs/libvpx/LICENSE libs/libyuv/LICENSE
FREESWITCH_CONF_OPTS += --enable-libvpx --enable-libyuv
FREESWITCH_DEPENDENCIES += host-yasm ffmpeg
diff --git a/package/gauche/gauche.mk b/package/gauche/gauche.mk
index 85fcc71..5a4fe9a 100644
--- a/package/gauche/gauche.mk
+++ b/package/gauche/gauche.mk
@@ -7,7 +7,7 @@
GAUCHE_VERSION = 0.9.4
GAUCHE_SOURCE = Gauche-$(GAUCHE_VERSION).tgz
GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche
-GAUCHE_LICENSE = BSD-3c, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm)
+GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm)
GAUCHE_LICENSE_FILES = COPYING
GAUCHE_DEPENDENCIES = host-gauche
GAUCHE_PATCH = https://github.com/shirok/Gauche/commit/13a196557848f22a1607a300643131345e9f32b3.patch
diff --git a/package/gflags/gflags.mk b/package/gflags/gflags.mk
index 94f2210..45186a3 100644
--- a/package/gflags/gflags.mk
+++ b/package/gflags/gflags.mk
@@ -7,7 +7,7 @@
GFLAGS_VERSION = v2.2.0
GFLAGS_SITE = $(call github,gflags,gflags,$(GFLAGS_VERSION))
GFLAGS_INSTALL_STAGING = YES
-GFLAGS_LICENSE = BSD-3c
+GFLAGS_LICENSE = BSD-3-Clause
GFLAGS_LICENSE_FILES = COPYING.txt
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index e904bf8..58cb3d4 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -9,7 +9,7 @@ GLIBC_SITE = $(BR2_GNU_MIRROR)/libc
GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz
GLIBC_SRC_SUBDIR = .
-GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3c, MIT (library)
+GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library)
GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES)
# glibc is part of the toolchain so disable the toolchain dependency
diff --git a/package/glog/glog.mk b/package/glog/glog.mk
index aa7cacb..8a5c36b 100644
--- a/package/glog/glog.mk
+++ b/package/glog/glog.mk
@@ -7,7 +7,7 @@
GLOG_VERSION = v0.3.4
GLOG_SITE = $(call github,google,glog,$(GLOG_VERSION))
GLOG_INSTALL_STAGING = YES
-GLOG_LICENSE = BSD-3c
+GLOG_LICENSE = BSD-3-Clause
GLOG_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_GFLAGS),y)
diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk
index 5ac615e..d427870 100644
--- a/package/gnu-efi/gnu-efi.mk
+++ b/package/gnu-efi/gnu-efi.mk
@@ -8,7 +8,7 @@ GNU_EFI_VERSION = 3.0.1
GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2
GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi
GNU_EFI_INSTALL_STAGING = YES
-GNU_EFI_LICENSE = BSD-3c and/or GPL-2.0+ (gnuefi), BSD-3c (efilib)
+GNU_EFI_LICENSE = BSD-3-Clause and/or GPL-2.0+ (gnuefi), BSD-3-Clause (efilib)
GNU_EFI_LICENSE_FILES = README.efilib
# gnu-efi is a set of library and header files used to build
diff --git a/package/go-bootstrap/go-bootstrap.mk b/package/go-bootstrap/go-bootstrap.mk
index f403f78..28a113e 100644
--- a/package/go-bootstrap/go-bootstrap.mk
+++ b/package/go-bootstrap/go-bootstrap.mk
@@ -8,7 +8,7 @@ GO_BOOTSTRAP_VERSION = 1.4.3
GO_BOOTSTRAP_SITE = https://storage.googleapis.com/golang
GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).src.tar.gz
-GO_BOOTSTRAP_LICENSE = BSD-3c
+GO_BOOTSTRAP_LICENSE = BSD-3-Clause
GO_BOOTSTRAP_LICENSE_FILES = LICENSE
# To build programs that need cgo support the toolchain needs to be
diff --git a/package/go/go.mk b/package/go/go.mk
index bd30890..a461342 100644
--- a/package/go/go.mk
+++ b/package/go/go.mk
@@ -8,7 +8,7 @@ GO_VERSION = 1.7.4
GO_SITE = https://storage.googleapis.com/golang
GO_SOURCE = go$(GO_VERSION).src.tar.gz
-GO_LICENSE = BSD-3c
+GO_LICENSE = BSD-3-Clause
GO_LICENSE_FILES = LICENSE
ifeq ($(BR2_arm),y)
diff --git a/package/google-breakpad/google-breakpad.mk b/package/google-breakpad/google-breakpad.mk
index 7a11c72..fd5a45d 100644
--- a/package/google-breakpad/google-breakpad.mk
+++ b/package/google-breakpad/google-breakpad.mk
@@ -11,7 +11,7 @@ GOOGLE_BREAKPAD_CONF_OPTS = --disable-processor --disable-tools
# Only a static library is installed
GOOGLE_BREAKPAD_INSTALL_TARGET = NO
GOOGLE_BREAKPAD_INSTALL_STAGING = YES
-GOOGLE_BREAKPAD_LICENSE = BSD-3c
+GOOGLE_BREAKPAD_LICENSE = BSD-3-Clause
GOOGLE_BREAKPAD_LICENSE_FILES = LICENSE
GOOGLE_BREAKPAD_DEPENDENCIES = host-google-breakpad linux-syscall-support
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 73067d3..552d6d9 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -6,7 +6,7 @@
GPSD_VERSION = 3.16
GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
-GPSD_LICENSE = BSD-3c
+GPSD_LICENSE = BSD-3-Clause
GPSD_LICENSE_FILES = COPYING
GPSD_INSTALL_STAGING = YES
diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
index 329179d..9e69141 100644
--- a/package/gtest/gtest.mk
+++ b/package/gtest/gtest.mk
@@ -8,7 +8,7 @@ GTEST_VERSION = release-1.8.0
GTEST_SITE = $(call github,google,googletest,$(GTEST_VERSION))
GTEST_INSTALL_STAGING = YES
GTEST_INSTALL_TARGET = NO
-GTEST_LICENSE = BSD-3c
+GTEST_LICENSE = BSD-3-Clause
GTEST_LICENSE_FILES = googletest/LICENSE
ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y)
diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk
index 5376a6c..d819731 100644
--- a/package/heimdal/heimdal.mk
+++ b/package/heimdal/heimdal.mk
@@ -25,7 +25,7 @@ HOST_HEIMDAL_CONF_OPTS = \
--without-x \
--disable-heimdal-documentation
HOST_HEIMDAL_CONF_ENV = MAKEINFO=true
-HEIMDAL_LICENSE = BSD-3c
+HEIMDAL_LICENSE = BSD-3-Clause
HEIMDAL_LICENSE_FILES = LICENSE
# We need asn1_compile in the PATH for samba4
diff --git a/package/hidapi/hidapi.mk b/package/hidapi/hidapi.mk
index e4083ce..7eed800 100644
--- a/package/hidapi/hidapi.mk
+++ b/package/hidapi/hidapi.mk
@@ -11,7 +11,7 @@ HIDAPI_SITE = $(call github,signal11,hidapi,$(HIDAPI_VERSION))
HIDAPI_INSTALL_STAGING = YES
# No configure provided, so we need to autoreconf.
HIDAPI_AUTORECONF = YES
-HIDAPI_LICENSE = GPL-3.0 or BSD-3c or HIDAPI license
+HIDAPI_LICENSE = GPL-3.0 or BSD-3-Clause or HIDAPI license
HIDAPI_LICENSE_FILES = LICENSE.txt LICENSE-gpl3.txt LICENSE-bsd.txt LICENSE-orig.txt
HIDAPI_DEPENDENCIES = libusb libgudev
diff --git a/package/hiredis/hiredis.mk b/package/hiredis/hiredis.mk
index cd406f1..53ad0b9 100644
--- a/package/hiredis/hiredis.mk
+++ b/package/hiredis/hiredis.mk
@@ -6,7 +6,7 @@
HIREDIS_VERSION = v0.13.3
HIREDIS_SITE = $(call github,redis,hiredis,$(HIREDIS_VERSION))
-HIREDIS_LICENSE = BSD-3c
+HIREDIS_LICENSE = BSD-3-Clause
HIREDIS_LICENSE_FILES = COPYING
HIREDIS_INSTALL_STAGING = YES
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index a499011..cf651f8 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -10,7 +10,7 @@ HOSTAPD_SUBDIR = hostapd
HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
HOSTAPD_DEPENDENCIES = host-pkgconf libnl
HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
-HOSTAPD_LICENSE = BSD-3c
+HOSTAPD_LICENSE = BSD-3-Clause
HOSTAPD_LICENSE_FILES = README
HOSTAPD_CONFIG_SET =
diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
index 5f9aa6f..b1c167c 100644
--- a/package/hplip/hplip.mk
+++ b/package/hplip/hplip.mk
@@ -8,7 +8,7 @@ HPLIP_VERSION = 3.16.11
HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
HPLIP_AUTORECONF = YES
HPLIP_DEPENDENCIES = cups libusb jpeg host-pkgconf
-HPLIP_LICENSE = GPL-2.0, BSD-3c, MIT
+HPLIP_LICENSE = GPL-2.0, BSD-3-Clause, MIT
HPLIP_LICENSE_FILES = COPYING
HPLIP_CONF_OPTS = \
diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk
index 9b5eae8..ad2e090 100644
--- a/package/hwloc/hwloc.mk
+++ b/package/hwloc/hwloc.mk
@@ -8,7 +8,7 @@ HWLOC_VERSION_MAJOR = 1.10
HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1
HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2
HWLOC_SITE = http://www.open-mpi.org/software/hwloc/v$(HWLOC_VERSION_MAJOR)/downloads
-HWLOC_LICENSE = BSD-3c
+HWLOC_LICENSE = BSD-3-Clause
HWLOC_LICENSE_FILES = COPYING
HWLOC_DEPENDENCIES = host-pkgconf
# 0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch touches Makefile.am
diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk
index 909c104..aaf68b3 100644
--- a/package/iperf3/iperf3.mk
+++ b/package/iperf3/iperf3.mk
@@ -7,7 +7,7 @@
IPERF3_VERSION = 3.1.5
IPERF3_SITE = http://downloads.es.net/pub/iperf
IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz
-IPERF3_LICENSE = BSD-3c, BSD-2c, MIT
+IPERF3_LICENSE = BSD-3-Clause, BSD-2c, MIT
IPERF3_LICENSE_FILES = LICENSE
IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk
index f4dca73..b47209d 100644
--- a/package/ipmitool/ipmitool.mk
+++ b/package/ipmitool/ipmitool.mk
@@ -7,7 +7,7 @@
IPMITOOL_VERSION = 1.8.18
IPMITOOL_SOURCE = ipmitool-$(IPMITOOL_VERSION).tar.bz2
IPMITOOL_SITE = http://downloads.sourceforge.net/project/ipmitool/ipmitool/$(IPMITOOL_VERSION)
-IPMITOOL_LICENSE = BSD-3c
+IPMITOOL_LICENSE = BSD-3-Clause
IPMITOOL_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y)
diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk
index 392856c..a5a6b49 100644
--- a/package/ipmiutil/ipmiutil.mk
+++ b/package/ipmiutil/ipmiutil.mk
@@ -6,7 +6,7 @@
IPMIUTIL_VERSION = 2.9.9
IPMIUTIL_SITE = http://sourceforge.net/projects/ipmiutil/files
-IPMIUTIL_LICENSE = BSD-3c
+IPMIUTIL_LICENSE = BSD-3-Clause
IPMIUTIL_LICENSE_FILES = COPYING
# We're patching configure.ac
IPMIUTIL_AUTORECONF = YES
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 34c0a27..b5f0f26 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -13,7 +13,7 @@
IPUTILS_VERSION = 55828d1fef3fed7f07abcbf7be9282a9662e78c7
IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))
-IPUTILS_LICENSE = GPL-2.0+, BSD-3c, BSD-4c
+IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause, BSD-4c
# Only includes a license file for BSD
IPUTILS_LICENSE_FILES = ninfod/COPYING
diff --git a/package/iqvlinux/iqvlinux.mk b/package/iqvlinux/iqvlinux.mk
index 5ceaaf4..165c7c4 100644
--- a/package/iqvlinux/iqvlinux.mk
+++ b/package/iqvlinux/iqvlinux.mk
@@ -8,7 +8,7 @@ IQVLINUX_VERSION = 1.1.5.3
IQVLINUX_SITE = http://sourceforge.net/projects/e1000/files/iqvlinux/$(IQVLINUX_VERSION)
IQVLINUX_SOURCE = iqvlinux.tar.gz
-IQVLINUX_LICENSE = GPL-2.0, BSD-3c
+IQVLINUX_LICENSE = GPL-2.0, BSD-3-Clause
IQVLINUX_LICENSE_FILES = \
COPYING src/linux/driver/files.txt \
inc/linux/files.txt inc/files.txt
diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk
index e2b7e63..c8c1747 100644
--- a/package/jpeg-turbo/jpeg-turbo.mk
+++ b/package/jpeg-turbo/jpeg-turbo.mk
@@ -7,7 +7,7 @@
JPEG_TURBO_VERSION = 1.5.1
JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz
JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION)
-JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like)
+JPEG_TURBO_LICENSE = jpeg-license (BSD-3-Clause-like)
JPEG_TURBO_LICENSE_FILES = LICENSE.md
JPEG_TURBO_INSTALL_STAGING = YES
JPEG_TURBO_PROVIDES = jpeg
diff --git a/package/jquery-sparkline/jquery-sparkline.mk b/package/jquery-sparkline/jquery-sparkline.mk
index 4a7b94e..165c2fa 100644
--- a/package/jquery-sparkline/jquery-sparkline.mk
+++ b/package/jquery-sparkline/jquery-sparkline.mk
@@ -7,7 +7,7 @@
JQUERY_SPARKLINE_VERSION = 2.1.2
JQUERY_SPARKLINE_SITE = http://www.omnipotent.net/jquery.sparkline/$(JQUERY_SPARKLINE_VERSION)
JQUERY_SPARKLINE_SOURCE = jquery.sparkline.min.js
-JQUERY_SPARKLINE_LICENSE = BSD-3c
+JQUERY_SPARKLINE_LICENSE = BSD-3-Clause
define JQUERY_SPARKLINE_EXTRACT_CMDS
cp $(DL_DIR)/$(JQUERY_SPARKLINE_SOURCE) $(@D)
diff --git a/package/kyua/kyua.mk b/package/kyua/kyua.mk
index c75a09f..9e1c810 100644
--- a/package/kyua/kyua.mk
+++ b/package/kyua/kyua.mk
@@ -8,7 +8,7 @@ KYUA_VERSION = 0.11
KYUA_SITE = https://github.com/jmmv/kyua/releases/download/kyua-$(KYUA_VERSION)
KYUA_DEPENDENCIES = host-pkgconf atf lutok sqlite
KYUA_CONF_OPTS = --without-doxygen --without-atf
-KYUA_LICENSE = BSD-3c
+KYUA_LICENSE = BSD-3-Clause
KYUA_LICENSE_FILES = COPYING
KYUA_CONF_ENV = \
kyua_cv_attribute_noreturn=yes \
diff --git a/package/lapack/lapack.mk b/package/lapack/lapack.mk
index 56008e1..b747c76 100644
--- a/package/lapack/lapack.mk
+++ b/package/lapack/lapack.mk
@@ -6,7 +6,7 @@
LAPACK_VERSION = 3.6.1
LAPACK_SOURCE = lapack-$(LAPACK_VERSION).tgz
-LAPACK_LICENSE = BSD-3c
+LAPACK_LICENSE = BSD-3-Clause
LAPACK_LICENSE_FILES = LICENSE
LAPACK_SITE = http://www.netlib.org/lapack
LAPACK_INSTALL_STAGING = YES
diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk
index ca2ed70..478f358 100644
--- a/package/leveldb/leveldb.mk
+++ b/package/leveldb/leveldb.mk
@@ -6,7 +6,7 @@
LEVELDB_VERSION = v1.19
LEVELDB_SITE = $(call github,google,leveldb,$(LEVELDB_VERSION))
-LEVELDB_LICENSE = BSD-3c
+LEVELDB_LICENSE = BSD-3-Clause
LEVELDB_LICENSE_FILES = LICENSE
LEVELDB_INSTALL_STAGING = YES
LEVELDB_DEPENDENCIES = snappy
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index bcf92f9..0ad9489 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -7,7 +7,7 @@
LIBARCHIVE_VERSION = 3.2.1
LIBARCHIVE_SITE = http://www.libarchive.org/downloads
LIBARCHIVE_INSTALL_STAGING = YES
-LIBARCHIVE_LICENSE = BSD-2c, BSD-3c
+LIBARCHIVE_LICENSE = BSD-2c, BSD-3-Clause
LIBARCHIVE_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y)
diff --git a/package/libbsd/libbsd.mk b/package/libbsd/libbsd.mk
index a932f2b..eba25d7 100644
--- a/package/libbsd/libbsd.mk
+++ b/package/libbsd/libbsd.mk
@@ -7,7 +7,7 @@
LIBBSD_VERSION = 0.8.3
LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz
LIBBSD_SITE = http://libbsd.freedesktop.org/releases
-LIBBSD_LICENSE = BSD-3c, MIT
+LIBBSD_LICENSE = BSD-3-Clause, MIT
LIBBSD_LICENSE_FILES = COPYING
LIBBSD_INSTALL_STAGING = YES
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 508f67a..35a6a97 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -7,7 +7,7 @@
LIBCAP_VERSION = 2.25
LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz
-LIBCAP_LICENSE = GPL-2.0 or BSD-3c
+LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause
LIBCAP_LICENSE_FILES = License
LIBCAP_DEPENDENCIES = host-libcap host-gperf
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
index f4e7a74..00d9c4f 100644
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -6,7 +6,7 @@
LIBDNET_VERSION = 1.11
LIBDNET_SITE = http://downloads.sourceforge.net/project/libdnet/libdnet/libdnet-$(LIBDNET_VERSION)
-LIBDNET_LICENSE = BSD-3c
+LIBDNET_LICENSE = BSD-3-Clause
LIBDNET_LICENSE_FILES = LICENSE
LIBDNET_INSTALL_STAGING = YES
LIBDNET_AUTORECONF = YES
diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk
index e7ddd1f..51ca87d 100644
--- a/package/libedit/libedit.mk
+++ b/package/libedit/libedit.mk
@@ -8,7 +8,7 @@ LIBEDIT_VERSION = 20150325-3.1
LIBEDIT_SITE = http://www.thrysoee.dk/editline
LIBEDIT_INSTALL_STAGING = YES
LIBEDIT_DEPENDENCIES = ncurses
-LIBEDIT_LICENSE = BSD-3c
+LIBEDIT_LICENSE = BSD-3-Clause
LIBEDIT_LICENSE_FILES = COPYING
# We're patching configure.ac
diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk
index 5458ce3..36bca0b 100644
--- a/package/libevent/libevent.mk
+++ b/package/libevent/libevent.mk
@@ -7,7 +7,7 @@
LIBEVENT_VERSION = 2.1.8-stable
LIBEVENT_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION)
LIBEVENT_INSTALL_STAGING = YES
-LIBEVENT_LICENSE = BSD-3c, OpenBSD
+LIBEVENT_LICENSE = BSD-3-Clause, OpenBSD
LIBEVENT_LICENSE_FILES = LICENSE
# For 0001-Disable-building-test-programs.patch
LIBEVENT_AUTORECONF = YES
diff --git a/package/libglew/libglew.mk b/package/libglew/libglew.mk
index 7af3aff..277a171 100644
--- a/package/libglew/libglew.mk
+++ b/package/libglew/libglew.mk
@@ -7,7 +7,7 @@
LIBGLEW_VERSION = 2.0.0
LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz
LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION)
-LIBGLEW_LICENSE = BSD-3c, MIT
+LIBGLEW_LICENSE = BSD-3-Clause, MIT
LIBGLEW_LICENSE_FILES = LICENSE.txt
LIBGLEW_INSTALL_STAGING = YES
LIBGLEW_DEPENDENCIES = libgl xlib_libX11 xlib_libXext xlib_libXi xlib_libXmu
diff --git a/package/libglob/libglob.mk b/package/libglob/libglob.mk
index cd6922e..90356b3 100644
--- a/package/libglob/libglob.mk
+++ b/package/libglob/libglob.mk
@@ -6,7 +6,7 @@
LIBGLOB_VERSION = 1.0
LIBGLOB_SITE = $(call github,voidlinux,libglob,$(LIBGLOB_VERSION))
-LIBGLOB_LICENSE = BSD-3c
+LIBGLOB_LICENSE = BSD-3-Clause
LIBGLOB_LICENSE_FILES = LICENSE
LIBGLOB_INSTALL_STAGING = YES
diff --git a/package/libjpeg/libjpeg.mk b/package/libjpeg/libjpeg.mk
index b8f4bac..e5bd454 100644
--- a/package/libjpeg/libjpeg.mk
+++ b/package/libjpeg/libjpeg.mk
@@ -7,7 +7,7 @@
LIBJPEG_VERSION = 9b
LIBJPEG_SITE = http://www.ijg.org/files
LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz
-LIBJPEG_LICENSE = jpeg-license (BSD-3c-like)
+LIBJPEG_LICENSE = jpeg-license (BSD-3-Clause-like)
LIBJPEG_LICENSE_FILES = README
LIBJPEG_INSTALL_STAGING = YES
LIBJPEG_PROVIDES = jpeg
diff --git a/package/libkcapi/libkcapi.mk b/package/libkcapi/libkcapi.mk
index 7e518e7..3c30891 100644
--- a/package/libkcapi/libkcapi.mk
+++ b/package/libkcapi/libkcapi.mk
@@ -8,7 +8,7 @@ LIBKCAPI_VERSION = 79cb80714ebcbae2b9de9bb5aca9a6a546f2f121
LIBKCAPI_SITE = $(call github,smuellerDD,libkcapi,$(LIBKCAPI_VERSION))
LIBKCAPI_AUTORECONF = YES
LIBKCAPI_INSTALL_STAGING = YES
-LIBKCAPI_LICENSE = BSD-3c (library), BSD-3c or GPL-2.0 (programs)
+LIBKCAPI_LICENSE = BSD-3-Clause (library), BSD-3-Clause or GPL-2.0 (programs)
LIBKCAPI_LICENSE_FILES = COPYING COPYING.gplv2 COPYING.bsd
ifeq ($(BR2_PACKAGE_LIBKCAPI_APPS),y)
diff --git a/package/libldns/libldns.mk b/package/libldns/libldns.mk
index 3d4d356..20323c0 100644
--- a/package/libldns/libldns.mk
+++ b/package/libldns/libldns.mk
@@ -7,7 +7,7 @@
LIBLDNS_VERSION = 1.6.17
LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz
LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns
-LIBLDNS_LICENSE = BSD-3c
+LIBLDNS_LICENSE = BSD-3-Clause
LIBLDNS_LICENSE_FILES = LICENSE
LIBLDNS_INSTALL_STAGING = YES
LIBLDNS_CONF_OPTS = \
diff --git a/package/liblinear/liblinear.mk b/package/liblinear/liblinear.mk
index a9524e3..84527ab 100644
--- a/package/liblinear/liblinear.mk
+++ b/package/liblinear/liblinear.mk
@@ -6,7 +6,7 @@
LIBLINEAR_VERSION = 2.1
LIBLINEAR_SITE = http://www.csie.ntu.edu.tw/~cjlin/liblinear
-LIBLINEAR_LICENSE = BSD-3c
+LIBLINEAR_LICENSE = BSD-3-Clause
LIBLINEAR_LICENSE_FILES = COPYRIGHT
LIBLINEAR_INSTALL_STAGING = YES
LIBLINEAR_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/libmbus/libmbus.mk b/package/libmbus/libmbus.mk
index 75aaa8d..61f797b 100644
--- a/package/libmbus/libmbus.mk
+++ b/package/libmbus/libmbus.mk
@@ -7,7 +7,7 @@
LIBMBUS_VERSION = 0.8.0
LIBMBUS_SITE = http://www.rscada.se/public-dist
LIBMBUS_INSTALL_STAGING = YES
-LIBMBUS_LICENSE = BSD-3c
+LIBMBUS_LICENSE = BSD-3-Clause
LIBMBUS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libmemcached/libmemcached.mk b/package/libmemcached/libmemcached.mk
index 36d0913..2495526 100644
--- a/package/libmemcached/libmemcached.mk
+++ b/package/libmemcached/libmemcached.mk
@@ -15,7 +15,7 @@ LIBMEMCACHED_INSTALL_STAGING = YES
LIBMEMCACHED_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBEVENT),libevent)
# For 0001-disable-tests.patch and 0002-disable-sanitizer.patch
LIBMEMCACHED_AUTORECONF = YES
-LIBMEMCACHED_LICENSE = BSD-3c
+LIBMEMCACHED_LICENSE = BSD-3-Clause
LIBMEMCACHED_LICENSE_FILES = COPYING
ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
diff --git a/package/libminiupnpc/libminiupnpc.mk b/package/libminiupnpc/libminiupnpc.mk
index 0eb7cf6..66b08b4 100644
--- a/package/libminiupnpc/libminiupnpc.mk
+++ b/package/libminiupnpc/libminiupnpc.mk
@@ -8,7 +8,7 @@ LIBMINIUPNPC_VERSION = 2.0
LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz
LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files
LIBMINIUPNPC_INSTALL_STAGING = YES
-LIBMINIUPNPC_LICENSE = BSD-3c
+LIBMINIUPNPC_LICENSE = BSD-3-Clause
LIBMINIUPNPC_LICENSE_FILES = LICENSE
$(eval $(cmake-package))
diff --git a/package/libmpdclient/libmpdclient.mk b/package/libmpdclient/libmpdclient.mk
index db3ae05..691aba9 100644
--- a/package/libmpdclient/libmpdclient.mk
+++ b/package/libmpdclient/libmpdclient.mk
@@ -10,7 +10,7 @@ LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz
LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR)
LIBMPDCLIENT_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
LIBMPDCLIENT_INSTALL_STAGING = YES
-LIBMPDCLIENT_LICENSE = BSD-3c
+LIBMPDCLIENT_LICENSE = BSD-3-Clause
LIBMPDCLIENT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libnatpmp/libnatpmp.mk b/package/libnatpmp/libnatpmp.mk
index cdd65e9..3623027 100644
--- a/package/libnatpmp/libnatpmp.mk
+++ b/package/libnatpmp/libnatpmp.mk
@@ -7,7 +7,7 @@
LIBNATPMP_VERSION = 20150609
LIBNATPMP_SITE = http://miniupnp.free.fr/files
LIBNATPMP_INSTALL_STAGING = YES
-LIBNATPMP_LICENSE = BSD-3c
+LIBNATPMP_LICENSE = BSD-3-Clause
LIBNATPMP_LICENSE_FILES = LICENSE
define LIBNATPMP_BUILD_CMDS
diff --git a/package/libnet/libnet.mk b/package/libnet/libnet.mk
index d13c453..d5d7b9f 100644
--- a/package/libnet/libnet.mk
+++ b/package/libnet/libnet.mk
@@ -9,7 +9,7 @@ LIBNET_SITE = http://sourceforge.net/projects/libnet-dev/files
LIBNET_INSTALL_STAGING = YES
# PF_PACKET is always available on Linux
LIBNET_CONF_OPTS = libnet_cv_have_packet_socket=yes
-LIBNET_LICENSE = BSD-2c, BSD-3c
+LIBNET_LICENSE = BSD-2c, BSD-3-Clause
LIBNET_LICENSE_FILES = doc/COPYING
$(eval $(autotools-package))
diff --git a/package/libogg/libogg.mk b/package/libogg/libogg.mk
index 8fff529..28b55a8 100644
--- a/package/libogg/libogg.mk
+++ b/package/libogg/libogg.mk
@@ -7,7 +7,7 @@
LIBOGG_VERSION = 1.3.2
LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.xz
LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
-LIBOGG_LICENSE = BSD-3c
+LIBOGG_LICENSE = BSD-3-Clause
LIBOGG_LICENSE_FILES = COPYING
LIBOGG_INSTALL_STAGING = YES
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 505e2ab..c4c5f31 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -6,7 +6,7 @@
LIBPCAP_VERSION = 1.8.1
LIBPCAP_SITE = http://www.tcpdump.org/release
-LIBPCAP_LICENSE = BSD-3c
+LIBPCAP_LICENSE = BSD-3-Clause
LIBPCAP_LICENSE_FILES = LICENSE
LIBPCAP_INSTALL_STAGING = YES
LIBPCAP_DEPENDENCIES = zlib host-flex host-bison
diff --git a/package/libpqxx/libpqxx.mk b/package/libpqxx/libpqxx.mk
index 0587190..ec6a3bc 100644
--- a/package/libpqxx/libpqxx.mk
+++ b/package/libpqxx/libpqxx.mk
@@ -8,7 +8,7 @@ LIBPQXX_VERSION = 4.0.1
LIBPQXX_SITE = http://pqxx.org/download/software/libpqxx
LIBPQXX_INSTALL_STAGING = YES
LIBPQXX_DEPENDENCIES = postgresql
-LIBPQXX_LICENSE = BSD-3c
+LIBPQXX_LICENSE = BSD-3-Clause
LIBPQXX_LICENSE_FILES = COPYING
LIBPQXX_CONF_ENV += ac_cv_path_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config
diff --git a/package/libsha1/libsha1.mk b/package/libsha1/libsha1.mk
index 647f986..4d80f3a 100644
--- a/package/libsha1/libsha1.mk
+++ b/package/libsha1/libsha1.mk
@@ -6,7 +6,7 @@
LIBSHA1_VERSION = 0.3
LIBSHA1_SITE = $(call github,dottedmag,libsha1,$(LIBSHA1_VERSION))
-LIBSHA1_LICENSE = BSD-3c or GPL
+LIBSHA1_LICENSE = BSD-3-Clause or GPL
LIBSHA1_LICENSE_FILES = COPYING
LIBSHA1_INSTALL_STAGING = YES
diff --git a/package/libshairplay/libshairplay.mk b/package/libshairplay/libshairplay.mk
index 8360d79..4b2883c 100644
--- a/package/libshairplay/libshairplay.mk
+++ b/package/libshairplay/libshairplay.mk
@@ -8,7 +8,7 @@ LIBSHAIRPLAY_VERSION = ce80e005908f41d0e6fde1c4a21e9cb8ee54007b
LIBSHAIRPLAY_SITE = $(call github,juhovh,shairplay,$(LIBSHAIRPLAY_VERSION))
LIBSHAIRPLAY_INSTALL_STAGING = YES
LIBSHAIRPLAY_AUTORECONF = YES
-LIBSHAIRPLAY_LICENSE = MIT, BSD-3c, LGPL-2.1+
+LIBSHAIRPLAY_LICENSE = MIT, BSD-3-Clause, LGPL-2.1+
LIBSHAIRPLAY_LICENSE_FILES = LICENSE
LIBSHAIRPLAY_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_LIBAO),libao)
diff --git a/package/libsilk/libsilk.mk b/package/libsilk/libsilk.mk
index eefdf8f..eba7085 100644
--- a/package/libsilk/libsilk.mk
+++ b/package/libsilk/libsilk.mk
@@ -8,7 +8,7 @@ LIBSILK_VERSION = 4268a02240c35c6055b0f237c46b09b2dcf79e45
# we use the FreeSwitch fork because it contains pkgconf support
LIBSILK_SITE = https://freeswitch.org/stash/scm/sd/libsilk.git
LIBSILK_SITE_METHOD = git
-LIBSILK_LICENSE = BSD-3c
+LIBSILK_LICENSE = BSD-3-Clause
LIBSILK_LICENSE_FILES = COPYING
LIBSILK_AUTORECONF = YES
LIBSILK_INSTALL_STAGING = YES
diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk
index 40b85e6..9e72856 100644
--- a/package/libsrtp/libsrtp.mk
+++ b/package/libsrtp/libsrtp.mk
@@ -7,7 +7,7 @@
LIBSRTP_VERSION = v1.5.4
LIBSRTP_SITE = $(call github,cisco,libsrtp,$(LIBSRTP_VERSION))
LIBSRTP_INSTALL_STAGING = YES
-LIBSRTP_LICENSE = BSD-3c
+LIBSRTP_LICENSE = BSD-3-Clause
LIBSRTP_LICENSE_FILES = LICENSE
ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
index 11f9852..f408e6c 100644
--- a/package/libtheora/libtheora.mk
+++ b/package/libtheora/libtheora.mk
@@ -10,7 +10,7 @@ LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora
LIBTHEORA_INSTALL_STAGING = YES
# We're patching Makefile.am
LIBTHEORA_AUTORECONF = YES
-LIBTHEORA_LICENSE = BSD-3c
+LIBTHEORA_LICENSE = BSD-3-Clause
LIBTHEORA_LICENSE_FILES = COPYING LICENSE
LIBTHEORA_CONF_OPTS = \
diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk
index 70a31ac..7747a1a 100644
--- a/package/libtirpc/libtirpc.mk
+++ b/package/libtirpc/libtirpc.mk
@@ -7,7 +7,7 @@
LIBTIRPC_VERSION = 1.0.1
LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2
LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION)
-LIBTIRPC_LICENSE = BSD-3c
+LIBTIRPC_LICENSE = BSD-3-Clause
LIBTIRPC_LICENSE_FILES = COPYING
LIBTIRPC_INSTALL_STAGING = YES
diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk
index 0675a17..5e2efad 100644
--- a/package/libubox/libubox.mk
+++ b/package/libubox/libubox.mk
@@ -6,7 +6,7 @@
LIBUBOX_VERSION = 723730214732862de7e892bae2f7a7889e66bf1b
LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git
-LIBUBOX_LICENSE = ISC, BSD-3c
+LIBUBOX_LICENSE = ISC, BSD-3-Clause
LIBUBOX_INSTALL_STAGING = YES
LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c)
diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk
index 8236cee..0701fb2 100644
--- a/package/libupnp/libupnp.mk
+++ b/package/libupnp/libupnp.mk
@@ -9,7 +9,7 @@ LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION)
LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no
LIBUPNP_INSTALL_STAGING = YES
-LIBUPNP_LICENSE = BSD-3c
+LIBUPNP_LICENSE = BSD-3-Clause
LIBUPNP_LICENSE_FILES = LICENSE
$(eval $(autotools-package))
diff --git a/package/liburiparser/liburiparser.mk b/package/liburiparser/liburiparser.mk
index 661fa96..7466a77 100644
--- a/package/liburiparser/liburiparser.mk
+++ b/package/liburiparser/liburiparser.mk
@@ -7,7 +7,7 @@
LIBURIPARSER_VERSION = 0.8.1
LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2
LIBURIPARSER_SITE = http://sourceforge.net/projects/uriparser/files/Sources/$(LIBURIPARSER_VERSION)
-LIBURIPARSER_LICENSE = BSD-3c
+LIBURIPARSER_LICENSE = BSD-3-Clause
LIBURIPARSER_LICENSE_FILES = COPYING
LIBURIPARSER_INSTALL_STAGING = YES
LIBURIPARSER_CONF_OPTS = --disable-test
diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk
index 6f6a1cc..eed81fe 100644
--- a/package/libuv/libuv.mk
+++ b/package/libuv/libuv.mk
@@ -9,7 +9,7 @@ LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION))
LIBUV_DEPENDENCIES = host-pkgconf
LIBUV_INSTALL_STAGING = YES
LIBUV_AUTORECONF = YES
-LIBUV_LICENSE = BSD-2c, BSD-3c, ISC, MIT
+LIBUV_LICENSE = BSD-2c, BSD-3-Clause, ISC, MIT
LIBUV_LICENSE_FILES = LICENSE
# Upstream needs tests to be run sequentially. This is the default in
diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
index f1b710c..98ec97b 100644
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -10,7 +10,7 @@ LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis
LIBVORBIS_INSTALL_STAGING = YES
LIBVORBIS_CONF_OPTS = --disable-oggtest
LIBVORBIS_DEPENDENCIES = host-pkgconf libogg
-LIBVORBIS_LICENSE = BSD-3c
+LIBVORBIS_LICENSE = BSD-3-Clause
LIBVORBIS_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/libvpx/libvpx.mk b/package/libvpx/libvpx.mk
index 4ad5522..c4f102b 100644
--- a/package/libvpx/libvpx.mk
+++ b/package/libvpx/libvpx.mk
@@ -7,7 +7,7 @@
LIBVPX_VERSION = 1.6.0
LIBVPX_SOURCE = libvpx-$(LIBVPX_VERSION).tar.bz2
LIBVPX_SITE = http://storage.googleapis.com/downloads.webmproject.org/releases/webm
-LIBVPX_LICENSE = BSD-3c
+LIBVPX_LICENSE = BSD-3-Clause
LIBVPX_LICENSE_FILES = LICENSE PATENTS
LIBVPX_INSTALL_STAGING = YES
diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
index 738ae9a..135c5f6 100644
--- a/package/libxmlrpc/libxmlrpc.mk
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -7,7 +7,7 @@
LIBXMLRPC_VERSION = 1.39.12
LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(LIBXMLRPC_VERSION)
-LIBXMLRPC_LICENSE = BSD-3c (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c)
+LIBXMLRPC_LICENSE = BSD-3-Clause (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c)
LIBXMLRPC_LICENSE_FILES = doc/COPYING
LIBXMLRPC_INSTALL_STAGING = YES
LIBXMLRPC_DEPENDENCIES = libcurl host-autoconf
diff --git a/package/libyuv/libyuv.mk b/package/libyuv/libyuv.mk
index c00bc05..1abe126 100644
--- a/package/libyuv/libyuv.mk
+++ b/package/libyuv/libyuv.mk
@@ -10,7 +10,7 @@ LIBYUV_VERSION = 1ebf86795cb213a37f06eb1ef3713cff080568ea
# deactivated in 2015.
LIBYUV_SITE = https://freeswitch.org/stash/scm/sd/libyuv.git
LIBYUV_SITE_METHOD = git
-LIBYUV_LICENSE = BSD-3c
+LIBYUV_LICENSE = BSD-3-Clause
LIBYUV_LICENSE_FILES = LICENSE
LIBYUV_INSTALL_STAGING = YES
LIBYUV_DEPENDENCIES = $(if $(BR2_PACKAGE_JPEG),jpeg)
diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk
index a419db7..b873746 100644
--- a/package/libzip/libzip.mk
+++ b/package/libzip/libzip.mk
@@ -7,7 +7,7 @@
LIBZIP_VERSION = 0.11.2
LIBZIP_SITE = http://www.nih.at/libzip
LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz
-LIBZIP_LICENSE = BSD-3c
+LIBZIP_LICENSE = BSD-3-Clause
LIBZIP_LICENSE_FILES = LICENSE
LIBZIP_INSTALL_STAGING = YES
LIBZIP_DEPENDENCIES = zlib
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index b3127ef..97ddfc6 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -8,7 +8,7 @@ LIGHTTPD_VERSION_MAJOR = 1.4
LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).45
LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz
LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x
-LIGHTTPD_LICENSE = BSD-3c
+LIGHTTPD_LICENSE = BSD-3-Clause
LIGHTTPD_LICENSE_FILES = COPYING
LIGHTTPD_DEPENDENCIES = host-pkgconf
LIGHTTPD_CONF_OPTS = \
diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
index c8ba30f..3522415 100644
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -18,7 +18,7 @@ LINUX_PAM_CONF_OPTS = \
--libdir=/lib
LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf
LINUX_PAM_AUTORECONF = YES
-LINUX_PAM_LICENSE = BSD-3c
+LINUX_PAM_LICENSE = BSD-3-Clause
LINUX_PAM_LICENSE_FILES = Copyright
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
diff --git a/package/linux-syscall-support/linux-syscall-support.mk b/package/linux-syscall-support/linux-syscall-support.mk
index 6833a62..c02610d 100644
--- a/package/linux-syscall-support/linux-syscall-support.mk
+++ b/package/linux-syscall-support/linux-syscall-support.mk
@@ -8,7 +8,7 @@
LINUX_SYSCALL_SUPPORT_VERSION = 3f6478ac95edf86cd3da300c2c0d34a438f5dbeb
LINUX_SYSCALL_SUPPORT_SITE = https://chromium.googlesource.com/linux-syscall-support
LINUX_SYSCALL_SUPPORT_SITE_METHOD = git
-LINUX_SYSCALL_SUPPORT_LICENSE = BSD-3c
+LINUX_SYSCALL_SUPPORT_LICENSE = BSD-3-Clause
LINUX_SYSCALL_SUPPORT_LICENSE_FILES = linux_syscall_support.h
# Provide only one header file.
diff --git a/package/lua-csnappy/lua-csnappy.mk b/package/lua-csnappy/lua-csnappy.mk
index 1867b60..3325f1f 100644
--- a/package/lua-csnappy/lua-csnappy.mk
+++ b/package/lua-csnappy/lua-csnappy.mk
@@ -5,7 +5,7 @@
################################################################################
LUA_CSNAPPY_VERSION = 0.1.4-1
-LUA_CSNAPPY_LICENSE = BSD-3c
+LUA_CSNAPPY_LICENSE = BSD-3-Clause
LUA_CSNAPPY_LICENSE_FILES = $(LUA_CSNAPPY_SUBDIR)/COPYRIGHT
$(eval $(luarocks-package))
diff --git a/package/lutok/lutok.mk b/package/lutok/lutok.mk
index 6ee198b..41abddb 100644
--- a/package/lutok/lutok.mk
+++ b/package/lutok/lutok.mk
@@ -10,7 +10,7 @@ LUTOK_INSTALL_STAGING = YES
LUTOK_DEPENDENCIES = host-pkgconf lua
# --without-atf disables the atf-based lutok tests
LUTOK_CONF_OPTS = --without-doxygen --without-atf
-LUTOK_LICENSE = BSD-3c
+LUTOK_LICENSE = BSD-3-Clause
LUTOK_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk
index 4de1bf6..90ede7d 100644
--- a/package/memcached/memcached.mk
+++ b/package/memcached/memcached.mk
@@ -9,7 +9,7 @@ MEMCACHED_SITE = http://www.memcached.org/files
MEMCACHED_DEPENDENCIES = libevent
MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
MEMCACHED_CONF_OPTS = --disable-coverage
-MEMCACHED_LICENSE = BSD-3c
+MEMCACHED_LICENSE = BSD-3-Clause
MEMCACHED_LICENSE_FILES = COPYING
ifeq ($(BR2_ENDIAN),"BIG")
diff --git a/package/mfgtools/mfgtools.mk b/package/mfgtools/mfgtools.mk
index cc24352..a1a1fb3 100644
--- a/package/mfgtools/mfgtools.mk
+++ b/package/mfgtools/mfgtools.mk
@@ -7,7 +7,7 @@
MFGTOOLS_VERSION = b219fc219a35c365010897ed093c40750f8cdac6
MFGTOOLS_SITE = $(call github,NXPmicro,mfgtools,$(MFGTOOLS_VERSION))
MFGTOOLS_SUBDIR = MfgToolLib
-MFGTOOLS_LICENSE = BSD-3c or CPOL
+MFGTOOLS_LICENSE = BSD-3-Clause or CPOL
MFGTOOLS_LICENSE_FILES = LICENSE CPOL.htm
HOST_MFGTOOLS_DEPENDENCIES = host-libusb
diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk
index cf2f273..40f918c 100644
--- a/package/minidlna/minidlna.mk
+++ b/package/minidlna/minidlna.mk
@@ -6,7 +6,7 @@
MINIDLNA_VERSION = 1.1.5
MINIDLNA_SITE = http://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION)
-MINIDLNA_LICENSE = GPL-2.0, BSD-3c
+MINIDLNA_LICENSE = GPL-2.0, BSD-3-Clause
MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd
MINIDLNA_DEPENDENCIES = \
diff --git a/package/minissdpd/minissdpd.mk b/package/minissdpd/minissdpd.mk
index 5c8bd37..f3f383b 100644
--- a/package/minissdpd/minissdpd.mk
+++ b/package/minissdpd/minissdpd.mk
@@ -6,7 +6,7 @@
MINISSDPD_VERSION = 1.5
MINISSDPD_SITE = http://miniupnp.free.fr/files
-MINISSDPD_LICENSE = BSD-3c
+MINISSDPD_LICENSE = BSD-3-Clause
MINISSDPD_LICENSE_FILES = LICENSE
MINISSDPD_DEPENDENCIES = libnfnetlink
diff --git a/package/mongrel2/mongrel2.mk b/package/mongrel2/mongrel2.mk
index c69c143..a35a872 100644
--- a/package/mongrel2/mongrel2.mk
+++ b/package/mongrel2/mongrel2.mk
@@ -9,7 +9,7 @@ MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2
# Do not use the github helper here, the generated tarball is *NOT* the same
# as the one uploaded by upstream for the release.
MONGREL2_SITE = https://github.com/mongrel2/mongrel2/releases/download/$(MONGREL2_VERSION)
-MONGREL2_LICENSE = BSD-3c
+MONGREL2_LICENSE = BSD-3-Clause
MONGREL2_LICENSE_FILES = LICENSE
MONGREL2_DEPENDENCIES = sqlite zeromq
diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk
index 2969e36..731e79e 100644
--- a/package/mrouted/mrouted.mk
+++ b/package/mrouted/mrouted.mk
@@ -7,7 +7,7 @@
MROUTED_VERSION = 3.9.7
MROUTED_SITE = $(call github,troglobit,mrouted,$(MROUTED_VERSION))
MROUTED_DEPENDENCIES = host-bison
-MROUTED_LICENSE = BSD-3c
+MROUTED_LICENSE = BSD-3-Clause
MROUTED_LICENSE_FILES = LICENSE
define MROUTED_CONFIGURE_CMDS
diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk
index 14f4921..fc66c68 100644
--- a/package/musepack/musepack.mk
+++ b/package/musepack/musepack.mk
@@ -10,7 +10,7 @@ MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz
MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
MUSEPACK_INSTALL_STAGING = YES
MUSEPACK_MAKE = $(MAKE1)
-MUSEPACK_LICENSE = BSD-3c (*mpcdec), LGPL-2.1+ (*mpcenc)
+MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc)
MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c
$(eval $(cmake-package))
--git a/package/musl-compat-headers/musl-compat-headers.mk b/package/musl-compat-headers/musl-compat-headers.mk
index 25e032c..91f5074 100644
--- a/package/musl-compat-headers/musl-compat-headers.mk
+++ b/package/musl-compat-headers/musl-compat-headers.mk
@@ -9,7 +9,7 @@ MUSL_COMPAT_HEADERS_QUEUE_H = http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/qu
MUSL_COMPAT_HEADERS_EXTRA_DOWNLOADS = $(MUSL_COMPAT_HEADERS_QUEUE_H)
-MUSL_COMPAT_HEADERS_LICENSE = BSD-3c, Public Domain or CC0
+MUSL_COMPAT_HEADERS_LICENSE = BSD-3-Clause, Public Domain or CC0
MUSL_COMPAT_HEADERS_LICENSE_FILES = queue.h cdefs.h
MUSL_COMPAT_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO
diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk
index aeaa041..63a79e7 100644
--- a/package/ne10/ne10.mk
+++ b/package/ne10/ne10.mk
@@ -6,7 +6,7 @@
NE10_VERSION = v1.2.0
NE10_SITE = $(call github,projectNe10,Ne10,$(NE10_VERSION))
-NE10_LICENSE = BSD-3c or Apache-2.0
+NE10_LICENSE = BSD-3-Clause or Apache-2.0
NE10_LICENSE_FILES = doc/LICENSE
NE10_INSTALL_STAGING = YES
diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk
index 5abfc7e..e1a6fee 100644
--- a/package/netcat-openbsd/netcat-openbsd.mk
+++ b/package/netcat-openbsd/netcat-openbsd.mk
@@ -6,7 +6,7 @@
NETCAT_OPENBSD_VERSION = debian/1.105-7
NETCAT_OPENBSD_SITE = git://anonscm.debian.org/collab-maint/netcat-openbsd
-NETCAT_OPENBSD_LICENSE = BSD-3c
+NETCAT_OPENBSD_LICENSE = BSD-3-Clause
NETCAT_OPENBSD_LICENSE_FILES = debian/copyright
NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd
diff --git a/package/netsurf-buildsystem/netsurf-buildsystem.mk b/package/netsurf-buildsystem/netsurf-buildsystem.mk
index 3478850..f316eb1 100644
--- a/package/netsurf-buildsystem/netsurf-buildsystem.mk
+++ b/package/netsurf-buildsystem/netsurf-buildsystem.mk
@@ -7,7 +7,7 @@
NETSURF_BUILDSYSTEM_VERSION = 7574b41345968b5f7e9ca5875faccb1478ce0555
NETSURF_BUILDSYSTEM_SITE = http://git.netsurf-browser.org/buildsystem.git
NETSURF_BUILDSYSTEM_SITE_METHOD = git
-NETSURF_BUILDSYSTEM_LICENSE = MIT, BSD-3c (for llvm/* files)
+NETSURF_BUILDSYSTEM_LICENSE = MIT, BSD-3-Clause (for llvm/* files)
NETSURF_BUILDSYSTEM_LICENSE_FILES = llvm/LICENSE.TXT
NETSURF_BUILDSYSTEM_INSTALL_DIR = $(HOST_DIR)/usr/share/netsurf-buildsystem
diff --git a/package/nginx-upload/nginx-upload.mk b/package/nginx-upload/nginx-upload.mk
index 6f94d35..ef67995 100644
--- a/package/nginx-upload/nginx-upload.mk
+++ b/package/nginx-upload/nginx-upload.mk
@@ -6,7 +6,7 @@
NGINX_UPLOAD_VERSION = aba1e3f34c754551f4f49e572bc86863d535609d
NGINX_UPLOAD_SITE = $(call github,vkholodkov,nginx-upload-module,$(NGINX_UPLOAD_VERSION))
-NGINX_UPLOAD_LICENSE = BSD-3c
+NGINX_UPLOAD_LICENSE = BSD-3-Clause
NGINX_UPLOAD_LICENSE_FILES = LICENCE
NGINX_UPLOAD_DEPENDENCIES = openssl
diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk
index e7c3057..4ad5fc5 100644
--- a/package/olsr/olsr.mk
+++ b/package/olsr/olsr.mk
@@ -12,7 +12,7 @@ OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \
mdns nameservice p2pd pgraph secure txtinfo watchdog
# Doesn't really need quagga but not very useful without it
OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga)
-OLSR_LICENSE = BSD-3c, LGPL-2.1+
+OLSR_LICENSE = BSD-3-Clause, LGPL-2.1+
OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE
OLSR_DEPENDENCIES = host-flex host-bison
diff --git a/package/open-plc-utils/open-plc-utils.mk b/package/open-plc-utils/open-plc-utils.mk
index 67c8d7d..d45bb9d 100644
--- a/package/open-plc-utils/open-plc-utils.mk
+++ b/package/open-plc-utils/open-plc-utils.mk
@@ -6,7 +6,7 @@
OPEN_PLC_UTILS_VERSION = 1be781d1ea81827e5f6c1a35961c65dd4d15472c
OPEN_PLC_UTILS_SITE = $(call github,qca,open-plc-utils,$(OPEN_PLC_UTILS_VERSION))
-OPEN_PLC_UTILS_LICENSE = BSD-3c
+OPEN_PLC_UTILS_LICENSE = BSD-3-Clause
OPEN_PLC_UTILS_LICENSE_FILES = LICENSE
# We unfortunately can't use TARGET_CONFIGURE_OPTS, as it would
diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk
index a26e10a..93dbc1f 100644
--- a/package/openblas/openblas.mk
+++ b/package/openblas/openblas.mk
@@ -6,7 +6,7 @@
OPENBLAS_VERSION = f04af36ad0e85b64f12a7c38095383192cc52345
OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,$(OPENBLAS_VERSION))
-OPENBLAS_LICENSE = BSD-3c
+OPENBLAS_LICENSE = BSD-3-Clause
OPENBLAS_LICENSE_FILES = LICENSE
OPENBLAS_INSTALL_STAGING = YES
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index 947589b..4ae550e 100644
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -7,7 +7,7 @@
OPENCV_VERSION = 2.4.13
OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION))
OPENCV_INSTALL_STAGING = YES
-OPENCV_LICENSE = BSD-3c
+OPENCV_LICENSE = BSD-3-Clause
OPENCV_LICENSE_FILES = LICENSE
# OpenCV component options
diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
index 10660a9..10e0dfe 100644
--- a/package/opencv3/opencv3.mk
+++ b/package/opencv3/opencv3.mk
@@ -7,7 +7,7 @@
OPENCV3_VERSION = 3.1.0
OPENCV3_SITE = $(call github,itseez,opencv,$(OPENCV3_VERSION))
OPENCV3_INSTALL_STAGING = YES
-OPENCV3_LICENSE = BSD-3c
+OPENCV3_LICENSE = BSD-3-Clause
OPENCV3_LICENSE_FILES = LICENSE
# Uses __atomic_fetch_add_4
diff --git a/package/openipmi/openipmi.mk b/package/openipmi/openipmi.mk
index 33c63c2..3f4f111 100644
--- a/package/openipmi/openipmi.mk
+++ b/package/openipmi/openipmi.mk
@@ -9,7 +9,7 @@ OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20
OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz
OPENIPMI_PATCH = \
http://sourceforge.net/p/openipmi/patches/26/attachment/0001-ui-use-standard-uint32_t.patch
-OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3c
+OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause
OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD
OPENIPMI_DEPENDENCIES = popt ncurses host-pkgconf
# Patching Makefile.am
diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk
index c5b8a01..3ffde89 100644
--- a/package/openmpi/openmpi.mk
+++ b/package/openmpi/openmpi.mk
@@ -8,7 +8,7 @@ OPENMPI_VERSION_MAJOR = 1.10
OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).2
OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads
OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2
-OPENMPI_LICENSE = BSD-3c
+OPENMPI_LICENSE = BSD-3-Clause
OPENMPI_LICENSE_FILES = LICENSE
OPENMPI_INSTALL_STAGING = YES
OPENMPI_CONF_OPTS = --disable-vt
diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk
index 9c98064..648427a 100644
--- a/package/openntpd/openntpd.mk
+++ b/package/openntpd/openntpd.mk
@@ -6,7 +6,7 @@
OPENNTPD_VERSION = 6.0p1
OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD
-OPENNTPD_LICENSE = MIT-like, BSD-2c, BSD-3c
+OPENNTPD_LICENSE = MIT-like, BSD-2c, BSD-3-Clause
OPENNTPD_LICENSE_FILES = COPYING
# Ships a beta libtool version hence our patch doesn't apply.
OPENNTPD_AUTORECONF = YES
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index ba48770..362bbb1 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -6,7 +6,7 @@
OPENSSH_VERSION = 7.5p1
OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
-OPENSSH_LICENSE = BSD-3c, BSD-2c, Public Domain
+OPENSSH_LICENSE = BSD-3-Clause, BSD-2c, Public Domain
OPENSSH_LICENSE_FILES = LICENCE
OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
OPENSSH_CONF_OPTS = \
diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index c83c583..d9628ed 100644
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -6,7 +6,7 @@
OPENSWAN_VERSION = 2.6.46
OPENSWAN_SITE = http://download.openswan.org/openswan
-OPENSWAN_LICENSE = GPL-2.0+, BSD-3c
+OPENSWAN_LICENSE = GPL-2.0+, BSD-3-Clause
OPENSWAN_LICENSE_FILES = COPYING LICENSE
OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2
diff --git a/package/opus/opus.mk b/package/opus/opus.mk
index 020be88..b810b77 100644
--- a/package/opus/opus.mk
+++ b/package/opus/opus.mk
@@ -6,7 +6,7 @@
OPUS_VERSION = 1.1.4
OPUS_SITE = http://downloads.xiph.org/releases/opus
-OPUS_LICENSE = BSD-3c
+OPUS_LICENSE = BSD-3-Clause
OPUS_LICENSE_FILES = COPYING
OPUS_INSTALL_STAGING = YES
diff --git a/package/opusfile/opusfile.mk b/package/opusfile/opusfile.mk
index 4c3fb35..846eedd 100644
--- a/package/opusfile/opusfile.mk
+++ b/package/opusfile/opusfile.mk
@@ -7,7 +7,7 @@
OPUSFILE_VERSION = 0.8
OPUSFILE_SITE = http://downloads.xiph.org/releases/opus
OPUSFILE_DEPENDENCIES = host-pkgconf libogg opus
-OPUSFILE_LICENSE = BSD-3c
+OPUSFILE_LICENSE = BSD-3-Clause
OPUSFILE_LICENSE_FILES = COPYING
OPUSFILE_INSTALL_STAGING = YES
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 4456f53..5c8d4f7 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -7,7 +7,7 @@
ORC_VERSION = 0.4.26
ORC_SOURCE = orc-$(ORC_VERSION).tar.xz
ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc
-ORC_LICENSE = BSD-2c, BSD-3c
+ORC_LICENSE = BSD-2c, BSD-3-Clause
ORC_LICENSE_FILES = COPYING
ORC_INSTALL_STAGING = YES
ORC_DEPENDENCIES = host-orc
diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index e856cac..d4cf9bc 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -11,7 +11,7 @@ P11_KIT_INSTALL_STAGING = YES
P11_KIT_CONF_OPTS = --disable-static
P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
ac_cv_have_decl___progname=no
-P11_KIT_LICENSE = BSD-3c
+P11_KIT_LICENSE = BSD-3-Clause
P11_KIT_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/paho-mqtt-c/paho-mqtt-c.mk b/package/paho-mqtt-c/paho-mqtt-c.mk
index 7fb3026..22ef2ef 100644
--- a/package/paho-mqtt-c/paho-mqtt-c.mk
+++ b/package/paho-mqtt-c/paho-mqtt-c.mk
@@ -6,7 +6,7 @@
PAHO_MQTT_C_VERSION = v1.1.0
PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,$(PAHO_MQTT_C_VERSION))
-PAHO_MQTT_C_LICENSE = EPL-1.0 or BSD-3c
+PAHO_MQTT_C_LICENSE = EPL-1.0 or BSD-3-Clause
PAHO_MQTT_C_LICENSE_FILES = epl-v10 edl-v10
PAHO_MQTT_C_INSTALL_STAGING = YES
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index e302ed7..0c145a9 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -7,7 +7,7 @@
PCRE_VERSION = 8.40
PCRE_SITE = https://ftp.pcre.org/pub/pcre
PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2
-PCRE_LICENSE = BSD-3c
+PCRE_LICENSE = BSD-3-Clause
PCRE_LICENSE_FILES = LICENCE
PCRE_INSTALL_STAGING = YES
PCRE_CONFIG_SCRIPTS = pcre-config
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index 3349b6c..f868b85 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -9,7 +9,7 @@ PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/file/3963
PCSC_LITE_INSTALL_STAGING = YES
PCSC_LITE_DEPENDENCIES = host-pkgconf
-PCSC_LITE_LICENSE = BSD-3c
+PCSC_LITE_LICENSE = BSD-3-Clause
PCSC_LITE_LICENSE_FILES = COPYING
PCSC_LITE_AUTORECONF = YES
diff --git a/package/php-zmq/php-zmq.mk b/package/php-zmq/php-zmq.mk
index 2730996..ba14113 100644
--- a/package/php-zmq/php-zmq.mk
+++ b/package/php-zmq/php-zmq.mk
@@ -10,7 +10,7 @@ PHP_ZMQ_SITE = https://pecl.php.net/get
# phpize does the autoconf magic
PHP_ZMQ_DEPENDENCIES = php zeromq host-autoconf host-pkgconf
PHP_ZMQ_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config
-PHP_ZMQ_LICENSE = BSD-3c
+PHP_ZMQ_LICENSE = BSD-3-Clause
PHP_ZMQ_LICENSE_FILES = LICENSE
define PHP_ZMQ_PHPIZE
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index da957c0..f5fb663 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -7,7 +7,7 @@
PPPD_VERSION = 2.4.7
PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
PPPD_SITE = https://download.samba.org/pub/ppp
-PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4c, BSD-3c, GPL-2.0+
+PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4c, BSD-3-Clause, GPL-2.0+
PPPD_LICENSE_FILES = \
pppd/tdb.c pppd/plugins/pppoatm/COPYING \
pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
index dabbfb7..72930c1 100644
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -9,7 +9,7 @@
# version/site variables.
PROTOBUF_VERSION = v3.0.0
PROTOBUF_SITE = $(call github,google,protobuf,$(PROTOBUF_VERSION))
-PROTOBUF_LICENSE = BSD-3c
+PROTOBUF_LICENSE = BSD-3-Clause
PROTOBUF_LICENSE_FILES = LICENSE
# no configure script
PROTOBUF_AUTORECONF = YES
diff --git a/package/pru-software-support/pru-software-support.mk b/package/pru-software-support/pru-software-support.mk
index ee28de6..f30ff6b 100644
--- a/package/pru-software-support/pru-software-support.mk
+++ b/package/pru-software-support/pru-software-support.mk
@@ -6,7 +6,7 @@
PRU_SOFTWARE_SUPPORT_VERSION = v5.1.0
PRU_SOFTWARE_SUPPORT_SITE = https://git.ti.com/pru-software-support-package/pru-software-support-package/archive-tarball/$(PRU_SOFTWARE_SUPPORT_VERSION)?
-PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3c, GPL-2.0, Public Domain
+PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3-Clause, GPL-2.0, Public Domain
PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v5.0-Manifest.html
PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support
HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru
diff --git a/package/python-babel/python-babel.mk b/package/python-babel/python-babel.mk
index 3627b15..d9bd0f0 100644
--- a/package/python-babel/python-babel.mk
+++ b/package/python-babel/python-babel.mk
@@ -8,7 +8,7 @@ PYTHON_BABEL_VERSION = 2.3.4
PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz
PYTHON_BABEL_SITE = https://pypi.python.org/packages/6e/96/ba2a2462ed25ca0e651fb7b66e7080f5315f91425a07ea5b34d7c870c114
PYTHON_BABEL_SETUP_TYPE = setuptools
-PYTHON_BABEL_LICENSE = BSD-3c
+PYTHON_BABEL_LICENSE = BSD-3-Clause
PYTHON_BABEL_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-cherrypy/python-cherrypy.mk b/package/python-cherrypy/python-cherrypy.mk
index 754e0a2..54742b9 100644
--- a/package/python-cherrypy/python-cherrypy.mk
+++ b/package/python-cherrypy/python-cherrypy.mk
@@ -7,7 +7,7 @@
PYTHON_CHERRYPY_VERSION = 4.0.0
PYTHON_CHERRYPY_SOURCE = CherryPy-$(PYTHON_CHERRYPY_VERSION).tar.gz
PYTHON_CHERRYPY_SITE = http://pypi.python.org/packages/source/C/CherryPy
-PYTHON_CHERRYPY_LICENSE = BSD-3c
+PYTHON_CHERRYPY_LICENSE = BSD-3-Clause
PYTHON_CHERRYPY_LICENSE_FILES = cherrypy/LICENSE.txt
PYTHON_CHERRYPY_SETUP_TYPE = distutils
diff --git a/package/python-click/python-click.mk b/package/python-click/python-click.mk
index e869dd5..e6df636 100644
--- a/package/python-click/python-click.mk
+++ b/package/python-click/python-click.mk
@@ -7,7 +7,7 @@
PYTHON_CLICK_VERSION = 6.7
PYTHON_CLICK_SOURCE = click-$(PYTHON_CLICK_VERSION).tar.gz
PYTHON_CLICK_SITE = https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897
-PYTHON_CLICK_LICENSE = BSD-3c
+PYTHON_CLICK_LICENSE = BSD-3-Clause
PYTHON_CLICK_LICENSE_FILES = LICENSE
PYTHON_CLICK_SETUP_TYPE = setuptools
diff --git a/package/python-configobj/python-configobj.mk b/package/python-configobj/python-configobj.mk
index d9591d5..9e281d2 100644
--- a/package/python-configobj/python-configobj.mk
+++ b/package/python-configobj/python-configobj.mk
@@ -7,7 +7,7 @@
PYTHON_CONFIGOBJ_VERSION = 5.0.6
PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz
PYTHON_CONFIGOBJ_SITE = https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab
-PYTHON_CONFIGOBJ_LICENSE = BSD-3c
+PYTHON_CONFIGOBJ_LICENSE = BSD-3-Clause
# License only mentioned in the source
PYTHON_CONFIGOBJ_SETUP_TYPE = distutils
diff --git a/package/python-couchdb/python-couchdb.mk b/package/python-couchdb/python-couchdb.mk
index c88787c..afdbdf5 100644
--- a/package/python-couchdb/python-couchdb.mk
+++ b/package/python-couchdb/python-couchdb.mk
@@ -8,7 +8,7 @@ PYTHON_COUCHDB_VERSION = 1.1
PYTHON_COUCHDB_SOURCE = CouchDB-$(PYTHON_COUCHDB_VERSION).tar.gz
PYTHON_COUCHDB_SITE = https://pypi.python.org/packages/9a/e8/c3c8da6d00145aaca07f2b784794917613dad26532068da4e8392dc48d7f
PYTHON_COUCHDB_SETUP_TYPE = setuptools
-PYTHON_COUCHDB_LICENSE = BSD-3c
+PYTHON_COUCHDB_LICENSE = BSD-3-Clause
PYTHON_COUCHDB_LICENSE_FILES = COPYING
$(eval $(python-package))
diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index 9e2b86f..5373da8 100644
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -8,7 +8,7 @@ PYTHON_CRYPTOGRAPHY_VERSION = 1.7.2
PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz
PYTHON_CRYPTOGRAPHY_SITE = https://pypi.python.org/packages/99/df/71c7260003f5c469cec3db4c547115df39e9ce6c719a99e067ba0e78fd8a
PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools
-PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3c
+PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause
PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD
PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl
diff --git a/package/python-cssselect/python-cssselect.mk b/package/python-cssselect/python-cssselect.mk
index 5a4b63b..7136a52 100644
--- a/package/python-cssselect/python-cssselect.mk
+++ b/package/python-cssselect/python-cssselect.mk
@@ -8,7 +8,7 @@ PYTHON_CSSSELECT_VERSION = 1.0.1
PYTHON_CSSSELECT_SOURCE = cssselect-$(PYTHON_CSSSELECT_VERSION).tar.gz
PYTHON_CSSSELECT_SITE = https://pypi.python.org/packages/77/ff/9c865275cd19290feba56344eba570e719efb7ca5b34d67ed12b22ebbb0d
PYTHON_CSSSELECT_SETUP_TYPE = setuptools
-PYTHON_CSSSELECT_LICENSE = BSD-3c
+PYTHON_CSSSELECT_LICENSE = BSD-3-Clause
PYTHON_CSSSELECT_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-dateutil/python-dateutil.mk b/package/python-dateutil/python-dateutil.mk
index b1f5e68..41dee2d 100644
--- a/package/python-dateutil/python-dateutil.mk
+++ b/package/python-dateutil/python-dateutil.mk
@@ -7,7 +7,7 @@
PYTHON_DATEUTIL_VERSION = 2.6.0
PYTHON_DATEUTIL_SITE = https://pypi.python.org/packages/51/fc/39a3fbde6864942e8bb24c93663734b74e281b984d1b8c4f95d64b0c21f6
PYTHON_DATEUTIL_SETUP_TYPE = setuptools
-PYTHON_DATEUTIL_LICENSE = BSD-3c
+PYTHON_DATEUTIL_LICENSE = BSD-3-Clause
PYTHON_DATEUTIL_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk
index 2a50231..9065a68 100644
--- a/package/python-django/python-django.mk
+++ b/package/python-django/python-django.mk
@@ -8,7 +8,7 @@ PYTHON_DJANGO_VERSION = 1.10.2
PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz
# The official Django site has an unpractical URL
PYTHON_DJANGO_SITE = https://pypi.python.org/packages/57/9e/59444485f092b6ed4f1931e7d2e13b67fdab967c041d02f58a0d1dab8c23
-PYTHON_DJANGO_LICENSE = BSD-3c
+PYTHON_DJANGO_LICENSE = BSD-3-Clause
PYTHON_DJANGO_LICENSE_FILES = LICENSE
PYTHON_DJANGO_SETUP_TYPE = setuptools
diff --git a/package/python-dpkt/python-dpkt.mk b/package/python-dpkt/python-dpkt.mk
index 3015502..9694b9e 100644
--- a/package/python-dpkt/python-dpkt.mk
+++ b/package/python-dpkt/python-dpkt.mk
@@ -7,7 +7,7 @@
PYTHON_DPKT_VERSION = 1.8.r98
PYTHON_DPKT_SITE = $(call github,kbandla,dpkt,$(PYTHON_DPKT_VERSION))
PYTHON_DPKT_SETUP_TYPE = distutils
-PYTHON_DPKT_LICENSE = BSD-3c
+PYTHON_DPKT_LICENSE = BSD-3-Clause
PYTHON_DPKT_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-enum34/python-enum34.mk b/package/python-enum34/python-enum34.mk
index 9b7fbd4..1a4c6c6 100644
--- a/package/python-enum34/python-enum34.mk
+++ b/package/python-enum34/python-enum34.mk
@@ -8,7 +8,7 @@ PYTHON_ENUM34_VERSION = 1.1.6
PYTHON_ENUM34_SOURCE = enum34-$(PYTHON_ENUM34_VERSION).tar.gz
PYTHON_ENUM34_SITE = https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876
PYTHON_ENUM34_SETUP_TYPE = distutils
-PYTHON_ENUM34_LICENSE = BSD-3c
+PYTHON_ENUM34_LICENSE = BSD-3-Clause
PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE
$(eval $(python-package))
diff --git a/package/python-flask-babel/python-flask-babel.mk b/package/python-flask-babel/python-flask-babel.mk
index 35d34d1..0b74149 100644
--- a/package/python-flask-babel/python-flask-babel.mk
+++ b/package/python-flask-babel/python-flask-babel.mk
@@ -7,7 +7,7 @@
PYTHON_FLASK_BABEL_VERSION = 0.11.1
PYTHON_FLASK_BABEL_SOURCE = Flask-Babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz
PYTHON_FLASK_BABEL_SITE = https://pypi.python.org/packages/47/96/6013d4091fb4238e27e918aec4929f082942fa8c9489ae3aad2f18de4b5b
-PYTHON_FLASK_BABEL_LICENSE = BSD-3c
+PYTHON_FLASK_BABEL_LICENSE = BSD-3-Clause
PYTHON_FLASK_BABEL_SETUP_TYPE = setuptools
PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE
diff --git a/package/python-flask-jsonrpc/python-flask-jsonrpc.mk b/package/python-flask-jsonrpc/python-flask-jsonrpc.mk
index ade39e1..dbb37c3 100644
--- a/package/python-flask-jsonrpc/python-flask-jsonrpc.mk
+++ b/package/python-flask-jsonrpc/python-flask-jsonrpc.mk
@@ -7,7 +7,7 @@
PYTHON_FLASK_JSONRPC_VERSION = 0.3.1
PYTHON_FLASK_JSONRPC_SOURCE = Flask-JSONRPC-$(PYTHON_FLASK_JSONRPC_VERSION).tar.gz
PYTHON_FLASK_JSONRPC_SITE = https://pypi.python.org/packages/cb/1f/e6d66e8498609ba04bac76155b2ea884df95531e93501bf4ef009d40a83c
-PYTHON_FLASK_JSONRPC_LICENSE = BSD-3c
+PYTHON_FLASK_JSONRPC_LICENSE = BSD-3-Clause
PYTHON_FLASK_JSONRPC_LICENSE_FILES = setup.py
PYTHON_FLASK_JSONRPC_SETUP_TYPE = setuptools
diff --git a/package/python-flask/python-flask.mk b/package/python-flask/python-flask.mk
index 6c25a6d..856fa06 100644
--- a/package/python-flask/python-flask.mk
+++ b/package/python-flask/python-flask.mk
@@ -8,7 +8,7 @@ PYTHON_FLASK_VERSION = 0.12
PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz
PYTHON_FLASK_SITE = https://pypi.python.org/packages/4b/3a/4c20183df155dd2e39168e35d53a388efb384a512ca6c73001d8292c094a
PYTHON_FLASK_SETUP_TYPE = setuptools
-PYTHON_FLASK_LICENSE = BSD-3c
+PYTHON_FLASK_LICENSE = BSD-3-Clause
PYTHON_FLASK_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-idna/python-idna.mk b/package/python-idna/python-idna.mk
index bb87f47..7e3a317 100644
--- a/package/python-idna/python-idna.mk
+++ b/package/python-idna/python-idna.mk
@@ -7,7 +7,7 @@
PYTHON_IDNA_VERSION = 2.2
PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz
PYTHON_IDNA_SITE = https://pypi.python.org/packages/94/fe/efb1cb6f505e1a560b3d080ae6b9fddc11e7c542d694ce4635c49b1ccdcb
-PYTHON_IDNA_LICENSE = BSD-3c
+PYTHON_IDNA_LICENSE = BSD-3-Clause
PYTHON_IDNA_LICENSE_FILES = LICENSE.rst
PYTHON_IDNA_SETUP_TYPE = setuptools
diff --git a/package/python-ipy/python-ipy.mk b/package/python-ipy/python-ipy.mk
index ec0d0d7..2b2bdf2 100644
--- a/package/python-ipy/python-ipy.mk
+++ b/package/python-ipy/python-ipy.mk
@@ -7,7 +7,7 @@
PYTHON_IPY_VERSION = 0.83
PYTHON_IPY_SOURCE = IPy-$(PYTHON_IPY_VERSION).tar.gz
PYTHON_IPY_SITE = https://pypi.python.org/packages/88/28/79162bfc351a3f1ab44d663ab3f03fb495806fdb592170990a1568ffbf63
-PYTHON_IPY_LICENSE = BSD-3c
+PYTHON_IPY_LICENSE = BSD-3-Clause
PYTHON_IPY_LICENSE_FILES = COPYING
PYTHON_IPY_SETUP_TYPE = distutils
diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk
index 07b682b..e57d69d 100644
--- a/package/python-ipython/python-ipython.mk
+++ b/package/python-ipython/python-ipython.mk
@@ -7,7 +7,7 @@
PYTHON_IPYTHON_VERSION = 5.2.2
PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz
PYTHON_IPYTHON_SITE = https://pypi.python.org/packages/6e/cf/c2a3ca5942e2d8084574157a8f818efafb7218204cd9e41166c92c452e07
-PYTHON_IPYTHON_LICENSE = BSD-3c
+PYTHON_IPYTHON_LICENSE = BSD-3-Clause
PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst
PYTHON_IPYTHON_SETUP_TYPE = distutils
diff --git a/package/python-itsdangerous/python-itsdangerous.mk b/package/python-itsdangerous/python-itsdangerous.mk
index 8b055d6..45adbb0 100644
--- a/package/python-itsdangerous/python-itsdangerous.mk
+++ b/package/python-itsdangerous/python-itsdangerous.mk
@@ -7,7 +7,7 @@
PYTHON_ITSDANGEROUS_VERSION = 0.24
PYTHON_ITSDANGEROUS_SITE = $(call github,mitsuhiko,itsdangerous,$(PYTHON_ITSDANGEROUS_VERSION))
PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools
-PYTHON_ITSDANGEROUS_LICENSE = BSD-3c
+PYTHON_ITSDANGEROUS_LICENSE = BSD-3-Clause
PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk
index f5ce04c..34342ab 100644
--- a/package/python-jinja2/python-jinja2.mk
+++ b/package/python-jinja2/python-jinja2.mk
@@ -8,7 +8,7 @@ PYTHON_JINJA2_VERSION = 2.9.5
PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz
PYTHON_JINJA2_SITE = https://pypi.python.org/packages/71/59/d7423bd5e7ddaf3a1ce299ab4490e9044e8dfd195420fc83a24de9e60726
PYTHON_JINJA2_SETUP_TYPE = setuptools
-PYTHON_JINJA2_LICENSE = BSD-3c
+PYTHON_JINJA2_LICENSE = BSD-3-Clause
PYTHON_JINJA2_LICENSE_FILES = LICENSE
# In host build, setup.py tries to download markupsafe if it is not installed
HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe
diff --git a/package/python-logbook/python-logbook.mk b/package/python-logbook/python-logbook.mk
index 2912379..5fcf301 100644
--- a/package/python-logbook/python-logbook.mk
+++ b/package/python-logbook/python-logbook.mk
@@ -8,6 +8,6 @@ PYTHON_LOGBOOK_VERSION = 1.0.0
PYTHON_LOGBOOK_SOURCE = Logbook-$(PYTHON_LOGBOOK_VERSION).tar.gz
PYTHON_LOGBOOK_SITE = https://pypi.python.org/packages/34/e8/6419c217bbf464fe8a902418120cccaf476201bd03b50958db24d6e90f65
PYTHON_LOGBOOK_SETUP_TYPE = setuptools
-PYTHON_LOGBOOK_LICENSE = BSD-3c
+PYTHON_LOGBOOK_LICENSE = BSD-3-Clause
$(eval $(python-package))
diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk
index 62c2980..bb060d7 100644
--- a/package/python-lxml/python-lxml.mk
+++ b/package/python-lxml/python-lxml.mk
@@ -9,7 +9,7 @@ PYTHON_LXML_SITE = http://lxml.de/files
PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tgz
# Not including the GPL, because it is used only for the test scripts.
-PYTHON_LXML_LICENSE = BSD-3c, Others
+PYTHON_LXML_LICENSE = BSD-3-Clause, Others
PYTHON_LXML_LICENSE_FILES = \
LICENSES.txt \
doc/licenses/BSD.txt \
diff --git a/package/python-markdown/python-markdown.mk b/package/python-markdown/python-markdown.mk
index 6968366..d5273f9 100644
--- a/package/python-markdown/python-markdown.mk
+++ b/package/python-markdown/python-markdown.mk
@@ -7,7 +7,7 @@
PYTHON_MARKDOWN_VERSION = 2.6.8
PYTHON_MARKDOWN_SOURCE = Markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz
PYTHON_MARKDOWN_SITE = https://pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d
-PYTHON_MARKDOWN_LICENSE = BSD-3c
+PYTHON_MARKDOWN_LICENSE = BSD-3-Clause
PYTHON_MARKDOWN_LICENSE_FILES = LICENSE.md
PYTHON_MARKDOWN_SETUP_TYPE = distutils
diff --git a/package/python-markupsafe/python-markupsafe.mk b/package/python-markupsafe/python-markupsafe.mk
index c815728..d8e3acb 100644
--- a/package/python-markupsafe/python-markupsafe.mk
+++ b/package/python-markupsafe/python-markupsafe.mk
@@ -8,7 +8,7 @@ PYTHON_MARKUPSAFE_VERSION = 0.23
PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz
PYTHON_MARKUPSAFE_SITE = http://pypi.python.org/packages/source/M/MarkupSafe
PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools
-PYTHON_MARKUPSAFE_LICENSE = BSD-3c
+PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause
PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-mistune/python-mistune.mk b/package/python-mistune/python-mistune.mk
index 91e97e8..6bc0b20 100644
--- a/package/python-mistune/python-mistune.mk
+++ b/package/python-mistune/python-mistune.mk
@@ -7,7 +7,7 @@
PYTHON_MISTUNE_VERSION = 0.7.3
PYTHON_MISTUNE_SOURCE = mistune-$(PYTHON_MISTUNE_VERSION).tar.gz
PYTHON_MISTUNE_SITE = https://pypi.python.org/packages/88/1e/be99791262b3a794332fda598a07c2749a433b9378586361ba9d8e824607
-PYTHON_MISTUNE_LICENSE = BSD-3c
+PYTHON_MISTUNE_LICENSE = BSD-3-Clause
PYTHON_MISTUNE_LICENSE_FILES = LICENSE
PYTHON_MISTUNE_SETUP_TYPE = setuptools
diff --git a/package/python-netaddr/python-netaddr.mk b/package/python-netaddr/python-netaddr.mk
index 69ad3cc..95f78f1 100644
--- a/package/python-netaddr/python-netaddr.mk
+++ b/package/python-netaddr/python-netaddr.mk
@@ -7,7 +7,7 @@
PYTHON_NETADDR_VERSION = 0.7.19
PYTHON_NETADDR_SOURCE = netaddr-$(PYTHON_NETADDR_VERSION).tar.gz
PYTHON_NETADDR_SITE = https://pypi.python.org/packages/0c/13/7cbb180b52201c07c796243eeff4c256b053656da5cfe3916c3f5b57b3a0
-PYTHON_NETADDR_LICENSE = BSD-3c
+PYTHON_NETADDR_LICENSE = BSD-3-Clause
PYTHON_NETADDR_LICENSE_FILES = LICENSE
PYTHON_NETADDR_SETUP_TYPE = distutils
diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk
index 0ab58b0..93ffaa4 100644
--- a/package/python-numpy/python-numpy.mk
+++ b/package/python-numpy/python-numpy.mk
@@ -7,7 +7,7 @@
PYTHON_NUMPY_VERSION = 1.8.0
PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz
PYTHON_NUMPY_SITE = http://downloads.sourceforge.net/numpy
-PYTHON_NUMPY_LICENSE = BSD-3c
+PYTHON_NUMPY_LICENSE = BSD-3-Clause
PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt
PYTHON_NUMPY_SETUP_TYPE = distutils
diff --git a/package/python-posix-ipc/python-posix-ipc.mk b/package/python-posix-ipc/python-posix-ipc.mk
index 7916537..6178c75 100644
--- a/package/python-posix-ipc/python-posix-ipc.mk
+++ b/package/python-posix-ipc/python-posix-ipc.mk
@@ -7,7 +7,7 @@
PYTHON_POSIX_IPC_VERSION = 1.0.0
PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz
PYTHON_POSIX_IPC_SITE = https://pypi.python.org/packages/f0/e6/bff62b62b2e75f695b737695951b7a4c1c6595369268a37868f5c34e1c12
-PYTHON_POSIX_IPC_LICENSE = BSD-3c
+PYTHON_POSIX_IPC_LICENSE = BSD-3-Clause
PYTHON_POSIX_IPC_LICENSE_FILES = LICENSE
PYTHON_POSIX_IPC_SETUP_TYPE = distutils
diff --git a/package/python-prompt-toolkit/python-prompt-toolkit.mk b/package/python-prompt-toolkit/python-prompt-toolkit.mk
index 0b80681..19b7b34 100644
--- a/package/python-prompt-toolkit/python-prompt-toolkit.mk
+++ b/package/python-prompt-toolkit/python-prompt-toolkit.mk
@@ -8,7 +8,7 @@ PYTHON_PROMPT_TOOLKIT_VERSION = 1.0.13
PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz
PYTHON_PROMPT_TOOLKIT_SITE = https://pypi.python.org/packages/23/be/4876b52d5cc159cbd4b0ff6e7aa419a26470849a43a8f647857a4a24467b
PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools
-PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3c
+PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause
PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk
index d8be76d..5a64889 100644
--- a/package/python-protobuf/python-protobuf.mk
+++ b/package/python-protobuf/python-protobuf.mk
@@ -7,7 +7,7 @@
PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE)
PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
-PYTHON_PROTOBUF_LICENSE = BSD-3c
+PYTHON_PROTOBUF_LICENSE = BSD-3-Clause
PYTHON_PROTOBUF_LICENSE_FILES = LICENSE
PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf
PYTHON_PROTOBUF_SETUP_TYPE = setuptools
diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk
index 9783733..2b41df7 100644
--- a/package/python-psutil/python-psutil.mk
+++ b/package/python-psutil/python-psutil.mk
@@ -8,7 +8,7 @@ PYTHON_PSUTIL_VERSION = 5.2.0
PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/3c/2f/f3ab91349c666f009077157b12057e613a3152a46a6c3be883777546b6de
PYTHON_PSUTIL_SETUP_TYPE = setuptools
-PYTHON_PSUTIL_LICENSE = BSD-3c
+PYTHON_PSUTIL_LICENSE = BSD-3-Clause
PYTHON_PSUTIL_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-pycparser/python-pycparser.mk b/package/python-pycparser/python-pycparser.mk
index e66c80b..08a22b4 100644
--- a/package/python-pycparser/python-pycparser.mk
+++ b/package/python-pycparser/python-pycparser.mk
@@ -8,7 +8,7 @@ PYTHON_PYCPARSER_VERSION = 2.17
PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz
PYTHON_PYCPARSER_SITE = https://pypi.python.org/packages/be/64/1bb257ffb17d01f4a38d7ce686809a736837ad4371bcc5c42ba7a715c3ac
PYTHON_PYCPARSER_SETUP_TYPE = setuptools
-PYTHON_PYCPARSER_LICENSE = BSD-3c
+PYTHON_PYCPARSER_LICENSE = BSD-3-Clause
PYTHON_PYCPARSER_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-pydal/python-pydal.mk b/package/python-pydal/python-pydal.mk
index 7492357..173fe6e 100644
--- a/package/python-pydal/python-pydal.mk
+++ b/package/python-pydal/python-pydal.mk
@@ -7,7 +7,7 @@
PYTHON_PYDAL_VERSION = 17.1
PYTHON_PYDAL_SOURCE = pyDAL-$(PYTHON_PYDAL_VERSION).tar.gz
PYTHON_PYDAL_SITE = https://pypi.python.org/packages/64/9a/4fc08f6078b3a3019a9e33c8383bb023e064405dc5e16c273b8ec6d430cd
-PYTHON_PYDAL_LICENSE = BSD-3c
+PYTHON_PYDAL_LICENSE = BSD-3-Clause
PYTHON_PYDAL_LICENSE_FILES = LICENSE
PYTHON_PYDAL_SETUP_TYPE = setuptools
diff --git a/package/python-pypcap/python-pypcap.mk b/package/python-pypcap/python-pypcap.mk
index 97d07f8..185ab1d 100644
--- a/package/python-pypcap/python-pypcap.mk
+++ b/package/python-pypcap/python-pypcap.mk
@@ -6,7 +6,7 @@
PYTHON_PYPCAP_VERSION = 6f46e7bf29a648256ddc732a7d0ec83d3ffca390
PYTHON_PYPCAP_SITE = $(call github,dugsong,pypcap,$(PYTHON_PYPCAP_VERSION))
-PYTHON_PYPCAP_LICENSE = BSD-3c
+PYTHON_PYPCAP_LICENSE = BSD-3-Clause
PYTHON_PYPCAP_LICENSE_FILES = LICENSE
PYTHON_PYPCAP_SETUP_TYPE = distutils
PYTHON_PYPCAP_DEPENDENCIES = host-python-pyrex libpcap
diff --git a/package/python-pyqrcode/python-pyqrcode.mk b/package/python-pyqrcode/python-pyqrcode.mk
index 67e167a..f3eac5a 100644
--- a/package/python-pyqrcode/python-pyqrcode.mk
+++ b/package/python-pyqrcode/python-pyqrcode.mk
@@ -8,7 +8,7 @@ PYTHON_PYQRCODE_VERSION = 1.2.1
PYTHON_PYQRCODE_SOURCE = PyQRCode-$(PYTHON_PYQRCODE_VERSION).tar.gz
PYTHON_PYQRCODE_SITE = https://pypi.python.org/packages/37/61/f07226075c347897937d4086ef8e55f0a62ae535e28069884ac68d979316
PYTHON_PYQRCODE_SETUP_TYPE = setuptools
-PYTHON_PYQRCODE_LICENSE = BSD-3c
+PYTHON_PYQRCODE_LICENSE = BSD-3-Clause
PYTHON_PYQRCODE_LICENSE_FILES = setup.py
$(eval $(python-package))
diff --git a/package/python-pysnmp-apps/python-pysnmp-apps.mk b/package/python-pysnmp-apps/python-pysnmp-apps.mk
index 2c831df..79c436f 100644
--- a/package/python-pysnmp-apps/python-pysnmp-apps.mk
+++ b/package/python-pysnmp-apps/python-pysnmp-apps.mk
@@ -8,7 +8,7 @@ PYTHON_PYSNMP_APPS_VERSION = 0.4.1
PYTHON_PYSNMP_APPS_SOURCE = pysnmp-apps-$(PYTHON_PYSNMP_APPS_VERSION).tar.gz
PYTHON_PYSNMP_APPS_SITE = https://pypi.python.org/packages/source/p/pysnmp-apps
PYTHON_PYSNMP_APPS_SETUP_TYPE = setuptools
-PYTHON_PYSNMP_APPS_LICENSE = BSD-3c
+PYTHON_PYSNMP_APPS_LICENSE = BSD-3-Clause
PYTHON_PYSNMP_APPS_LICENSE_FILES = LICENSE.txt
PYTHON_PYSNMP_APPS_DEPENDENCIES = python-pysnmp
diff --git a/package/python-pysnmp-mibs/python-pysnmp-mibs.mk b/package/python-pysnmp-mibs/python-pysnmp-mibs.mk
index a0db763..9772b78 100644
--- a/package/python-pysnmp-mibs/python-pysnmp-mibs.mk
+++ b/package/python-pysnmp-mibs/python-pysnmp-mibs.mk
@@ -8,7 +8,7 @@ PYTHON_PYSNMP_MIBS_VERSION = 0.1.6
PYTHON_PYSNMP_MIBS_SOURCE = pysnmp-mibs-$(PYTHON_PYSNMP_MIBS_VERSION).tar.gz
PYTHON_PYSNMP_MIBS_SITE = https://pypi.python.org/packages/bf/7c/99ab192af934ed5d41ceef92a1b949b41652f29b46241b902ffec55642f4
PYTHON_PYSNMP_MIBS_SETUP_TYPE = setuptools
-PYTHON_PYSNMP_MIBS_LICENSE = BSD-3c
+PYTHON_PYSNMP_MIBS_LICENSE = BSD-3-Clause
PYTHON_PYSNMP_MIBS_LICENSE_FILES = LICENSE.txt
PYTHON_PYSNMP_MIBS_DEPENDENCIES = python-pysnmp
diff --git a/package/python-pysnmp/python-pysnmp.mk b/package/python-pysnmp/python-pysnmp.mk
index 0d72613..2721ba8 100644
--- a/package/python-pysnmp/python-pysnmp.mk
+++ b/package/python-pysnmp/python-pysnmp.mk
@@ -9,7 +9,7 @@ PYTHON_PYSNMP_SOURCE = pysnmp-$(PYTHON_PYSNMP_VERSION).tar.gz
PYTHON_PYSNMP_SITE = https://pypi.python.org/packages/47/b5/c65b9b6fcc36d3f4caca30d3314920f1ca75f5ceecc1f6ae2538ede24511
PYTHON_PYSNMP_SETUP_TYPE = setuptools
-PYTHON_PYSNMP_LICENSE = BSD-3c
+PYTHON_PYSNMP_LICENSE = BSD-3-Clause
PYTHON_PYSNMP_LICENSE_FILES = LICENSE.txt
PYTHON_PYSNMP_DEPENDENCIES = python-pyasn python-pycrypto
diff --git a/package/python-pysocks/python-pysocks.mk b/package/python-pysocks/python-pysocks.mk
index 0fa8c1d..10c76b2 100644
--- a/package/python-pysocks/python-pysocks.mk
+++ b/package/python-pysocks/python-pysocks.mk
@@ -7,7 +7,7 @@
PYTHON_PYSOCKS_VERSION = 1.6.6
PYTHON_PYSOCKS_SOURCE = PySocks-$(PYTHON_PYSOCKS_VERSION).tar.gz
PYTHON_PYSOCKS_SITE = https://pypi.python.org/packages/fd/70/ba9982cedc9b3ed3c06934f1f46a609e0f23c7bfdf567c52a09f1296b8cb
-PYTHON_PYSOCKS_LICENSE = BSD-3c
+PYTHON_PYSOCKS_LICENSE = BSD-3-Clause
PYTHON_PYSOCKS_LICENSE_FILES = socks.py
PYTHON_PYSOCKS_SETUP_TYPE = distutils
diff --git a/package/python-pytrie/python-pytrie.mk b/package/python-pytrie/python-pytrie.mk
index e3bea4f..b651352 100644
--- a/package/python-pytrie/python-pytrie.mk
+++ b/package/python-pytrie/python-pytrie.mk
@@ -7,7 +7,7 @@
PYTHON_PYTRIE_VERSION = 0.2
PYTHON_PYTRIE_SITE = http://pypi.python.org/packages/source/P/PyTrie
PYTHON_PYTRIE_SOURCE = PyTrie-$(PYTHON_PYTRIE_VERSION).tar.gz
-PYTHON_PYTRIE_LICENSE = BSD-3c
+PYTHON_PYTRIE_LICENSE = BSD-3-Clause
PYTHON_PYTRIE_LICENSE_FILES = LICENSE
PYTHON_PYTRIE_SETUP_TYPE = distutils
diff --git a/package/python-pyusb/python-pyusb.mk b/package/python-pyusb/python-pyusb.mk
index cfdef53..0afcbe8 100644
--- a/package/python-pyusb/python-pyusb.mk
+++ b/package/python-pyusb/python-pyusb.mk
@@ -7,7 +7,7 @@
PYTHON_PYUSB_VERSION = 1.0.0
PYTHON_PYUSB_SOURCE = PyUSB-$(PYTHON_PYUSB_VERSION).tar.gz
PYTHON_PYUSB_SITE = https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d
-PYTHON_PYUSB_LICENSE = BSD-3c
+PYTHON_PYUSB_LICENSE = BSD-3-Clause
PYTHON_PYUSB_LICENSE_FILES = LICENSE
PYTHON_PYUSB_SETUP_TYPE = distutils
PYTHON_PYUSB_DEPENDENCIES = libusb
diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk
index 4f8b5ec..c34c5af 100644
--- a/package/python-pyzmq/python-pyzmq.mk
+++ b/package/python-pyzmq/python-pyzmq.mk
@@ -7,7 +7,7 @@
PYTHON_PYZMQ_VERSION = 16.0.2
PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz
PYTHON_PYZMQ_SITE = https://pypi.python.org/packages/af/37/8e0bf3800823bc247c36715a52e924e8f8fd5d1432f04b44b8cd7a5d7e55
-PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3c, Apache-2.0
+PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0
# Apache license only online: http://www.apache.org/licenses/LICENSE-2.0
PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD
PYTHON_PYZMQ_DEPENDENCIES = zeromq
diff --git a/package/python-setproctitle/python-setproctitle.mk b/package/python-setproctitle/python-setproctitle.mk
index 36cfec3..b839b5d 100644
--- a/package/python-setproctitle/python-setproctitle.mk
+++ b/package/python-setproctitle/python-setproctitle.mk
@@ -7,7 +7,7 @@
PYTHON_SETPROCTITLE_VERSION = 1.1.10
PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz
PYTHON_SETPROCTITLE_SITE = https://pypi.python.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3
-PYTHON_SETPROCTITLE_LICENSE = BSD-3c
+PYTHON_SETPROCTITLE_LICENSE = BSD-3-Clause
PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT
PYTHON_SETPROCTITLE_SETUP_TYPE = distutils
diff --git a/package/python-ujson/python-ujson.mk b/package/python-ujson/python-ujson.mk
index 8d4a12b..0a2184e 100644
--- a/package/python-ujson/python-ujson.mk
+++ b/package/python-ujson/python-ujson.mk
@@ -7,7 +7,7 @@
PYTHON_UJSON_VERSION = 1.35
PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz
PYTHON_UJSON_SITE = http://pypi.python.org/packages/source/u/ujson
-PYTHON_UJSON_LICENSE = BSD-3c
+PYTHON_UJSON_LICENSE = BSD-3-Clause
PYTHON_UJSON_SETUP_TYPE = setuptools
$(eval $(python-package))
diff --git a/package/python-werkzeug/python-werkzeug.mk b/package/python-werkzeug/python-werkzeug.mk
index b4dc3cd..dfa657c 100644
--- a/package/python-werkzeug/python-werkzeug.mk
+++ b/package/python-werkzeug/python-werkzeug.mk
@@ -8,7 +8,7 @@ PYTHON_WERKZEUG_VERSION = 0.11.15
PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz
PYTHON_WERKZEUG_SITE = https://pypi.python.org/packages/fe/7f/6d70f765ce5484e07576313897793cb49333dd34e462488ee818d17244af
PYTHON_WERKZEUG_SETUP_TYPE = setuptools
-PYTHON_WERKZEUG_LICENSE = BSD-3c
+PYTHON_WERKZEUG_LICENSE = BSD-3-Clause
PYTHON_WERKZEUG_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-whoosh/python-whoosh.mk b/package/python-whoosh/python-whoosh.mk
index 2baf657..a100c44 100644
--- a/package/python-whoosh/python-whoosh.mk
+++ b/package/python-whoosh/python-whoosh.mk
@@ -8,7 +8,7 @@ PYTHON_WHOOSH_VERSION = 2.7.4
PYTHON_WHOOSH_SOURCE = Whoosh-$(PYTHON_WHOOSH_VERSION).tar.gz
PYTHON_WHOOSH_SITE = https://pypi.python.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684
PYTHON_WHOOSH_SETUP_TYPE = setuptools
-PYTHON_WHOOSH_LICENSE = BSD-3c
+PYTHON_WHOOSH_LICENSE = BSD-3-Clause
PYTHON_WHOOSH_LICENSE_FILES = LICENSE.txt
$(eval $(python-package))
diff --git a/package/python-ws4py/python-ws4py.mk b/package/python-ws4py/python-ws4py.mk
index fac99f3..8f3b985 100644
--- a/package/python-ws4py/python-ws4py.mk
+++ b/package/python-ws4py/python-ws4py.mk
@@ -8,7 +8,7 @@ PYTHON_WS4PY_VERSION = 0.3.5
PYTHON_WS4PY_SOURCE = ws4py-$(PYTHON_WS4PY_VERSION).tar.gz
PYTHON_WS4PY_SITE = https://pypi.python.org/packages/c8/b4/1784512791fbd196a48f282ca6c79398cace9541a9c151d89c30b6add6e1
PYTHON_WS4PY_SETUP_TYPE = setuptools
-PYTHON_WS4PY_LICENSE = BSD-3c
+PYTHON_WS4PY_LICENSE = BSD-3-Clause
PYTHON_WS4PY_LICENSE_FILES = ws4py/__init__.py
$(eval $(python-package))
diff --git a/package/python-xlrd/python-xlrd.mk b/package/python-xlrd/python-xlrd.mk
index 50f7624..e3f078c 100644
--- a/package/python-xlrd/python-xlrd.mk
+++ b/package/python-xlrd/python-xlrd.mk
@@ -8,7 +8,7 @@ PYTHON_XLRD_VERSION = 1.0.0
PYTHON_XLRD_SOURCE = xlrd-$(PYTHON_XLRD_VERSION).tar.gz
PYTHON_XLRD_SITE = https://pypi.python.org/packages/42/85/25caf967c2d496067489e0bb32df069a8361e1fd96a7e9f35408e56b3aab
PYTHON_XLRD_SETUP_TYPE = setuptools
-PYTHON_XLRD_LICENSE = BSD-3c
+PYTHON_XLRD_LICENSE = BSD-3-Clause
PYTHON_XLRD_LICENSE_FILES = xlrd/licences.py
$(eval $(python-package))
diff --git a/package/python-xlwt/python-xlwt.mk b/package/python-xlwt/python-xlwt.mk
index 27901f9..0438fc8 100644
--- a/package/python-xlwt/python-xlwt.mk
+++ b/package/python-xlwt/python-xlwt.mk
@@ -8,7 +8,7 @@ PYTHON_XLWT_VERSION = 1.2.0
PYTHON_XLWT_SOURCE = xlwt-$(PYTHON_XLWT_VERSION).tar.gz
PYTHON_XLWT_SITE = https://pypi.python.org/packages/5b/8d/22b9ec552a1d7865de39f54bd15f9db09c72a6bf8ab77b11dcce4ae336bb
PYTHON_XLWT_SETUP_TYPE = setuptools
-PYTHON_XLWT_LICENSE = BSD-3c, BSD-4c
+PYTHON_XLWT_LICENSE = BSD-3-Clause, BSD-4c
PYTHON_XLWT_LICENSE_FILES = docs/licenses.rst
$(eval $(python-package))
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 4dffaed..649f060 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -7,7 +7,7 @@
QEMU_VERSION = 2.8.0
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
QEMU_SITE = http://wiki.qemu.org/download
-QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
+QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2c, Others/BSD-1c
QEMU_LICENSE_FILES = COPYING COPYING.LIB
#?NOTE: there is no top-level license file for non-(L)GPL licenses;
# the non-(L)GPL license texts are specified in the affected
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index e949cf4..d00d8e7 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -57,7 +57,7 @@ QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs
QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3c (examples)
+QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3-Clause (examples)
QT5BASE_LICENSE_FILES += header.BSD
endif
else
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index c0861c8..1cdc9e5 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -19,7 +19,7 @@ QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5CONNECTIVITY_LICENSE := $(QT5CONNECTIVITY_LICENSE), BSD-3c (examples)
+QT5CONNECTIVITY_LICENSE := $(QT5CONNECTIVITY_LICENSE), BSD-3-Clause (examples)
endif
else
QT5CONNECTIVITY_LICENSE = Commercial license
diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk
index 468d1ff..46d30de 100644
--- a/package/qt5/qt5enginio/qt5enginio.mk
+++ b/package/qt5/qt5enginio/qt5enginio.mk
@@ -16,7 +16,7 @@ ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3c (examples)
+QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3-Clause (examples)
endif
else
QT5ENGINIO_LICENSE = Commercial license
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 570a14b..bbd8786 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -19,7 +19,7 @@ QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5WEBCHANNEL_LICENSE := $(QT5WEBCHANNEL_LICENSE), BSD-3c (examples)
+QT5WEBCHANNEL_LICENSE := $(QT5WEBCHANNEL_LICENSE), BSD-3-Clause (examples)
endif
else
QT5WEBCHANNEL_LICENSE = Commercial license
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 09d09fd..3849959 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -15,7 +15,7 @@ QT5WEBKIT_INSTALL_STAGING = YES
QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3c, BSD-2c
+QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2c
# Source files contain references to LGPL_EXCEPTION.txt but it is not included
# in the archive.
QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index fe34748..bcbc56f 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -19,7 +19,7 @@ QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0
QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5WEBSOCKETS_LICENSE := $(QT5WEBSOCKETS_LICENSE), BSD-3c (examples)
+QT5WEBSOCKETS_LICENSE := $(QT5WEBSOCKETS_LICENSE), BSD-3-Clause (examples)
endif
else
QT5WEBSOCKETS_LICENSE = Commercial license
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index c6d8137..065bf61 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -19,7 +19,7 @@ QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3c (examples)
+QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3-Clause (examples)
endif
else
QT5XMLPATTERNS_LICENSE = Commercial license
diff --git a/package/redis/redis.mk b/package/redis/redis.mk
index 8ab6e72..6798620 100644
--- a/package/redis/redis.mk
+++ b/package/redis/redis.mk
@@ -6,7 +6,7 @@
REDIS_VERSION = 3.2.8
REDIS_SITE = http://download.redis.io/releases
-REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components)
+REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components)
REDIS_LICENSE_FILES = COPYING
define REDIS_USERS
diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk
index 4360d1f..28deb50 100644
--- a/package/rpcbind/rpcbind.mk
+++ b/package/rpcbind/rpcbind.mk
@@ -7,7 +7,7 @@
RPCBIND_VERSION = 0.2.3
RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
-RPCBIND_LICENSE = BSD-3c
+RPCBIND_LICENSE = BSD-3-Clause
RPCBIND_LICENSE_FILES = COPYING
RPCBIND_CONF_ENV += \
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index b73ef53..5d5c9f0 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -6,7 +6,7 @@
RPI_FIRMWARE_VERSION = 78c4983379de0537f49a97fb37ceaaf42632b28c
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
-RPI_FIRMWARE_LICENSE = BSD-3c
+RPI_FIRMWARE_LICENSE = BSD-3-Clause
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
RPI_FIRMWARE_INSTALL_IMAGES = YES
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
index aec721d..632552c 100644
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -6,7 +6,7 @@
RPI_USERLAND_VERSION = f410ec051a3724934e3671315474d4b81424b0ef
RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
-RPI_USERLAND_LICENSE = BSD-3c
+RPI_USERLAND_LICENSE = BSD-3-Clause
RPI_USERLAND_LICENSE_FILES = LICENCE
RPI_USERLAND_INSTALL_STAGING = YES
RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr \
diff --git a/package/rs485conf/rs485conf.mk b/package/rs485conf/rs485conf.mk
index 8749268..9d1b764 100644
--- a/package/rs485conf/rs485conf.mk
+++ b/package/rs485conf/rs485conf.mk
@@ -6,7 +6,7 @@
RS485CONF_VERSION = 5c8d00cf70950fab3454549b81dea843d844492a
RS485CONF_SITE = $(call github,mniestroj,rs485conf,$(RS485CONF_VERSION))
-RS485CONF_LICENSE = BSD-3c
+RS485CONF_LICENSE = BSD-3-Clause
RS485CONF_LICENSE_FILES = LICENSE
define RS485CONF_BUILD_CMDS
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index d0a81f1..32ab79c 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -17,7 +17,7 @@ HOST_RUBY_CONF_OPTS = \
--disable-install-doc \
--with-out-ext=curses,openssl,readline \
--without-gmp
-RUBY_LICENSE = Ruby or BSD-2c, BSD-3c, others
+RUBY_LICENSE = Ruby or BSD-2c, BSD-3-Clause, others
RUBY_LICENSE_FILES = LEGAL COPYING BSDL
RUBY_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/sdparm/sdparm.mk b/package/sdparm/sdparm.mk
index ed1606c..b9fac51 100644
--- a/package/sdparm/sdparm.mk
+++ b/package/sdparm/sdparm.mk
@@ -7,7 +7,7 @@
SDPARM_VERSION = 1.10
SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tar.xz
SDPARM_SITE = http://sg.danny.cz/sg/p
-SDPARM_LICENSE = BSD-3c
+SDPARM_LICENSE = BSD-3-Clause
SDPARM_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_SG3_UTILS),y)
diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk
index bc7b0b5..783f4f6 100644
--- a/package/sg3_utils/sg3_utils.mk
+++ b/package/sg3_utils/sg3_utils.mk
@@ -7,7 +7,7 @@
SG3_UTILS_VERSION = 1.42
SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz
SG3_UTILS_SITE = http://sg.danny.cz/sg/p
-SG3_UTILS_LICENSE = BSD-3c
+SG3_UTILS_LICENSE = BSD-3-Clause
# utils progs are GPLv2+ licenced
ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y)
SG3_UTILS_LICENSE += GPL-2.0+
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index 976aff6..650c6d7 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -7,7 +7,7 @@
SHAIRPORT_SYNC_VERSION = 3.0.1
SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION))
-SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c
+SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause
SHAIRPORT_SYNC_LICENSE_FILES = LICENSES
SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf
diff --git a/package/snappy/snappy.mk b/package/snappy/snappy.mk
index fcbcd13..2b1da8c 100644
--- a/package/snappy/snappy.mk
+++ b/package/snappy/snappy.mk
@@ -6,7 +6,7 @@
SNAPPY_VERSION = 32d6d7d8a2ef328a2ee1dd40f072e21f4983ebda
SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION))
-SNAPPY_LICENSE = BSD-3c
+SNAPPY_LICENSE = BSD-3-Clause
SNAPPY_LICENSE_FILES = COPYING
# from git
SNAPPY_AUTORECONF = YES
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
index 3b4bba6..aeb052c 100644
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -7,7 +7,7 @@
SOCKETCAND_VERSION = df7fb4ff8a4439d7737fe2df3540e1ab7465721a
SOCKETCAND_SITE = $(call github,dschanoeh,socketcand,$(SOCKETCAND_VERSION))
SOCKETCAND_AUTORECONF = YES
-SOCKETCAND_LICENSE = BSD-3c or GPL-2.0
+SOCKETCAND_LICENSE = BSD-3-Clause or GPL-2.0
SOCKETCAND_LICENSE_FILES = socketcand.c
ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk
index 13357bb..ed97d0a 100644
--- a/package/spawn-fcgi/spawn-fcgi.mk
+++ b/package/spawn-fcgi/spawn-fcgi.mk
@@ -7,7 +7,7 @@
SPAWN_FCGI_VERSION = 1.6.4
SPAWN_FCGI_SITE = http://www.lighttpd.net/download
SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2
-SPAWN_FCGI_LICENSE = BSD-3c
+SPAWN_FCGI_LICENSE = BSD-3-Clause
SPAWN_FCGI_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/speex/speex.mk b/package/speex/speex.mk
index a34bfac..1b278ea 100644
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -6,7 +6,7 @@
SPEEX_VERSION = 1.2rc1
SPEEX_SITE = http://downloads.us.xiph.org/releases/speex
-SPEEX_LICENSE = BSD-3c
+SPEEX_LICENSE = BSD-3-Clause
SPEEX_LICENSE_FILES = COPYING
SPEEX_INSTALL_STAGING = YES
diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk
index 4e81e6c..dcc6fee 100644
--- a/package/spice-protocol/spice-protocol.mk
+++ b/package/spice-protocol/spice-protocol.mk
@@ -7,7 +7,7 @@
SPICE_PROTOCOL_VERSION = 0.12.10
SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases
-SPICE_PROTOCOL_LICENSE = BSD-3c
+SPICE_PROTOCOL_LICENSE = BSD-3-Clause
SPICE_PROTOCOL_LICENSE_FILES = COPYING
SPICE_PROTOCOL_INSTALL_STAGING = YES
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 15a0fbf..008dc9f 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -7,7 +7,7 @@
STRACE_VERSION = 4.16
STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
-STRACE_LICENSE = BSD-3c
+STRACE_LICENSE = BSD-3-Clause
STRACE_LICENSE_FILES = COPYING
# strace bundle some kernel headers to build libmpers, this mixes userspace
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
index bb0a2b5..0fcd740 100644
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -6,7 +6,7 @@
SUDO_VERSION = 1.8.19p2
SUDO_SITE = http://www.sudo.ws/sudo/dist
-SUDO_LICENSE = ISC, BSD-3c
+SUDO_LICENSE = ISC, BSD-3-Clause
SUDO_LICENSE_FILES = doc/LICENSE
# This is to avoid sudo's make install from chown()ing files which fails
SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install
diff --git a/package/swig/swig.mk b/package/swig/swig.mk
index 95eaeac..bf2b19d 100644
--- a/package/swig/swig.mk
+++ b/package/swig/swig.mk
@@ -12,7 +12,7 @@ HOST_SWIG_CONF_OPTS = \
--without-pcre \
--disable-ccache \
--without-octave
-SWIG_LICENSE = GPL-3.0+, BSD-2c, BSD-3c
+SWIG_LICENSE = GPL-3.0+, BSD-2c, BSD-3-Clause
SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
# CMake looks first at swig3.0, then swig2.0 and then swig. However,
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
index e71f9c1..0e779a5 100644
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -6,7 +6,7 @@
TCPDUMP_VERSION = 4.9.0
TCPDUMP_SITE = http://www.tcpdump.org/release
-TCPDUMP_LICENSE = BSD-3c
+TCPDUMP_LICENSE = BSD-3-Clause
TCPDUMP_LICENSE_FILES = LICENSE
TCPDUMP_CONF_ENV = \
ac_cv_linux_vers=2 \
diff --git a/package/tegrarcm/tegrarcm.mk b/package/tegrarcm/tegrarcm.mk
index 06fd039..ad4c317 100644
--- a/package/tegrarcm/tegrarcm.mk
+++ b/package/tegrarcm/tegrarcm.mk
@@ -6,7 +6,7 @@
TEGRARCM_VERSION = v1.7
TEGRARCM_SITE = $(call github,NVIDIA,tegrarcm,$(TEGRARCM_VERSION))
-TEGRARCM_LICENSE = BSD-3c / NVIDIA Software License (src/miniloader)
+TEGRARCM_LICENSE = BSD-3-Clause / NVIDIA Software License (src/miniloader)
TEGRARCM_LICENSE_FILES = LICENSE
TEGRARCM_AUTORECONF = YES
HOST_TEGRARCM_DEPENDENCIES = host-libusb host-pkgconf host-cryptopp
diff --git a/package/ti-utils/ti-utils.mk b/package/ti-utils/ti-utils.mk
index cfb0cb8..7304808 100644
--- a/package/ti-utils/ti-utils.mk
+++ b/package/ti-utils/ti-utils.mk
@@ -7,7 +7,7 @@
TI_UTILS_VERSION = 06dbdb2727354b5f3ad7c723897f40051fddee49
TI_UTILS_SITE = $(call github,gxk,ti-utils,$(TI_UTILS_VERSION))
TI_UTILS_DEPENDENCIES = libnl host-pkgconf
-TI_UTILS_LICENSE = BSD-3c
+TI_UTILS_LICENSE = BSD-3-Clause
TI_UTILS_LICENSE_FILES = COPYING
TI_UTILS_CFLAGS = `$(PKG_CONFIG_HOST_BINARY) --cflags libnl-genl-3.0`
diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk
index d44155f..064dfd0 100644
--- a/package/tinyalsa/tinyalsa.mk
+++ b/package/tinyalsa/tinyalsa.mk
@@ -6,7 +6,7 @@
TINYALSA_VERSION = 1.1.0
TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION))
-TINYALSA_LICENSE = BSD-3c
+TINYALSA_LICENSE = BSD-3-Clause
TINYALSA_LICENSE_FILES = NOTICE
TINYALSA_INSTALL_STAGING = YES
diff --git a/package/tor/tor.mk b/package/tor/tor.mk
index 9ccde79..389af66 100644
--- a/package/tor/tor.mk
+++ b/package/tor/tor.mk
@@ -6,7 +6,7 @@
TOR_VERSION = 0.2.9.10
TOR_SITE = https://dist.torproject.org
-TOR_LICENSE = BSD-3c
+TOR_LICENSE = BSD-3-Clause
TOR_LICENSE_FILES = LICENSE
TOR_DEPENDENCIES = libevent openssl zlib
TOR_AUTORECONF = YES
diff --git a/package/tremor/tremor.mk b/package/tremor/tremor.mk
index 2a791b6..05996e2 100644
--- a/package/tremor/tremor.mk
+++ b/package/tremor/tremor.mk
@@ -7,7 +7,7 @@
TREMOR_SITE = http://svn.xiph.org/trunk/Tremor
TREMOR_SITE_METHOD = svn
TREMOR_VERSION = 19427
-TREMOR_LICENSE = BSD-3c
+TREMOR_LICENSE = BSD-3-Clause
TREMOR_LICENSE_FILES = COPYING
TREMOR_AUTORECONF = YES
diff --git a/package/trousers/trousers.mk b/package/trousers/trousers.mk
index 41129eb..e6d564a 100644
--- a/package/trousers/trousers.mk
+++ b/package/trousers/trousers.mk
@@ -6,7 +6,7 @@
TROUSERS_VERSION = 0.3.13
TROUSERS_SITE = http://downloads.sourceforge.net/project/trousers/trousers/$(TROUSERS_VERSION)
-TROUSERS_LICENSE = BSD-3c
+TROUSERS_LICENSE = BSD-3-Clause
TROUSERS_LICENSE_FILES = LICENSE
TROUSERS_INSTALL_STAGING = YES
# Need autoreconf because of a patch touching configure.in and Makefile.am
diff --git a/package/unionfs/unionfs.mk b/package/unionfs/unionfs.mk
index 4281e84..e8b2953 100644
--- a/package/unionfs/unionfs.mk
+++ b/package/unionfs/unionfs.mk
@@ -7,7 +7,7 @@
UNIONFS_VERSION = 2.0
UNIONFS_SITE = $(call github,rpodgorny,unionfs-fuse,v$(UNIONFS_VERSION))
UNIONFS_DEPENDENCIES = libfuse host-pkgconf
-UNIONFS_LICENSE = BSD-3c
+UNIONFS_LICENSE = BSD-3-Clause
UNIONFS_LICENSE_FILES = LICENSE
$(eval $(cmake-package))
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 6989749..b9c4bb0 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -14,7 +14,7 @@ UTIL_LINUX_AUTORECONF = YES
# README.licensing claims that some files are GPLv2-only, but this is not true.
# Some files are GPLv3+ but only in tests.
-UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4c, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid)
+UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4c, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid)
UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3
UTIL_LINUX_INSTALL_STAGING = YES
UTIL_LINUX_DEPENDENCIES = host-pkgconf
diff --git a/package/vboot-utils/vboot-utils.mk b/package/vboot-utils/vboot-utils.mk
index a7592d6..9879dba 100644
--- a/package/vboot-utils/vboot-utils.mk
+++ b/package/vboot-utils/vboot-utils.mk
@@ -7,7 +7,7 @@
VBOOT_UTILS_VERSION = bbdd62f9b030db7ad8eef789aaf58a7ff9a25656
VBOOT_UTILS_SITE = https://chromium.googlesource.com/chromiumos/platform/vboot_reference
VBOOT_UTILS_SITE_METHOD = git
-VBOOT_UTILS_LICENSE = BSD-3c
+VBOOT_UTILS_LICENSE = BSD-3-Clause
VBOOT_UTILS_LICENSE_FILES = LICENSE
HOST_VBOOT_UTILS_DEPENDENCIES = host-openssl host-util-linux host-pkgconf
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
index ed59b6d..e2ec124 100644
--- a/package/vde2/vde2.mk
+++ b/package/vde2/vde2.mk
@@ -7,7 +7,7 @@
VDE2_VERSION = 2.3.2
VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
-VDE2_LICENSE = GPL-2.0+, LGPL-2.1+, BSD-3c
+VDE2_LICENSE = GPL-2.0+, LGPL-2.1+, BSD-3-Clause
VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
VDE2_INSTALL_STAGING = YES
diff --git a/package/wavpack/wavpack.mk b/package/wavpack/wavpack.mk
index a613506..485213a 100644
--- a/package/wavpack/wavpack.mk
+++ b/package/wavpack/wavpack.mk
@@ -9,7 +9,7 @@ WAVPACK_SITE = http://www.wavpack.com
WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.bz2
WAVPACK_INSTALL_STAGING = YES
WAVPACK_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv)
-WAVPACK_LICENSE = BSD-3c
+WAVPACK_LICENSE = BSD-3-Clause
WAVPACK_LICENSE_FILES = COPYING
# Fetch patch from upstream to remove wchar dependency
diff --git a/package/webp/webp.mk b/package/webp/webp.mk
index d579d56..7cf3df2 100644
--- a/package/webp/webp.mk
+++ b/package/webp/webp.mk
@@ -7,7 +7,7 @@
WEBP_VERSION = 0.5.2
WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz
WEBP_SITE = http://downloads.webmproject.org/releases/webp
-WEBP_LICENSE = BSD-3c
+WEBP_LICENSE = BSD-3-Clause
WEBP_LICENSE_FILES = COPYING
WEBP_INSTALL_STAGING = YES
diff --git a/package/webrtc-audio-processing/webrtc-audio-processing.mk b/package/webrtc-audio-processing/webrtc-audio-processing.mk
index 75e3c88..668e20d 100644
--- a/package/webrtc-audio-processing/webrtc-audio-processing.mk
+++ b/package/webrtc-audio-processing/webrtc-audio-processing.mk
@@ -8,7 +8,7 @@ WEBRTC_AUDIO_PROCESSING_VERSION = 0.3
WEBRTC_AUDIO_PROCESSING_SOURCE = webrtc-audio-processing-$(WEBRTC_AUDIO_PROCESSING_VERSION).tar.xz
WEBRTC_AUDIO_PROCESSING_SITE = http://freedesktop.org/software/pulseaudio/webrtc-audio-processing
WEBRTC_AUDIO_PROCESSING_INSTALL_STAGING = YES
-WEBRTC_AUDIO_PROCESSING_LICENSE = BSD-3c
+WEBRTC_AUDIO_PROCESSING_LICENSE = BSD-3-Clause
WEBRTC_AUDIO_PROCESSING_LICENSE_FILES = COPYING
# 0001-configure.ac-fix-architecture-detection.patch
# 0002-Proper-detection-of-cxxabi.h-and-execinfo.h.patch
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 9c8414b..6658662 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -6,7 +6,7 @@
WPA_SUPPLICANT_VERSION = 2.6
WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
-WPA_SUPPLICANT_LICENSE = BSD-3c
+WPA_SUPPLICANT_LICENSE = BSD-3-Clause
WPA_SUPPLICANT_LICENSE_FILES = README
WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config
WPA_SUPPLICANT_SUBDIR = wpa_supplicant
diff --git a/package/xdotool/xdotool.mk b/package/xdotool/xdotool.mk
index a799ea4..c18885c 100644
--- a/package/xdotool/xdotool.mk
+++ b/package/xdotool/xdotool.mk
@@ -6,7 +6,7 @@
XDOTOOL_VERSION = v3.20150503.1
XDOTOOL_SITE = $(call github,jordansissel,xdotool,$(XDOTOOL_VERSION))
-XDOTOOL_LICENSE = BSD-3c
+XDOTOOL_LICENSE = BSD-3-Clause
XDOTOOL_LICENSE_FILES = COPYRIGHT
XDOTOOL_DEPENDENCIES = xlib_libXtst xlib_libXinerama libxkbcommon xlib_libX11
diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk
index babf2dd..23eeae0 100644
--- a/package/yasm/yasm.mk
+++ b/package/yasm/yasm.mk
@@ -6,7 +6,7 @@
YASM_VERSION = 1.3.0
YASM_SITE = http://www.tortall.net/projects/yasm/releases
-YASM_LICENSE = BSD-2c, BSD-3c, Artistic, GPL-2.0, LGPL-2.0
+YASM_LICENSE = BSD-2c, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0
YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0
# This sed prevents it compiling 2 programs (vsyasm and ytasm)
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 10/21] boot, package: use SPDX short identifier for BSD-2c
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (8 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 09/21] boot, package: use SPDX short identifier for BSD-3c Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 11/21] package: use SPDX short identifier for BSD-4c Rahul Bedarkar
` (12 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for BSD-2c is BSD-2-Clause.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/BSD-2c/BSD-2-Clause/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
boot/ts4800-mbrboot/ts4800-mbrboot.mk | 2 +-
package/atf/atf.mk | 2 +-
package/b43-fwcutter/b43-fwcutter.mk | 2 +-
package/bmon/bmon.mk | 2 +-
package/botan/botan.mk | 2 +-
package/bsdiff/bsdiff.mk | 2 +-
package/celt051/celt051.mk | 2 +-
package/dhcpcd/dhcpcd.mk | 2 +-
package/dhcpdump/dhcpdump.mk | 2 +-
package/dos2unix/dos2unix.mk | 2 +-
package/dropbear/dropbear.mk | 2 +-
package/dtc/dtc.mk | 2 +-
package/efl/efl.mk | 2 +-
package/enlightenment/enlightenment.mk | 2 +-
package/expedite/expedite.mk | 2 +-
package/fastd/fastd.mk | 2 +-
package/ficl/ficl.mk | 2 +-
package/file/file.mk | 2 +-
package/freeradius-client/freeradius-client.mk | 2 +-
package/iperf3/iperf3.mk | 2 +-
package/jemalloc/jemalloc.mk | 2 +-
package/jimtcl/jimtcl.mk | 2 +-
package/leptonica/leptonica.mk | 2 +-
package/libarchive/libarchive.mk | 2 +-
package/libcoap/libcoap.mk | 2 +-
package/libcue/libcue.mk | 2 +-
package/libdmtx/libdmtx.mk | 2 +-
package/libev/libev.mk | 2 +-
package/libite/libite.mk | 2 +-
package/libjson/libjson.mk | 2 +-
package/liblogging/liblogging.mk | 2 +-
package/libnet/libnet.mk | 2 +-
package/libopenh264/libopenh264.mk | 2 +-
package/libsamplerate/libsamplerate.mk | 2 +-
package/libscrypt/libscrypt.mk | 2 +-
package/libucl/libucl.mk | 2 +-
package/libuecc/libuecc.mk | 2 +-
package/libuv/libuv.mk | 2 +-
package/linenoise/linenoise.mk | 2 +-
package/lz4/lz4.mk | 2 +-
package/mpdecimal/mpdecimal.mk | 2 +-
package/nasm/nasm.mk | 2 +-
package/nginx-dav-ext/nginx-dav-ext.mk | 2 +-
package/nginx/nginx.mk | 2 +-
package/openjpeg/openjpeg.mk | 2 +-
package/openntpd/openntpd.mk | 2 +-
package/openpowerlink/openpowerlink.mk | 2 +-
package/openssh/openssh.mk | 2 +-
package/opus-tools/opus-tools.mk | 2 +-
package/orc/orc.mk | 2 +-
package/php-gnupg/php-gnupg.mk | 2 +-
package/protobuf-c/protobuf-c.mk | 2 +-
package/ptpd2/ptpd2.mk | 2 +-
package/python-docutils/python-docutils.mk | 2 +-
package/python-flup/python-flup.mk | 2 +-
package/python-futures/python-futures.mk | 2 +-
package/python-pyasn-modules/python-pyasn-modules.mk | 2 +-
package/python-pyasn/python-pyasn.mk | 2 +-
package/python-pygments/python-pygments.mk | 2 +-
package/python-xlsxwriter/python-xlsxwriter.mk | 2 +-
package/qemu/qemu.mk | 2 +-
package/qlibc/qlibc.mk | 2 +-
package/qt5/qt5webkit/qt5webkit.mk | 2 +-
package/rabbitmq-server/rabbitmq-server.mk | 2 +-
package/ruby/ruby.mk | 2 +-
package/scrypt/scrypt.mk | 2 +-
package/slirp/slirp.mk | 2 +-
package/sphinxbase/sphinxbase.mk | 2 +-
package/swig/swig.mk | 2 +-
package/terminology/terminology.mk | 2 +-
package/thttpd/thttpd.mk | 2 +-
package/udpcast/udpcast.mk | 2 +-
package/usbmount/usbmount.mk | 2 +-
package/ustr/ustr.mk | 2 +-
package/valijson/valijson.mk | 2 +-
package/webkitgtk/webkitgtk.mk | 2 +-
package/x11r7/xfont_font-util/xfont_font-util.mk | 2 +-
package/xxhash/xxhash.mk | 2 +-
package/yasm/yasm.mk | 2 +-
79 files changed, 79 insertions(+), 79 deletions(-)
diff --git a/boot/ts4800-mbrboot/ts4800-mbrboot.mk b/boot/ts4800-mbrboot/ts4800-mbrboot.mk
index 9862092..3dde6c6 100644
--- a/boot/ts4800-mbrboot/ts4800-mbrboot.mk
+++ b/boot/ts4800-mbrboot/ts4800-mbrboot.mk
@@ -6,7 +6,7 @@
TS4800_MBRBOOT_VERSION = cf8f7072ed5a4a4e48fcb9841b2e31e519ec5dca
TS4800_MBRBOOT_SITE = $(call github,embeddedarm,ts4800-mbrboot,$(TS4800_MBRBOOT_VERSION))
-TS4800_MBRBOOT_LICENSE = BSD-2c
+TS4800_MBRBOOT_LICENSE = BSD-2-Clause
TS4800_MBRBOOT_LICENSE_FILES = LICENSE
TS4800_MBRBOOT_INSTALL_IMAGES = YES
diff --git a/package/atf/atf.mk b/package/atf/atf.mk
index 8eef1a8..9630cf1 100644
--- a/package/atf/atf.mk
+++ b/package/atf/atf.mk
@@ -7,7 +7,7 @@
ATF_VERSION = 0.21
ATF_SITE = https://github.com/jmmv/atf/releases/download/atf-$(ATF_VERSION)
ATF_INSTALL_STAGING = YES
-ATF_LICENSE = BSD-2c, BSD-3-Clause
+ATF_LICENSE = BSD-2-Clause, BSD-3-Clause
ATF_LICENSE_FILES = COPYING
# Ships a beta libtool version hence our patch doesn't apply.
ATF_AUTORECONF = YES
diff --git a/package/b43-fwcutter/b43-fwcutter.mk b/package/b43-fwcutter/b43-fwcutter.mk
index d264b64..2d024f6 100644
--- a/package/b43-fwcutter/b43-fwcutter.mk
+++ b/package/b43-fwcutter/b43-fwcutter.mk
@@ -7,7 +7,7 @@
B43_FWCUTTER_VERSION = 015
B43_FWCUTTER_SITE = http://bues.ch/b43/fwcutter
B43_FWCUTTER_SOURCE = b43-fwcutter-$(B43_FWCUTTER_VERSION).tar.bz2
-B43_FWCUTTER_LICENSE = BSD-2c
+B43_FWCUTTER_LICENSE = BSD-2-Clause
B43_FWCUTTER_LICENSE_FILES = COPYING
define HOST_B43_FWCUTTER_BUILD_CMDS
diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk
index 32889a6..84dab70 100644
--- a/package/bmon/bmon.mk
+++ b/package/bmon/bmon.mk
@@ -8,7 +8,7 @@ BMON_VERSION = 4.0
BMON_SITE = https://github.com/tgraf/bmon/releases/download/v$(BMON_VERSION)
BMON_DEPENDENCIES = host-pkgconf libconfuse libnl ncurses
BMON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-BMON_LICENSE = BSD-2c, MIT
+BMON_LICENSE = BSD-2-Clause, MIT
BMON_LICENSE_FILES = LICENSE.BSD LICENSE.MIT
# link dynamically unless explicitly requested otherwise
diff --git a/package/botan/botan.mk b/package/botan/botan.mk
index 94f1edd..7694b8d 100644
--- a/package/botan/botan.mk
+++ b/package/botan/botan.mk
@@ -7,7 +7,7 @@
BOTAN_VERSION = 1.10.13
BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tgz
BOTAN_SITE = http://botan.randombit.net/releases
-BOTAN_LICENSE = BSD-2c
+BOTAN_LICENSE = BSD-2-Clause
BOTAN_LICENSE_FILES = doc/license.txt
BOTAN_INSTALL_STAGING = YES
diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk
index eb903e0..9030284 100644
--- a/package/bsdiff/bsdiff.mk
+++ b/package/bsdiff/bsdiff.mk
@@ -7,7 +7,7 @@
BSDIFF_VERSION = 4.3
BSDIFF_SITE = http://www.daemonology.net/bsdiff
BSDIFF_DEPENDENCIES = bzip2
-BSDIFF_LICENSE = BSD-2c
+BSDIFF_LICENSE = BSD-2-Clause
BSDIFF_LICENSE_FILES = bsdiff.c
define BSDIFF_BUILD_CMDS
diff --git a/package/celt051/celt051.mk b/package/celt051/celt051.mk
index 9e25781..6074c49 100644
--- a/package/celt051/celt051.mk
+++ b/package/celt051/celt051.mk
@@ -9,7 +9,7 @@
CELT051_VERSION = 0.5.1.3
CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz
CELT051_SITE = http://downloads.xiph.org/releases/celt
-CELT051_LICENSE = BSD-2c
+CELT051_LICENSE = BSD-2-Clause
CELT051_LICENSE_FILES = COPYING
CELT051_INSTALL_STAGING = YES
CELT051_DEPENDENCIES = libogg
diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index 2d446fb..1d29cda 100644
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -8,7 +8,7 @@ DHCPCD_VERSION = 6.11.5
DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz
DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
DHCPCD_DEPENDENCIES = host-pkgconf
-DHCPCD_LICENSE = BSD-2c
+DHCPCD_LICENSE = BSD-2-Clause
DHCPCD_LICENSE_FILES = dhcpcd.c
ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk
index 3584f4f..96f2319 100644
--- a/package/dhcpdump/dhcpdump.mk
+++ b/package/dhcpdump/dhcpdump.mk
@@ -7,7 +7,7 @@
DHCPDUMP_VERSION = 1.8
DHCPDUMP_SITE = http://www.mavetju.org/download
DHCPDUMP_DEPENDENCIES = libpcap
-DHCPDUMP_LICENSE = BSD-2c
+DHCPDUMP_LICENSE = BSD-2-Clause
DHCPDUMP_LICENSE_FILES = LICENSE
DHCPDUMP_LIBS = -lpcap
diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk
index df2094e..3540ec8 100644
--- a/package/dos2unix/dos2unix.mk
+++ b/package/dos2unix/dos2unix.mk
@@ -6,7 +6,7 @@
DOS2UNIX_VERSION = 7.3.4
DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix
-DOS2UNIX_LICENSE = BSD-2c
+DOS2UNIX_LICENSE = BSD-2-Clause
DOS2UNIX_LICENSE_FILES = COPYING.txt
DOS2UNIX_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 743d524..a4e2272 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -7,7 +7,7 @@
DROPBEAR_VERSION = 2016.74
DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
-DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c
+DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause
DROPBEAR_LICENSE_FILES = LICENSE
DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp
DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS)
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
index 8643849..5bb2ca2 100644
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -7,7 +7,7 @@
DTC_VERSION = 1.4.1
DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz
DTC_SITE = https://www.kernel.org/pub/software/utils/dtc
-DTC_LICENSE = GPL-2.0+ or BSD-2c (library)
+DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library)
DTC_LICENSE_FILES = README.license GPL
DTC_INSTALL_STAGING = YES
DTC_DEPENDENCIES = host-bison host-flex
diff --git a/package/efl/efl.mk b/package/efl/efl.mk
index a3443ad..3644000 100644
--- a/package/efl/efl.mk
+++ b/package/efl/efl.mk
@@ -7,7 +7,7 @@
EFL_VERSION = 1.18.4
EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
EFL_SITE = http://download.enlightenment.org/rel/libs/efl
-EFL_LICENSE = BSD-2c, LGPL-2.1+, GPL-2.0+
+EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+
EFL_LICENSE_FILES = \
COMPLIANCE \
COPYING \
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
index 0899890..7bfc25b 100644
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -7,7 +7,7 @@
ENLIGHTENMENT_VERSION = 0.21.7
ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
-ENLIGHTENMENT_LICENSE = BSD-2c
+ENLIGHTENMENT_LICENSE = BSD-2-Clause
ENLIGHTENMENT_LICENSE_FILES = COPYING
ENLIGHTENMENT_DEPENDENCIES = \
diff --git a/package/expedite/expedite.mk b/package/expedite/expedite.mk
index 0b2901d..c18d32b 100644
--- a/package/expedite/expedite.mk
+++ b/package/expedite/expedite.mk
@@ -7,7 +7,7 @@
EXPEDITE_VERSION = ffa005ea3de26b4219f32c285cb1665bb1366163
EXPEDITE_SITE = http://git.enlightenment.org/tools/expedite.git
EXPEDITE_SITE_METHOD = git
-EXPEDITE_LICENSE = BSD-2c
+EXPEDITE_LICENSE = BSD-2-Clause
EXPEDITE_LICENSE_FILES = COPYING
EXPEDITE_DEPENDENCIES = host-efl host-pkgconf efl
diff --git a/package/fastd/fastd.mk b/package/fastd/fastd.mk
index 0e510db..e67acdb 100644
--- a/package/fastd/fastd.mk
+++ b/package/fastd/fastd.mk
@@ -7,7 +7,7 @@
FASTD_VERSION = 18
FASTD_SITE = https://projects.universe-factory.net/attachments/download/86
FASTD_SOURCE = fastd-$(FASTD_VERSION).tar.xz
-FASTD_LICENSE = BSD-2c
+FASTD_LICENSE = BSD-2-Clause
FASTD_LICENSE_FILES = COPYRIGHT
FASTD_CONF_OPTS = -DENABLE_LIBSODIUM=ON
FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium libcap
diff --git a/package/ficl/ficl.mk b/package/ficl/ficl.mk
index 65df146..5d2d600 100644
--- a/package/ficl/ficl.mk
+++ b/package/ficl/ficl.mk
@@ -7,7 +7,7 @@
FICL_VERSION_MAJOR = 4.1
FICL_VERSION = $(FICL_VERSION_MAJOR).0
FICL_SITE = http://downloads.sourceforge.net/project/ficl/ficl-all/ficl$(FICL_VERSION_MAJOR)
-FICL_LICENSE = BSD-2c
+FICL_LICENSE = BSD-2-Clause
FICL_LICENSE_FILES = ReadMe.txt
FICL_INSTALL_STAGING = YES
diff --git a/package/file/file.mk b/package/file/file.mk
index 48c1e9f..00fdcce 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -10,7 +10,7 @@ FILE_DEPENDENCIES = host-file zlib
HOST_FILE_DEPENDENCIES = host-zlib
FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
FILE_INSTALL_STAGING = YES
-FILE_LICENSE = BSD-2c, BSD-4c (one file), BSD-3-Clause (one file)
+FILE_LICENSE = BSD-2-Clause, BSD-4c (one file), BSD-3-Clause (one file)
FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c
$(eval $(autotools-package))
diff --git a/package/freeradius-client/freeradius-client.mk b/package/freeradius-client/freeradius-client.mk
index 0ed7fbe..981ed16 100644
--- a/package/freeradius-client/freeradius-client.mk
+++ b/package/freeradius-client/freeradius-client.mk
@@ -6,7 +6,7 @@
FREERADIUS_CLIENT_VERSION = 1.1.7
FREERADIUS_CLIENT_SITE = ftp://ftp.freeradius.org/pub/freeradius
-FREERADIUS_CLIENT_LICENSE = BSD-2c
+FREERADIUS_CLIENT_LICENSE = BSD-2-Clause
FREERADIUS_CLIENT_LICENSE_FILES = COPYRIGHT
FREERADIUS_CLIENT_INSTALL_STAGING = YES
diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk
index aaf68b3..b07cd21 100644
--- a/package/iperf3/iperf3.mk
+++ b/package/iperf3/iperf3.mk
@@ -7,7 +7,7 @@
IPERF3_VERSION = 3.1.5
IPERF3_SITE = http://downloads.es.net/pub/iperf
IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz
-IPERF3_LICENSE = BSD-3-Clause, BSD-2c, MIT
+IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT
IPERF3_LICENSE_FILES = LICENSE
IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
diff --git a/package/jemalloc/jemalloc.mk b/package/jemalloc/jemalloc.mk
index f1c9ffe..975d319 100644
--- a/package/jemalloc/jemalloc.mk
+++ b/package/jemalloc/jemalloc.mk
@@ -7,7 +7,7 @@
JEMALLOC_VERSION = 4.2.1
JEMALLOC_SOURCE = jemalloc-$(JEMALLOC_VERSION).tar.bz2
JEMALLOC_SITE = http://www.canonware.com/download/jemalloc
-JEMALLOC_LICENSE = BSD-2c
+JEMALLOC_LICENSE = BSD-2-Clause
JEMALLOC_LICENSE_FILES = COPYING
JEMALLOC_INSTALL_STAGING = YES
diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk
index 1c1a6b8..78517c4 100644
--- a/package/jimtcl/jimtcl.mk
+++ b/package/jimtcl/jimtcl.mk
@@ -8,7 +8,7 @@ JIMTCL_VERSION = 0.75
JIMTCL_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/j/jimtcl
JIMTCL_SOURCE = jimtcl_$(JIMTCL_VERSION).orig.tar.xz
JIMTCL_INSTALL_STAGING = YES
-JIMTCL_LICENSE = BSD-2c
+JIMTCL_LICENSE = BSD-2-Clause
JIMTCL_LICENSE_FILES = LICENSE
JIMTCL_HEADERS_TO_INSTALL = \
diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk
index aa8274d..11680e1 100644
--- a/package/leptonica/leptonica.mk
+++ b/package/leptonica/leptonica.mk
@@ -6,7 +6,7 @@
LEPTONICA_VERSION = 1.74.1
LEPTONICA_SITE = http://www.leptonica.org/source
-LEPTONICA_LICENSE = BSD-2c
+LEPTONICA_LICENSE = BSD-2-Clause
LEPTONICA_LICENSE_FILES = leptonica-license.txt
LEPTONICA_INSTALL_STAGING = YES
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
index 0ad9489..9956b63 100644
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -7,7 +7,7 @@
LIBARCHIVE_VERSION = 3.2.1
LIBARCHIVE_SITE = http://www.libarchive.org/downloads
LIBARCHIVE_INSTALL_STAGING = YES
-LIBARCHIVE_LICENSE = BSD-2c, BSD-3-Clause
+LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause
LIBARCHIVE_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y)
diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk
index 03aabec..fb5d2bf 100644
--- a/package/libcoap/libcoap.mk
+++ b/package/libcoap/libcoap.mk
@@ -7,7 +7,7 @@
LIBCOAP_VERSION = c909bf802034b7762a2182848304b2530e58444f
LIBCOAP_SITE = $(call github,obgm,libcoap,$(LIBCOAP_VERSION))
LIBCOAP_INSTALL_STAGING = YES
-LIBCOAP_LICENSE = GPL-2.0+ or BSD-2c
+LIBCOAP_LICENSE = GPL-2.0+ or BSD-2-Clause
LIBCOAP_LICENSE_FILES = COPYING LICENSE.GPL LICENSE.BSD
LIBCOAP_CONF_OPTS = --disable-examples
LIBCOAP_AUTORECONF = YES
diff --git a/package/libcue/libcue.mk b/package/libcue/libcue.mk
index e6ee7fe..3aa3b48 100644
--- a/package/libcue/libcue.mk
+++ b/package/libcue/libcue.mk
@@ -6,7 +6,7 @@
LIBCUE_VERSION = v1.4.0
LIBCUE_SITE = $(call github,lipnitsk,libcue,$(LIBCUE_VERSION))
-LIBCUE_LICENSE = GPL-2.0, BSD-2c (rem.c)
+LIBCUE_LICENSE = GPL-2.0, BSD-2-Clause (rem.c)
LIBCUE_LICENSE_FILES = COPYING
LIBCUE_DEPENDENCIES = host-bison host-flex flex
LIBCUE_INSTALL_STAGING = YES
diff --git a/package/libdmtx/libdmtx.mk b/package/libdmtx/libdmtx.mk
index 146534e..f718b13 100644
--- a/package/libdmtx/libdmtx.mk
+++ b/package/libdmtx/libdmtx.mk
@@ -6,7 +6,7 @@
LIBDMTX_VERSION = 0.7.4
LIBDMTX_SITE = http://downloads.sourceforge.net/project/libdmtx/libdmtx/$(LIBDMTX_VERSION)
-LIBDMTX_LICENSE = BSD-2c or Special Permission
+LIBDMTX_LICENSE = BSD-2-Clause or Special Permission
LIBDMTX_LICENSE_FILES = LICENSE
LIBDMTX_INSTALL_STAGING = YES
diff --git a/package/libev/libev.mk b/package/libev/libev.mk
index 390cc83..2e3ed45 100644
--- a/package/libev/libev.mk
+++ b/package/libev/libev.mk
@@ -7,7 +7,7 @@
LIBEV_VERSION = 4.22
LIBEV_SITE = http://dist.schmorp.de/libev
LIBEV_INSTALL_STAGING = YES
-LIBEV_LICENSE = BSD-2c or GPL-2.0+
+LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+
LIBEV_LICENSE_FILES = LICENSE
# The 'compatibility' event.h header conflicts with libevent
diff --git a/package/libite/libite.mk b/package/libite/libite.mk
index b56c430..56b0d5c 100644
--- a/package/libite/libite.mk
+++ b/package/libite/libite.mk
@@ -6,7 +6,7 @@
LIBITE_VERSION = v1.8.2
LIBITE_SITE = $(call github,troglobit,libite,$(LIBITE_VERSION))
-LIBITE_LICENSE = MIT, X11, ISC, BSD-2c
+LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause
LIBITE_LICENSE_FILES = LICENSE chomp.c pidfile.c
LIBITE_INSTALL_STAGING = YES
LIBITE_AUTORECONF = YES
diff --git a/package/libjson/libjson.mk b/package/libjson/libjson.mk
index c73a69f..74224ba 100644
--- a/package/libjson/libjson.mk
+++ b/package/libjson/libjson.mk
@@ -8,7 +8,7 @@ LIBJSON_VERSION = 7.6.1
LIBJSON_SITE = http://downloads.sourceforge.net/project/libjson
LIBJSON_SOURCE = libjson_$(LIBJSON_VERSION).zip
LIBJSON_INSTALL_STAGING = YES
-LIBJSON_LICENSE = BSD-2c
+LIBJSON_LICENSE = BSD-2-Clause
LIBJSON_LICENSE_FILES = License.txt
LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG
diff --git a/package/liblogging/liblogging.mk b/package/liblogging/liblogging.mk
index 9ef2e28..ec57a0a 100644
--- a/package/liblogging/liblogging.mk
+++ b/package/liblogging/liblogging.mk
@@ -6,7 +6,7 @@
LIBLOGGING_VERSION = 1.0.5
LIBLOGGING_SITE = http://download.rsyslog.com/liblogging
-LIBLOGGING_LICENSE = BSD-2c
+LIBLOGGING_LICENSE = BSD-2-Clause
LIBLOGGING_LICENSE_FILES = COPYING
LIBLOGGING_INSTALL_STAGING = YES
LIBLOGGING_CONF_OPTS = --enable-cached-man-pages
diff --git a/package/libnet/libnet.mk b/package/libnet/libnet.mk
index d5d7b9f..9661068 100644
--- a/package/libnet/libnet.mk
+++ b/package/libnet/libnet.mk
@@ -9,7 +9,7 @@ LIBNET_SITE = http://sourceforge.net/projects/libnet-dev/files
LIBNET_INSTALL_STAGING = YES
# PF_PACKET is always available on Linux
LIBNET_CONF_OPTS = libnet_cv_have_packet_socket=yes
-LIBNET_LICENSE = BSD-2c, BSD-3-Clause
+LIBNET_LICENSE = BSD-2-Clause, BSD-3-Clause
LIBNET_LICENSE_FILES = doc/COPYING
$(eval $(autotools-package))
diff --git a/package/libopenh264/libopenh264.mk b/package/libopenh264/libopenh264.mk
index 40bbf80..feead5b 100644
--- a/package/libopenh264/libopenh264.mk
+++ b/package/libopenh264/libopenh264.mk
@@ -6,7 +6,7 @@
LIBOPENH264_VERSION = v1.6.0
LIBOPENH264_SITE = $(call github,cisco,openh264,$(LIBOPENH264_VERSION))
-LIBOPENH264_LICENSE = BSD-2c
+LIBOPENH264_LICENSE = BSD-2-Clause
LIBOPENH264_LICENSE_FILES = LICENSE
LIBOPENH264_INSTALL_STAGING = YES
diff --git a/package/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk
index 802b5b1..76e93f9 100644
--- a/package/libsamplerate/libsamplerate.mk
+++ b/package/libsamplerate/libsamplerate.mk
@@ -9,7 +9,7 @@ LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC
LIBSAMPLERATE_INSTALL_STAGING = YES
LIBSAMPLERATE_DEPENDENCIES = host-pkgconf
LIBSAMPLERATE_CONF_OPTS = --disable-fftw --program-transform-name=''
-LIBSAMPLERATE_LICENSE = BSD-2c
+LIBSAMPLERATE_LICENSE = BSD-2-Clause
LIBSAMPLERATE_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
diff --git a/package/libscrypt/libscrypt.mk b/package/libscrypt/libscrypt.mk
index a0dcce0..6086ea9 100644
--- a/package/libscrypt/libscrypt.mk
+++ b/package/libscrypt/libscrypt.mk
@@ -6,7 +6,7 @@
LIBSCRYPT_VERSION = v1.21
LIBSCRYPT_SITE = $(call github,technion,libscrypt,$(LIBSCRYPT_VERSION))
-LIBSCRYPT_LICENSE = BSD-2c
+LIBSCRYPT_LICENSE = BSD-2-Clause
LIBSCRYPT_LICENSE_FILES = LICENSE
LIBSCRYPT_INSTALL_STAGING = YES
diff --git a/package/libucl/libucl.mk b/package/libucl/libucl.mk
index 3530bbe..39a7ed3 100644
--- a/package/libucl/libucl.mk
+++ b/package/libucl/libucl.mk
@@ -8,7 +8,7 @@ LIBUCL_VERSION = 0.7.3
LIBUCL_SITE = $(call github,vstakhov,libucl,$(LIBUCL_VERSION))
LIBUCL_INSTALL_STAGING = YES
LIBUCL_AUTORECONF = YES
-LIBUCL_LICENSE = BSD-2c
+LIBUCL_LICENSE = BSD-2-Clause
LIBUCL_LICENSE_FILES = COPYING
LIBUCL_DEPENDENCIES = host-pkgconf
diff --git a/package/libuecc/libuecc.mk b/package/libuecc/libuecc.mk
index 87ca2e4..aad26e5 100644
--- a/package/libuecc/libuecc.mk
+++ b/package/libuecc/libuecc.mk
@@ -7,7 +7,7 @@
LIBUECC_VERSION = 7
LIBUECC_SITE = https://projects.universe-factory.net/attachments/download/85
LIBUECC_SOURCE = libuecc-$(LIBUECC_VERSION).tar.xz
-LIBUECC_LICENSE = BSD-2c
+LIBUECC_LICENSE = BSD-2-Clause
LIBUECC_LICENSE_FILES = COPYRIGHT
LIBUECC_INSTALL_STAGING = YES
diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk
index eed81fe..33525ff 100644
--- a/package/libuv/libuv.mk
+++ b/package/libuv/libuv.mk
@@ -9,7 +9,7 @@ LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION))
LIBUV_DEPENDENCIES = host-pkgconf
LIBUV_INSTALL_STAGING = YES
LIBUV_AUTORECONF = YES
-LIBUV_LICENSE = BSD-2c, BSD-3-Clause, ISC, MIT
+LIBUV_LICENSE = BSD-2-Clause, BSD-3-Clause, ISC, MIT
LIBUV_LICENSE_FILES = LICENSE
# Upstream needs tests to be run sequentially. This is the default in
diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk
index 64a7b7c..f51e287 100644
--- a/package/linenoise/linenoise.mk
+++ b/package/linenoise/linenoise.mk
@@ -6,7 +6,7 @@
LINENOISE_VERSION = 1.0
LINENOISE_SITE = $(call github,antirez,linenoise,$(LINENOISE_VERSION))
-LINENOISE_LICENSE = BSD-2c
+LINENOISE_LICENSE = BSD-2-Clause
LINENOISE_LICENSE_FILES = LICENSE
LINENOISE_INSTALL_STAGING = YES
# Static library only, nothing to install on target
diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk
index 8316a88..d350d4c 100644
--- a/package/lz4/lz4.mk
+++ b/package/lz4/lz4.mk
@@ -7,7 +7,7 @@
LZ4_VERSION = v1.7.5
LZ4_SITE = $(call github,lz4,lz4,$(LZ4_VERSION))
LZ4_INSTALL_STAGING = YES
-LZ4_LICENSE = BSD-2c (library), GPL-2.0+ (programs)
+LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs)
LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING
ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk
index 9b13def..5e0929e 100644
--- a/package/mpdecimal/mpdecimal.mk
+++ b/package/mpdecimal/mpdecimal.mk
@@ -7,7 +7,7 @@
MPDECIMAL_SITE = http://www.bytereef.org/software/mpdecimal/releases
MPDECIMAL_VERSION = 2.4.1
MPDECIMAL_INSTALL_STAGING = YES
-MPDECIMAL_LICENSE = BSD-2c
+MPDECIMAL_LICENSE = BSD-2-Clause
MPDECIMAL_LICENSE_FILES = LICENSE.txt
MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)"
MPDECIMAL_AUTORECONF = YES
diff --git a/package/nasm/nasm.mk b/package/nasm/nasm.mk
index f5d9ea0..8afd320 100644
--- a/package/nasm/nasm.mk
+++ b/package/nasm/nasm.mk
@@ -7,7 +7,7 @@
NASM_VERSION = 2.12.02
NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz
NASM_SITE = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)
-NASM_LICENSE = BSD-2c
+NASM_LICENSE = BSD-2-Clause
NASM_LICENSE_FILES = LICENSE
$(eval $(host-autotools-package))
diff --git a/package/nginx-dav-ext/nginx-dav-ext.mk b/package/nginx-dav-ext/nginx-dav-ext.mk
index 61e5bd0..1ba6e10 100644
--- a/package/nginx-dav-ext/nginx-dav-ext.mk
+++ b/package/nginx-dav-ext/nginx-dav-ext.mk
@@ -6,7 +6,7 @@
NGINX_DAV_EXT_VERSION = v0.0.3
NGINX_DAV_EXT_SITE = $(call github,arut,nginx-dav-ext-module,$(NGINX_DAV_EXT_VERSION))
-NGINX_DAV_EXT_LICENSE = BSD-2c
+NGINX_DAV_EXT_LICENSE = BSD-2-Clause
NGINX_DAV_EXT_LICENSE_FILES = ngx_http_dav_ext_module.c
NGINX_DAV_EXT_DEPENDENCIES = expat
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index f9b2cd1..88afc94 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -6,7 +6,7 @@
NGINX_VERSION = 1.10.3
NGINX_SITE = http://nginx.org/download
-NGINX_LICENSE = BSD-2c
+NGINX_LICENSE = BSD-2-Clause
NGINX_LICENSE_FILES = LICENSE
NGINX_DEPENDENCIES = host-pkgconf
diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk
index ca22068..6f8b263 100644
--- a/package/openjpeg/openjpeg.mk
+++ b/package/openjpeg/openjpeg.mk
@@ -6,7 +6,7 @@
OPENJPEG_VERSION = 2.1.2
OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION))
-OPENJPEG_LICENSE = BSD-2c
+OPENJPEG_LICENSE = BSD-2-Clause
OPENJPEG_LICENSE_FILES = LICENSE
OPENJPEG_INSTALL_STAGING = YES
diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk
index 648427a..021a393 100644
--- a/package/openntpd/openntpd.mk
+++ b/package/openntpd/openntpd.mk
@@ -6,7 +6,7 @@
OPENNTPD_VERSION = 6.0p1
OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD
-OPENNTPD_LICENSE = MIT-like, BSD-2c, BSD-3-Clause
+OPENNTPD_LICENSE = MIT-like, BSD-2-Clause, BSD-3-Clause
OPENNTPD_LICENSE_FILES = COPYING
# Ships a beta libtool version hence our patch doesn't apply.
OPENNTPD_AUTORECONF = YES
diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk
index a3fbd18..06846ee 100644
--- a/package/openpowerlink/openpowerlink.mk
+++ b/package/openpowerlink/openpowerlink.mk
@@ -7,7 +7,7 @@
OPENPOWERLINK_VERSION = V2.5.0
OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/$(OPENPOWERLINK_VERSION)
OPENPOWERLINK_SOURCE = openPOWERLINK_$(OPENPOWERLINK_VERSION).tar.gz
-OPENPOWERLINK_LICENSE = BSD-2c, GPL-2.0
+OPENPOWERLINK_LICENSE = BSD-2-Clause, GPL-2.0
OPENPOWERLINK_LICENSE_FILES = license.md
OPENPOWERLINK_INSTALL_STAGING = YES
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
index 362bbb1..f971e99 100644
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -6,7 +6,7 @@
OPENSSH_VERSION = 7.5p1
OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
-OPENSSH_LICENSE = BSD-3-Clause, BSD-2c, Public Domain
+OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain
OPENSSH_LICENSE_FILES = LICENCE
OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
OPENSSH_CONF_OPTS = \
diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk
index de1b439..9b3953c 100644
--- a/package/opus-tools/opus-tools.mk
+++ b/package/opus-tools/opus-tools.mk
@@ -6,7 +6,7 @@
OPUS_TOOLS_VERSION = 0.1.9
OPUS_TOOLS_SITE = http://downloads.xiph.org/releases/opus
-OPUS_TOOLS_LICENSE = BSD-2c
+OPUS_TOOLS_LICENSE = BSD-2-Clause
OPUS_TOOLS_LICENSE_FILES = COPYING
OPUS_TOOLS_CONF_OPTS = --disable-oggtest --disable-opustest
OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf
diff --git a/package/orc/orc.mk b/package/orc/orc.mk
index 5c8d4f7..8e2b39a 100644
--- a/package/orc/orc.mk
+++ b/package/orc/orc.mk
@@ -7,7 +7,7 @@
ORC_VERSION = 0.4.26
ORC_SOURCE = orc-$(ORC_VERSION).tar.xz
ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc
-ORC_LICENSE = BSD-2c, BSD-3-Clause
+ORC_LICENSE = BSD-2-Clause, BSD-3-Clause
ORC_LICENSE_FILES = COPYING
ORC_INSTALL_STAGING = YES
ORC_DEPENDENCIES = host-orc
diff --git a/package/php-gnupg/php-gnupg.mk b/package/php-gnupg/php-gnupg.mk
index c1c6680..e595cd3 100644
--- a/package/php-gnupg/php-gnupg.mk
+++ b/package/php-gnupg/php-gnupg.mk
@@ -10,7 +10,7 @@ PHP_GNUPG_SITE = $(call github,Sean-Der,pecl-encryption-gnupg,$(PHP_GNUPG_VERSIO
PHP_GNUPG_DEPENDENCIES = php libgpgme host-autoconf host-pkgconf
PHP_GNUPG_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--with-gnupg=$(STAGING_DIR)/usr/include --with-gpg=/usr/bin/gpg
-PHP_GNUPG_LICENSE = BSD-2c
+PHP_GNUPG_LICENSE = BSD-2-Clause
PHP_GNUPG_LICENSE_FILES = LICENSE
define PHP_GNUPG_PHPIZE
diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk
index ee4500e..391b310 100644
--- a/package/protobuf-c/protobuf-c.mk
+++ b/package/protobuf-c/protobuf-c.mk
@@ -11,7 +11,7 @@ HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf
PROTOBUF_C_MAKE = $(MAKE1)
PROTOBUF_C_CONF_OPTS = --disable-protoc
PROTOBUF_C_INSTALL_STAGING = YES
-PROTOBUF_C_LICENSE = BSD-2c
+PROTOBUF_C_LICENSE = BSD-2-Clause
PROTOBUF_C_LICENSE_FILES = LICENSE
PROTOBUF_C_AUTORECONF = YES
HOST_PROTOBUF_C_AUTORECONF = YES
diff --git a/package/ptpd2/ptpd2.mk b/package/ptpd2/ptpd2.mk
index d53b135..d95d415 100644
--- a/package/ptpd2/ptpd2.mk
+++ b/package/ptpd2/ptpd2.mk
@@ -10,7 +10,7 @@ PTPD2_DEPENDENCIES = libpcap
PTPD2_CONF_OPTS = --with-pcap-config=$(STAGING_DIR)/usr/bin/pcap-config
# configure not shipped
PTPD2_AUTORECONF = YES
-PTPD2_LICENSE = BSD-2c
+PTPD2_LICENSE = BSD-2-Clause
PTPD2_LICENSE_FILES = COPYRIGHT
ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/package/python-docutils/python-docutils.mk b/package/python-docutils/python-docutils.mk
index 544165a..a42b34b 100644
--- a/package/python-docutils/python-docutils.mk
+++ b/package/python-docutils/python-docutils.mk
@@ -7,7 +7,7 @@
PYTHON_DOCUTILS_VERSION = 0.13.1
PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz
PYTHON_DOCUTILS_SITE = https://pypi.python.org/packages/05/25/7b5484aca5d46915493f1fd4ecb63c38c333bd32aa9ad6e19da8d08895ae
-PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2c, GPL-3.0 (emacs mode), other
+PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other
PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt
PYTHON_DOCUTILS_SETUP_TYPE = distutils
diff --git a/package/python-flup/python-flup.mk b/package/python-flup/python-flup.mk
index edcff2a..26d5938 100644
--- a/package/python-flup/python-flup.mk
+++ b/package/python-flup/python-flup.mk
@@ -8,7 +8,7 @@ PYTHON_FLUP_VERSION = 1.0.3.dev20161029
PYTHON_FLUP_SOURCE = flup-$(PYTHON_FLUP_VERSION).tar.gz
PYTHON_FLUP_SITE = https://pypi.python.org/packages/17/33/36768930a5ffe4f294ed3987c631bfd3fddb4f9e5e46bc8dc30fd731dbcd
-PYTHON_FLUP_LICENSE = BSD-2c, MIT
+PYTHON_FLUP_LICENSE = BSD-2-Clause, MIT
PYTHON_FLUP_SETUP_TYPE = setuptools
diff --git a/package/python-futures/python-futures.mk b/package/python-futures/python-futures.mk
index 8a1afa3..fabfa6a 100644
--- a/package/python-futures/python-futures.mk
+++ b/package/python-futures/python-futures.mk
@@ -8,7 +8,7 @@ PYTHON_FUTURES_VERSION = 3.0.5
PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz
PYTHON_FUTURES_SITE = https://pypi.python.org/packages/55/db/97c1ca37edab586a1ae03d6892b6633d8eaa23b23ac40c7e5bbc55423c78
PYTHON_FUTURES_SETUP_TYPE = setuptools
-PYTHON_FUTURES_LICENSE = BSD-2c
+PYTHON_FUTURES_LICENSE = BSD-2-Clause
PYTHON_FUTURES_LICENSE_FILES = LICENSE
$(eval $(python-package))
diff --git a/package/python-pyasn-modules/python-pyasn-modules.mk b/package/python-pyasn-modules/python-pyasn-modules.mk
index bb32227..4e8f9b9 100644
--- a/package/python-pyasn-modules/python-pyasn-modules.mk
+++ b/package/python-pyasn-modules/python-pyasn-modules.mk
@@ -7,7 +7,7 @@
PYTHON_PYASN_MODULES_VERSION = 0.0.8
PYTHON_PYASN_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN_MODULES_VERSION).tar.gz
PYTHON_PYASN_MODULES_SITE = http://pypi.python.org/packages/source/p/pyasn1-modules
-PYTHON_PYASN_MODULES_LICENSE = BSD-2c
+PYTHON_PYASN_MODULES_LICENSE = BSD-2-Clause
PYTHON_PYASN_MODULES_LICENSE_FILES = LICENSE.txt
PYTHON_PYASN_MODULES_SETUP_TYPE = setuptools
diff --git a/package/python-pyasn/python-pyasn.mk b/package/python-pyasn/python-pyasn.mk
index 80d18cd..255341f 100644
--- a/package/python-pyasn/python-pyasn.mk
+++ b/package/python-pyasn/python-pyasn.mk
@@ -7,7 +7,7 @@
PYTHON_PYASN_VERSION = 0.1.9
PYTHON_PYASN_SOURCE = pyasn1-$(PYTHON_PYASN_VERSION).tar.gz
PYTHON_PYASN_SITE = https://pypi.python.org/packages/source/p/pyasn1
-PYTHON_PYASN_LICENSE = BSD-2c
+PYTHON_PYASN_LICENSE = BSD-2-Clause
PYTHON_PYASN_LICENSE_FILES = LICENSE.txt
PYTHON_PYASN_SETUP_TYPE = distutils
diff --git a/package/python-pygments/python-pygments.mk b/package/python-pygments/python-pygments.mk
index 9a7b848..6e7eae6 100644
--- a/package/python-pygments/python-pygments.mk
+++ b/package/python-pygments/python-pygments.mk
@@ -7,7 +7,7 @@
PYTHON_PYGMENTS_VERSION = 2.2.0
PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz
PYTHON_PYGMENTS_SITE = https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a
-PYTHON_PYGMENTS_LICENSE = BSD-2c
+PYTHON_PYGMENTS_LICENSE = BSD-2-Clause
PYTHON_PYGMENTS_LICENSE_FILES = LICENSE
PYTHON_PYGMENTS_SETUP_TYPE = setuptools
diff --git a/package/python-xlsxwriter/python-xlsxwriter.mk b/package/python-xlsxwriter/python-xlsxwriter.mk
index 3a08dd4..2c86e5d 100644
--- a/package/python-xlsxwriter/python-xlsxwriter.mk
+++ b/package/python-xlsxwriter/python-xlsxwriter.mk
@@ -8,7 +8,7 @@ PYTHON_XLSXWRITER_VERSION = 0.9.6
PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz
PYTHON_XLSXWRITER_SITE = https://pypi.python.org/packages/c9/e0/c2b2f57bf53c84af3d2a41a82af7025828cb2bc8a312848a6ab7d018de56
PYTHON_XLSXWRITER_SETUP_TYPE = setuptools
-PYTHON_XLSXWRITER_LICENSE = BSD-2c
+PYTHON_XLSXWRITER_LICENSE = BSD-2-Clause
PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt
$(eval $(python-package))
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 649f060..2b6aafb 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -7,7 +7,7 @@
QEMU_VERSION = 2.8.0
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
QEMU_SITE = http://wiki.qemu.org/download
-QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2c, Others/BSD-1c
+QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
QEMU_LICENSE_FILES = COPYING COPYING.LIB
#?NOTE: there is no top-level license file for non-(L)GPL licenses;
# the non-(L)GPL license texts are specified in the affected
diff --git a/package/qlibc/qlibc.mk b/package/qlibc/qlibc.mk
index a146fa3..55c7aa3 100644
--- a/package/qlibc/qlibc.mk
+++ b/package/qlibc/qlibc.mk
@@ -6,7 +6,7 @@
QLIBC_VERSION = v2.4.1
QLIBC_SITE = $(call github,wolkykim,qlibc,$(QLIBC_VERSION))
-QLIBC_LICENSE = BSD-2c
+QLIBC_LICENSE = BSD-2-Clause
QLIBC_LICENSE_FILES = LICENSE
# We're patching configure.ac
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 3849959..295d24d 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -15,7 +15,7 @@ QT5WEBKIT_INSTALL_STAGING = YES
QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2c
+QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause
# Source files contain references to LGPL_EXCEPTION.txt but it is not included
# in the archive.
QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk
index d55a8cc..ac76939 100644
--- a/package/rabbitmq-server/rabbitmq-server.mk
+++ b/package/rabbitmq-server/rabbitmq-server.mk
@@ -7,7 +7,7 @@
RABBITMQ_SERVER_VERSION = 3.6.6
RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION)
RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz
-RABBITMQ_SERVER_LICENSE = MPLv1.1, Apache-2.0, BSD-2c, EPL, MIT, MPLv2.0
+RABBITMQ_SERVER_LICENSE = MPLv1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPLv2.0
RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \
LICENSE LICENSE-APACHE2-ExplorerCanvas \
LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 32ab79c..3302811 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -17,7 +17,7 @@ HOST_RUBY_CONF_OPTS = \
--disable-install-doc \
--with-out-ext=curses,openssl,readline \
--without-gmp
-RUBY_LICENSE = Ruby or BSD-2c, BSD-3-Clause, others
+RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others
RUBY_LICENSE_FILES = LEGAL COPYING BSDL
RUBY_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/scrypt/scrypt.mk b/package/scrypt/scrypt.mk
index 7ffa7cc..ae5a64e 100644
--- a/package/scrypt/scrypt.mk
+++ b/package/scrypt/scrypt.mk
@@ -7,7 +7,7 @@
SCRYPT_VERSION = 1.2.0
SCRYPT_SOURCE = scrypt-$(SCRYPT_VERSION).tgz
SCRYPT_SITE = http://www.tarsnap.com/scrypt
-SCRYPT_LICENSE = BSD-2c
+SCRYPT_LICENSE = BSD-2-Clause
SCRYPT_LICENSE_FILES = main.c
SCRYPT_DEPENDENCIES = openssl
SCRYPT_INSTALL_STAGING = YES
diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
index be3e72d..dce21ff 100644
--- a/package/slirp/slirp.mk
+++ b/package/slirp/slirp.mk
@@ -9,7 +9,7 @@
# of today)
SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550
SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp
-SLIRP_LICENSE = BSD-4c, BSD-2c
+SLIRP_LICENSE = BSD-4c, BSD-2-Clause
# Note: The license file 'COPYRIGHT' is missing from the sources,
# although some files refer to it.
SLIRP_INSTALL_STAGING = YES
diff --git a/package/sphinxbase/sphinxbase.mk b/package/sphinxbase/sphinxbase.mk
index 5c87c89..86f9089 100644
--- a/package/sphinxbase/sphinxbase.mk
+++ b/package/sphinxbase/sphinxbase.mk
@@ -6,7 +6,7 @@
SPHINXBASE_VERSION = 5prealpha
SPHINXBASE_SITE = http://downloads.sourceforge.net/project/cmusphinx/sphinxbase/5prealpha
-SPHINXBASE_LICENSE = BSD-2c
+SPHINXBASE_LICENSE = BSD-2-Clause
# Note http://sourceforge.net/p/cmusphinx/bugs/441/ "LICENSE file missing in"
# 5prealpha tarballs". The license is contained in the copyright notice at the
# top of each source file. For example:
diff --git a/package/swig/swig.mk b/package/swig/swig.mk
index bf2b19d..740b597 100644
--- a/package/swig/swig.mk
+++ b/package/swig/swig.mk
@@ -12,7 +12,7 @@ HOST_SWIG_CONF_OPTS = \
--without-pcre \
--disable-ccache \
--without-octave
-SWIG_LICENSE = GPL-3.0+, BSD-2c, BSD-3-Clause
+SWIG_LICENSE = GPL-3.0+, BSD-2-Clause, BSD-3-Clause
SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
# CMake looks first at swig3.0, then swig2.0 and then swig. However,
diff --git a/package/terminology/terminology.mk b/package/terminology/terminology.mk
index d7e9827..a62a8e8 100644
--- a/package/terminology/terminology.mk
+++ b/package/terminology/terminology.mk
@@ -7,7 +7,7 @@
TERMINOLOGY_VERSION = 1.0.0
TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz
TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology
-TERMINOLOGY_LICENSE = BSD-2c
+TERMINOLOGY_LICENSE = BSD-2-Clause
TERMINOLOGY_LICENSE_FILES = COPYING
TERMINOLOGY_DEPENDENCIES = efl host-pkgconf
diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk
index 5b4b0c4..f1bee01 100644
--- a/package/thttpd/thttpd.mk
+++ b/package/thttpd/thttpd.mk
@@ -8,7 +8,7 @@ THTTPD_VERSION = 2.25b
THTTPD_SOURCE = thttpd_$(THTTPD_VERSION).orig.tar.gz
THTTPD_PATCH = thttpd_$(THTTPD_VERSION)-11.diff.gz
THTTPD_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/t/thttpd
-THTTPD_LICENSE = BSD-2c
+THTTPD_LICENSE = BSD-2-Clause
THTTPD_LICENSE_FILES = thttpd.c
ifneq ($(THTTPD_PATCH),)
diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index cb81781..e9116d2 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -7,7 +7,7 @@
UDPCAST_VERSION = 20120424
UDPCAST_SITE = http://www.udpcast.linux.lu/download
UDPCAST_DEPENDENCIES = host-m4
-UDPCAST_LICENSE = BSD-2c, GPL-2.0+
+UDPCAST_LICENSE = BSD-2-Clause, GPL-2.0+
UDPCAST_LICENSE_FILES = COPYING
define UDPCAST_REMOVE_UDP_SENDER
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index f69e1f6..9007175 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -8,7 +8,7 @@ USBMOUNT_VERSION = 0.0.22
USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz
USBMOUNT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/u/usbmount
USBMOUNT_DEPENDENCIES = udev lockfile-progs
-USBMOUNT_LICENSE = BSD-2c
+USBMOUNT_LICENSE = BSD-2-Clause
USBMOUNT_LICENSE_FILES = debian/copyright
define USBMOUNT_INSTALL_TARGET_CMDS
diff --git a/package/ustr/ustr.mk b/package/ustr/ustr.mk
index 0051b89..6fca334 100644
--- a/package/ustr/ustr.mk
+++ b/package/ustr/ustr.mk
@@ -9,7 +9,7 @@
USTR_VERSION = 1.0.4
USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2
USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION)
-USTR_LICENSE = BSD-2c, MIT, LGPL-2.0+
+USTR_LICENSE = BSD-2-Clause, MIT, LGPL-2.0+
USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT
USTR_AUTORECONF = YES
USTR_PATCH = \
diff --git a/package/valijson/valijson.mk b/package/valijson/valijson.mk
index e0813b3..71bd6a8 100644
--- a/package/valijson/valijson.mk
+++ b/package/valijson/valijson.mk
@@ -6,7 +6,7 @@
VALIJSON_VERSION = 424b706f990a9eb96dfc19cc8e54f2cd6ce5e186
VALIJSON_SITE = $(call github,tristanpenman,valijson,$(VALIJSON_VERSION))
-VALIJSON_LICENSE = BSD-2c
+VALIJSON_LICENSE = BSD-2-Clause
VALIJSON_LICENSE_FILES = LICENSE
VALIJSON_INSTALL_STAGING = YES
VALIJSON_INSTALL_TARGET = NO
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index 8e253b5..f37aaa6 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -8,7 +8,7 @@ WEBKITGTK_VERSION = 2.12.5
WEBKITGTK_SITE = http://www.webkitgtk.org/releases
WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
WEBKITGTK_INSTALL_STAGING = YES
-WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2c
+WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2-Clause
WEBKITGTK_LICENSE_FILES = \
Source/WebCore/LICENSE-APPLE \
Source/WebCore/LICENSE-LGPL-2.1
diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk
index 3685377..89b138b 100644
--- a/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -7,7 +7,7 @@
XFONT_FONT_UTIL_VERSION = 1.3.1
XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_UTIL_LICENSE = MIT/BSD-2c
+XFONT_FONT_UTIL_LICENSE = MIT/BSD-2-Clause
XFONT_FONT_UTIL_LICENSE_FILES = COPYING
XFONT_FONT_UTIL_DEPENDENCIES = host-pkgconf
diff --git a/package/xxhash/xxhash.mk b/package/xxhash/xxhash.mk
index e38b2dc..7e04066 100644
--- a/package/xxhash/xxhash.mk
+++ b/package/xxhash/xxhash.mk
@@ -6,7 +6,7 @@
XXHASH_VERSION = r40
XXHASH_SITE = $(call github,Cyan4973,xxHash,$(XXHASH_VERSION))
-XXHASH_LICENSE = BSD-2c, GPL-2.0+
+XXHASH_LICENSE = BSD-2-Clause, GPL-2.0+
XXHASH_LICENSE_FILES = LICENSE xxhsum.c
define XXHASH_BUILD_CMDS
diff --git a/package/yasm/yasm.mk b/package/yasm/yasm.mk
index 23eeae0..b294bd3 100644
--- a/package/yasm/yasm.mk
+++ b/package/yasm/yasm.mk
@@ -6,7 +6,7 @@
YASM_VERSION = 1.3.0
YASM_SITE = http://www.tortall.net/projects/yasm/releases
-YASM_LICENSE = BSD-2c, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0
+YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0
YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0
# This sed prevents it compiling 2 programs (vsyasm and ytasm)
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 11/21] package: use SPDX short identifier for BSD-4c
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (9 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 10/21] boot, package: use SPDX short identifier for BSD-2c Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 12/21] package: use SPDX short identifier for Apache version 2 Rahul Bedarkar
` (11 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for BSD-4c is BSD-4-Clause.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/BSD-4c/BSD-4-Clause/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/file/file.mk | 2 +-
package/flite/flite.mk | 2 +-
package/heirloom-mailx/heirloom-mailx.mk | 2 +-
package/iputils/iputils.mk | 2 +-
package/ngrep/ngrep.mk | 2 +-
package/portmap/portmap.mk | 2 +-
package/pppd/pppd.mk | 2 +-
package/python-xlwt/python-xlwt.mk | 2 +-
package/radvd/radvd.mk | 2 +-
package/slirp/slirp.mk | 2 +-
package/util-linux/util-linux.mk | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/package/file/file.mk b/package/file/file.mk
index 00fdcce..1cd09c5 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -10,7 +10,7 @@ FILE_DEPENDENCIES = host-file zlib
HOST_FILE_DEPENDENCIES = host-zlib
FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
FILE_INSTALL_STAGING = YES
-FILE_LICENSE = BSD-2-Clause, BSD-4c (one file), BSD-3-Clause (one file)
+FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file)
FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c
$(eval $(autotools-package))
diff --git a/package/flite/flite.mk b/package/flite/flite.mk
index 611e334..72376e5 100644
--- a/package/flite/flite.mk
+++ b/package/flite/flite.mk
@@ -24,7 +24,7 @@ FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)
# build in flite-1.4-release/
FLITE_STRIP_COMPONENTS = 0
FLITE_SUBDIR = flite-$(FLITE_VERSION)-release
-FLITE_LICENSE = BSD-4c
+FLITE_LICENSE = BSD-4-Clause
FLITE_LICENSE_FILES = $(FLITE_SUBDIR)/COPYING
FLITE_INSTALL_STAGING = YES
diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk
index 044cd8c..f92203e 100644
--- a/package/heirloom-mailx/heirloom-mailx.mk
+++ b/package/heirloom-mailx/heirloom-mailx.mk
@@ -7,7 +7,7 @@
HEIRLOOM_MAILX_VERSION = 12.5
HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx
-HEIRLOOM_MAILX_LICENSE = BSD-4c, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPLv1.1 (nss)
+HEIRLOOM_MAILX_LICENSE = BSD-4-Clause, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPLv1.1 (nss)
HEIRLOOM_MAILX_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index b5f0f26..a3ab836 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -13,7 +13,7 @@
IPUTILS_VERSION = 55828d1fef3fed7f07abcbf7be9282a9662e78c7
IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))
-IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause, BSD-4c
+IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause, BSD-4-Clause
# Only includes a license file for BSD
IPUTILS_LICENSE_FILES = ninfod/COPYING
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
index 8daaf2d..f6238e6 100644
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -7,7 +7,7 @@
NGREP_VERSION = 1.45
NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2
NGREP_SITE = http://downloads.sourceforge.net/project/ngrep/ngrep/$(NGREP_VERSION)
-NGREP_LICENSE = BSD-4c-like
+NGREP_LICENSE = BSD-4-Clause-like
NGREP_LICENSE_FILES = LICENSE.txt
NGREP_INSTALL_STAGING = YES
diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk
index 5caf54c..c3e319b 100644
--- a/package/portmap/portmap.mk
+++ b/package/portmap/portmap.mk
@@ -7,7 +7,7 @@
PORTMAP_VERSION = 6.0
PORTMAP_SOURCE = portmap-$(PORTMAP_VERSION).tgz
PORTMAP_SITE = http://neil.brown.name/portmap
-PORTMAP_LICENSE = BSD-4c (portmap.c) SunRPC License (portmap.c from_local.c)
+PORTMAP_LICENSE = BSD-4-Clause (portmap.c) SunRPC License (portmap.c from_local.c)
PORTMAP_LICENSE_FILES = portmap.c from_local.c
PORTMAP_SBINS = portmap pmap_dump pmap_set
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index f5fb663..6139c5b 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -7,7 +7,7 @@
PPPD_VERSION = 2.4.7
PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
PPPD_SITE = https://download.samba.org/pub/ppp
-PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4c, BSD-3-Clause, GPL-2.0+
+PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+
PPPD_LICENSE_FILES = \
pppd/tdb.c pppd/plugins/pppoatm/COPYING \
pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c
diff --git a/package/python-xlwt/python-xlwt.mk b/package/python-xlwt/python-xlwt.mk
index 0438fc8..f8a298a 100644
--- a/package/python-xlwt/python-xlwt.mk
+++ b/package/python-xlwt/python-xlwt.mk
@@ -8,7 +8,7 @@ PYTHON_XLWT_VERSION = 1.2.0
PYTHON_XLWT_SOURCE = xlwt-$(PYTHON_XLWT_VERSION).tar.gz
PYTHON_XLWT_SITE = https://pypi.python.org/packages/5b/8d/22b9ec552a1d7865de39f54bd15f9db09c72a6bf8ab77b11dcce4ae336bb
PYTHON_XLWT_SETUP_TYPE = setuptools
-PYTHON_XLWT_LICENSE = BSD-3-Clause, BSD-4c
+PYTHON_XLWT_LICENSE = BSD-3-Clause, BSD-4-Clause
PYTHON_XLWT_LICENSE_FILES = docs/licenses.rst
$(eval $(python-package))
diff --git a/package/radvd/radvd.mk b/package/radvd/radvd.mk
index 8b6e5b2..64f755d 100644
--- a/package/radvd/radvd.mk
+++ b/package/radvd/radvd.mk
@@ -11,7 +11,7 @@ RADVD_DEPENDENCIES = host-bison flex host-flex host-pkgconf
RADVD_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
# For 0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch
RADVD_AUTORECONF = YES
-RADVD_LICENSE = BSD-4c-like
+RADVD_LICENSE = BSD-4-Clause-like
RADVD_LICENSE_FILES = COPYRIGHT
define RADVD_INSTALL_INIT_SYSV
diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
index dce21ff..7cfead6 100644
--- a/package/slirp/slirp.mk
+++ b/package/slirp/slirp.mk
@@ -9,7 +9,7 @@
# of today)
SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550
SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp
-SLIRP_LICENSE = BSD-4c, BSD-2-Clause
+SLIRP_LICENSE = BSD-4-Clause, BSD-2-Clause
# Note: The license file 'COPYRIGHT' is missing from the sources,
# although some files refer to it.
SLIRP_INSTALL_STAGING = YES
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index b9c4bb0..70f88a1 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -14,7 +14,7 @@ UTIL_LINUX_AUTORECONF = YES
# README.licensing claims that some files are GPLv2-only, but this is not true.
# Some files are GPLv3+ but only in tests.
-UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4c, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid)
+UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid)
UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3
UTIL_LINUX_INSTALL_STAGING = YES
UTIL_LINUX_DEPENDENCIES = host-pkgconf
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 12/21] package: use SPDX short identifier for Apache version 2
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (10 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 11/21] package: use SPDX short identifier for BSD-4c Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 13/21] package: use SPDX short identifier for MPL family licenses Rahul Bedarkar
` (10 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for Apache version 2 license is Apache-2.0.
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/flickcurl/flickcurl.mk | 2 +-
package/pdbg/pdbg.mk | 2 +-
package/python-pyrex/python-pyrex.mk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/flickcurl/flickcurl.mk b/package/flickcurl/flickcurl.mk
index 0e194e6..610b81f 100644
--- a/package/flickcurl/flickcurl.mk
+++ b/package/flickcurl/flickcurl.mk
@@ -6,7 +6,7 @@
FLICKCURL_VERSION = 1.26
FLICKCURL_SITE = http://download.dajobe.org/flickcurl
-FLICKCURL_LICENSE = LGPL-2.1+ or GPL-2.0+ or Apache 2.0+
+FLICKCURL_LICENSE = LGPL-2.1+ or GPL-2.0+ or Apache-2.0+
FLICKCURL_LICENSE_FILES = COPYING COPYING.LIB LICENSE-2.0.txt LICENSE.html
FLICKCURL_INSTALL_STAGING = YES
FLICKCURL_CONFIG_SCRIPTS = flickcurl-config
diff --git a/package/pdbg/pdbg.mk b/package/pdbg/pdbg.mk
index 9cc05cd..184de86 100644
--- a/package/pdbg/pdbg.mk
+++ b/package/pdbg/pdbg.mk
@@ -6,7 +6,7 @@
PDBG_VERSION = 90a7370a11e727f1482dea6ff2bd6aec20c64805
PDBG_SITE = $(call github,open-power,pdbg,$(PDBG_VERSION))
-PDBG_LICENSE = Apache 2.0
+PDBG_LICENSE = Apache-2.0
PDBG_LICENSE_FILES = COPYING
PDBG_AUTORECONF = YES
diff --git a/package/python-pyrex/python-pyrex.mk b/package/python-pyrex/python-pyrex.mk
index 6ddb2dc..6284a5f 100644
--- a/package/python-pyrex/python-pyrex.mk
+++ b/package/python-pyrex/python-pyrex.mk
@@ -7,7 +7,7 @@
PYTHON_PYREX_VERSION = 0.9.9
PYTHON_PYREX_SOURCE = Pyrex-$(PYTHON_PYREX_VERSION).tar.gz
PYTHON_PYREX_SITE = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex
-PYTHON_PYREX_LICENSE = Apache-v2
+PYTHON_PYREX_LICENSE = Apache-2.0
PYTHON_PYREX_LICENSE_FILES = LICENSE.txt
PYTHON_PYREX_SETUP_TYPE = distutils
HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 13/21] package: use SPDX short identifier for MPL family licenses
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (11 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 12/21] package: use SPDX short identifier for Apache version 2 Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 14/21] package: use SPDX short identifier for GFDL " Rahul Bedarkar
` (9 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for MPLv1.0/MPLv1.1/MPLv2.0 is MPL-1.0/MPL-1.1/
MPL-2.0.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/MPLv([1-2]\.[0-1])/MPL-\1/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/armadillo/armadillo.mk | 2 +-
package/bind/bind.mk | 2 +-
package/ca-certificates/ca-certificates.mk | 2 +-
package/cairo/cairo.mk | 2 +-
package/czmq/czmq.mk | 2 +-
package/filemq/filemq.mk | 2 +-
package/freeswitch/freeswitch.mk | 2 +-
package/heirloom-mailx/heirloom-mailx.mk | 2 +-
package/kmsxx/kmsxx.mk | 2 +-
package/libical/libical.mk | 2 +-
package/libnice/libnice.mk | 2 +-
package/libnspr/libnspr.mk | 2 +-
package/libnss/libnss.mk | 2 +-
package/mp4v2/mp4v2.mk | 2 +-
package/rabbitmq-server/rabbitmq-server.mk | 2 +-
package/tstools/tstools.mk | 2 +-
package/zmqpp/zmqpp.mk | 2 +-
package/zyre/zyre.mk | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/package/armadillo/armadillo.mk b/package/armadillo/armadillo.mk
index 813a41b..714c1b2 100644
--- a/package/armadillo/armadillo.mk
+++ b/package/armadillo/armadillo.mk
@@ -8,7 +8,7 @@ ARMADILLO_VERSION = 6.500.4
ARMADILLO_SITE = http://downloads.sourceforge.net/project/arma
ARMADILLO_DEPENDENCIES = clapack
ARMADILLO_INSTALL_STAGING = YES
-ARMADILLO_LICENSE = MPLv2.0
+ARMADILLO_LICENSE = MPL-2.0
ARMADILLO_LICENSE_FILES = LICENSE.txt
$(eval $(cmake-package))
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
index 860ee9d..37ba17c 100644
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -10,7 +10,7 @@ BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
BIND_MAKE = $(MAKE1)
BIND_INSTALL_STAGING = YES
BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh
-BIND_LICENSE = MPLv2.0
+BIND_LICENSE = MPL-2.0
BIND_LICENSE_FILES = COPYRIGHT
BIND_TARGET_SERVER_SBIN = arpaname ddns-confgen dnssec-checkds dnssec-coverage
BIND_TARGET_SERVER_SBIN += dnssec-importkey dnssec-keygen dnssec-revoke
diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk
index fafc434..199c6b6 100644
--- a/package/ca-certificates/ca-certificates.mk
+++ b/package/ca-certificates/ca-certificates.mk
@@ -12,7 +12,7 @@ CA_CERTIFICATES_DEPENDENCIES = host-openssl
# but it must be at least python 2.7
CA_CERTIFICATES_DEPENDENCIES += \
$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
-CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPLv2.0 (data)
+CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data)
CA_CERTIFICATES_LICENSE_FILES = debian/copyright
define CA_CERTIFICATES_BUILD_CMDS
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 8660b5a..0d62dc3 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -6,7 +6,7 @@
CAIRO_VERSION = 1.14.8
CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
-CAIRO_LICENSE = LGPL-2.1 or MPLv1.1 (library)
+CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library)
CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
CAIRO_SITE = http://cairographics.org/releases
CAIRO_INSTALL_STAGING = YES
diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk
index 8c4de71..5305789 100644
--- a/package/czmq/czmq.mk
+++ b/package/czmq/czmq.mk
@@ -11,7 +11,7 @@ CZMQ_SITE = $(call github,zeromq,czmq,$(CZMQ_VERSION))
CZMQ_AUTORECONF = YES
CZMQ_INSTALL_STAGING = YES
CZMQ_DEPENDENCIES = zeromq host-pkgconf
-CZMQ_LICENSE = MPLv2.0
+CZMQ_LICENSE = MPL-2.0
CZMQ_LICENSE_FILES = LICENSE
# asciidoc is a python script that imports unicodedata, which is not in
diff --git a/package/filemq/filemq.mk b/package/filemq/filemq.mk
index 2eadc5d..581e8a8 100644
--- a/package/filemq/filemq.mk
+++ b/package/filemq/filemq.mk
@@ -11,7 +11,7 @@ FILEMQ_AUTORECONF = YES
FILEMQ_CONF_ENV = filemq_have_asciidoc=no
FILEMQ_INSTALL_STAGING = YES
FILEMQ_DEPENDENCIES = czmq openssl zeromq
-FILEMQ_LICENSE = MPLv2.0
+FILEMQ_LICENSE = MPL-2.0
FILEMQ_LICENSE_FILES = LICENSE
define FILEMQ_CREATE_CONFIG_DIR
diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk
index 4e81854..32439b8 100644
--- a/package/freeswitch/freeswitch.mk
+++ b/package/freeswitch/freeswitch.mk
@@ -7,7 +7,7 @@
FREESWITCH_VERSION = 1.6.15
FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz
FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases
-FREESWITCH_LICENSE = MPLv1.1, \
+FREESWITCH_LICENSE = MPL-1.1, \
GPLv3+ with font exception (fonts), \
Apache-2.0 (apr, apr-util), \
LGPLv2+ (sofia-sip), \
diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk
index f92203e..2f7e635 100644
--- a/package/heirloom-mailx/heirloom-mailx.mk
+++ b/package/heirloom-mailx/heirloom-mailx.mk
@@ -7,7 +7,7 @@
HEIRLOOM_MAILX_VERSION = 12.5
HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx
-HEIRLOOM_MAILX_LICENSE = BSD-4-Clause, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPLv1.1 (nss)
+HEIRLOOM_MAILX_LICENSE = BSD-4-Clause, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPL-1.1 (nss)
HEIRLOOM_MAILX_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/package/kmsxx/kmsxx.mk b/package/kmsxx/kmsxx.mk
index c06d20b..fd7b1a0 100644
--- a/package/kmsxx/kmsxx.mk
+++ b/package/kmsxx/kmsxx.mk
@@ -6,7 +6,7 @@
KMSXX_VERSION = bd5f6471e619a6ba2987bc7f66ef78a531f94d6c
KMSXX_SITE = $(call github,tomba,kmsxx,$(KMSXX_VERSION))
-KMSXX_LICENSE = MPLv2.0
+KMSXX_LICENSE = MPL-2.0
KMSXX_LICENSE_FILES = LICENSE
KMSXX_INSTALL_STAGING = YES
KMSXX_DEPENDENCIES = libdrm host-pkgconf
diff --git a/package/libical/libical.mk b/package/libical/libical.mk
index 3793429..7125aa8 100644
--- a/package/libical/libical.mk
+++ b/package/libical/libical.mk
@@ -7,7 +7,7 @@
LIBICAL_VERSION = 1.0.1
LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_VERSION)
LIBICAL_INSTALL_STAGING = YES
-LIBICAL_LICENSE = MPLv1.0 or LGPL-2.1
+LIBICAL_LICENSE = MPL-1.0 or LGPL-2.1
LIBICAL_LICENSE_FILES = LICENSE
# building without this option is broken, it is used by
diff --git a/package/libnice/libnice.mk b/package/libnice/libnice.mk
index 61cfb24..5ec2b61 100644
--- a/package/libnice/libnice.mk
+++ b/package/libnice/libnice.mk
@@ -6,7 +6,7 @@
LIBNICE_VERSION = 0.1.13
LIBNICE_SITE = http://nice.freedesktop.org/releases
-LIBNICE_LICENSE = MPLv1.1 or LGPL-2.1
+LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1
LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL
LIBNICE_DEPENDENCIES = libglib2 host-pkgconf
LIBNICE_INSTALL_STAGING = YES
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index d95f970..1fc82be 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -10,7 +10,7 @@ LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_
LIBNSPR_SUBDIR = nspr
LIBNSPR_INSTALL_STAGING = YES
LIBNSPR_CONFIG_SCRIPTS = nspr-config
-LIBNSPR_LICENSE = MPLv2.0
+LIBNSPR_LICENSE = MPL-2.0
LIBNSPR_LICENSE_FILES = nspr/LICENSE
# Set the host CFLAGS and LDFLAGS so NSPR does not guess wrongly
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 76532e8..d624cde 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -10,7 +10,7 @@ LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_
LIBNSS_DISTDIR = dist
LIBNSS_INSTALL_STAGING = YES
LIBNSS_DEPENDENCIES = libnspr sqlite zlib
-LIBNSS_LICENSE = MPLv2.0
+LIBNSS_LICENSE = MPL-2.0
LIBNSS_LICENSE_FILES = nss/COPYING
# --gc-sections triggers binutils ld segfault
diff --git a/package/mp4v2/mp4v2.mk b/package/mp4v2/mp4v2.mk
index 2acbb4e..b6b7d9a 100644
--- a/package/mp4v2/mp4v2.mk
+++ b/package/mp4v2/mp4v2.mk
@@ -8,7 +8,7 @@ MP4V2_VERSION = 2.0.0
MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2
MP4V2_SITE = https://mp4v2.googlecode.com/files
MP4V2_INSTALL_STAGING = YES
-MP4V2_LICENSE = MPLv1.1
+MP4V2_LICENSE = MPL-1.1
MP4V2_LICENSE_FILES = COPYING
# help2man expects to be able to run utilities on the build machine to
diff --git a/package/rabbitmq-server/rabbitmq-server.mk b/package/rabbitmq-server/rabbitmq-server.mk
index ac76939..f4671ae 100644
--- a/package/rabbitmq-server/rabbitmq-server.mk
+++ b/package/rabbitmq-server/rabbitmq-server.mk
@@ -7,7 +7,7 @@
RABBITMQ_SERVER_VERSION = 3.6.6
RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION)
RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz
-RABBITMQ_SERVER_LICENSE = MPLv1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPLv2.0
+RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPL-2.0
RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \
LICENSE LICENSE-APACHE2-ExplorerCanvas \
LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \
diff --git a/package/tstools/tstools.mk b/package/tstools/tstools.mk
index 3355db8..99f7ca9 100644
--- a/package/tstools/tstools.mk
+++ b/package/tstools/tstools.mk
@@ -9,7 +9,7 @@ TSTOOLS_VERSION = 08f6be304040e7b84760ac3920bcff4a563b6cd2
TSTOOLS_SITE = $(call github,kynesim,tstools,$(TSTOOLS_VERSION))
# tstools upstream doesn't contain any license file so far. See:
# https://github.com/kynesim/tstools/issues/32
-TSTOOLS_LICENSE = MPLv1.1
+TSTOOLS_LICENSE = MPL-1.1
TSTOOLS_LICENSE_FILES =
define TSTOOLS_BUILD_CMDS
diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk
index 3e35fd7..d651c32 100644
--- a/package/zmqpp/zmqpp.mk
+++ b/package/zmqpp/zmqpp.mk
@@ -8,7 +8,7 @@ ZMQPP_VERSION = 4.1.2
ZMQPP_SITE = $(call github,zeromq,zmqpp,$(ZMQPP_VERSION))
ZMQPP_INSTALL_STAGING = YES
ZMQPP_DEPENDENCIES = zeromq
-ZMQPP_LICENSE = MPLv2.0
+ZMQPP_LICENSE = MPL-2.0
ZMQPP_LICENSE_FILES = LICENSE
ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread
diff --git a/package/zyre/zyre.mk b/package/zyre/zyre.mk
index e47da97..baaa57f 100644
--- a/package/zyre/zyre.mk
+++ b/package/zyre/zyre.mk
@@ -6,7 +6,7 @@
ZYRE_VERSION = 1d949e4bf79b694ea883c325f5813e87ddc2a687
ZYRE_SITE = $(call github,zeromq,zyre,$(ZYRE_VERSION))
-ZYRE_LICENSE = MPLv2.0
+ZYRE_LICENSE = MPL-2.0
ZYRE_LICENSE_FILES = LICENSE
ZYRE_INSTALL_STAGING = YES
ZYRE_DEPENDENCIES = czmq zeromq host-pkgconf
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 14/21] package: use SPDX short identifier for GFDL family licenses
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (12 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 13/21] package: use SPDX short identifier for MPL family licenses Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 15/21] freeswitch: use SPDX short identifier for license strings Rahul Bedarkar
` (8 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for GFDLv1.1/GFDLv1.2/GFDLv1.3 is GFDL-1.1/
GFDL-1.2/GFDL-1.3.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/GFDL(v)?([1]\.[1-3])(\+)?/GFDL-\2\3/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/libcgicc/libcgicc.mk | 2 +-
package/qt5/qt5base/qt5base.mk | 4 ++--
package/qt5/qt5connectivity/qt5connectivity.mk | 4 ++--
package/qt5/qt5declarative/qt5declarative.mk | 4 ++--
package/qt5/qt5enginio/qt5enginio.mk | 2 +-
package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 4 ++--
package/qt5/qt5imageformats/qt5imageformats.mk | 4 ++--
package/qt5/qt5location/qt5location.mk | 4 ++--
package/qt5/qt5multimedia/qt5multimedia.mk | 4 ++--
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 2 +-
package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk | 2 +-
package/qt5/qt5script/qt5script.mk | 2 +-
package/qt5/qt5sensors/qt5sensors.mk | 4 ++--
package/qt5/qt5serialbus/qt5serialbus.mk | 2 +-
package/qt5/qt5serialport/qt5serialport.mk | 4 ++--
package/qt5/qt5svg/qt5svg.mk | 4 ++--
package/qt5/qt5tools/qt5tools.mk | 4 ++--
package/qt5/qt5webchannel/qt5webchannel.mk | 4 ++--
| 4 ++--
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 4 ++--
package/valgrind/valgrind.mk | 2 +-
package/xenomai/xenomai.mk | 2 +-
22 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
index 9657f87..09df3a1 100644
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -7,7 +7,7 @@
LIBCGICC_VERSION = 3.2.16
LIBCGICC_SITE = $(BR2_GNU_MIRROR)/cgicc
LIBCGICC_SOURCE = cgicc-$(LIBCGICC_VERSION).tar.bz2
-LIBCGICC_LICENSE = LGPL-3.0+ (library), GFDL1.2+ (docs)
+LIBCGICC_LICENSE = LGPL-3.0+ (library), GFDL-1.2+ (docs)
LIBCGICC_LICENSE_FILES = COPYING.LIB COPYING.DOC
LIBCGICC_INSTALL_STAGING = YES
LIBCGICC_AUTORECONF = YES
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index d00d8e7..a91c138 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -50,10 +50,10 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index 1cdc9e5..a9518cb 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -12,10 +12,10 @@ QT5CONNECTIVITY_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index faf18ac..c4b3f07 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -12,10 +12,10 @@ QT5DECLARATIVE_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5enginio/qt5enginio.mk b/package/qt5/qt5enginio/qt5enginio.mk
index 46d30de..e550fcc 100644
--- a/package/qt5/qt5enginio/qt5enginio.mk
+++ b/package/qt5/qt5enginio/qt5enginio.mk
@@ -13,7 +13,7 @@ QT5ENGINIO_DEPENDENCIES = openssl qt5base
QT5ENGINIO_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3-Clause (examples)
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index 83e6c15..9354a4d 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -12,10 +12,10 @@ QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index 06797be..5d31e14 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -12,10 +12,10 @@ QT5IMAGEFORMATS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index 16927ae..24b26b2 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -12,10 +12,10 @@ QT5LOCATION_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index e83aae2..e66ce40 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -12,10 +12,10 @@ QT5MULTIMEDIA_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index bf566fc..0f11b79 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -11,7 +11,7 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDLv1.3 (docs)
+QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5QUICKCONTROLS_LICENSE = Commercial license
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index a19a05e..d6c3ee3 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -11,7 +11,7 @@ QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS2_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDLv1.3 (docs)
+QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5QUICKCONTROLS2_LICENSE = Commercial license
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index 7e25eb1..c24ef33 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -11,7 +11,7 @@ QT5SCRIPT_DEPENDENCIES = qt5base
QT5SCRIPT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SCRIPT_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5SCRIPT_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
else
QT5SCRIPT_LICENSE = Commercial license
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index ee8aeba..f73ae5b 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -12,10 +12,10 @@ QT5SENSORS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
index eb9bf65..05ca181 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.mk
+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -11,7 +11,7 @@ QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport
QT5SERIALBUS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDLv1.3 (docs)
+QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
QT5SERIALBUS_LICENSE = Commercial license
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index 49b7271..1a137fd 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -12,10 +12,10 @@ QT5SERIALPORT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index 74bc142..8986332 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -12,10 +12,10 @@ QT5SVG_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
-QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index d02806b..c7d2e8f 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -21,10 +21,10 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
else
-QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index bbd8786..e12e945 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -12,10 +12,10 @@ QT5WEBCHANNEL_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
--git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index b3090cf..7dc371c 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -12,10 +12,10 @@ QT5X11EXTRAS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
else
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 065bf61..123e1ab 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -12,10 +12,10 @@ QT5XMLPATTERNS_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDLv1.3 (docs)
+QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
else
-QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDLv1.3 (docs)
+QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 61f7466..32aeb97 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -7,7 +7,7 @@
VALGRIND_VERSION = 3.12.0
VALGRIND_SITE = http://valgrind.org/downloads
VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
-VALGRIND_LICENSE = GPL-2.0, GFDLv1.2
+VALGRIND_LICENSE = GPL-2.0, GFDL-1.2
VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
VALGRIND_CONF_OPTS = \
--disable-ubsan \
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 1b0b16c..c9e810e 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -13,7 +13,7 @@ endif
XENOMAI_SITE = https://xenomai.org/downloads/xenomai/stable
XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
-XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDLv1.2+ (docs), GPL-2.0 (ipipe patch, can driver)
+XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDL-1.2+ (docs), GPL-2.0 (ipipe patch, can driver)
# GFDL is not included but refers to gnu.org
XENOMAI_LICENSE_FILES = debian/copyright include/COPYING lib/trank/COPYING kernel/cobalt/COPYING
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 15/21] freeswitch: use SPDX short identifier for license strings
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (13 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 14/21] package: use SPDX short identifier for GFDL " Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 22:19 ` Arnout Vandecappelle
2017-03-30 13:43 ` [Buildroot] [PATCH 16/21] package: use SPDX short identifier for AFLv2.1 Rahul Bedarkar
` (7 subsequent siblings)
22 siblings, 1 reply; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/freeswitch/freeswitch.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk
index 32439b8..0ce67f0 100644
--- a/package/freeswitch/freeswitch.mk
+++ b/package/freeswitch/freeswitch.mk
@@ -8,11 +8,11 @@ FREESWITCH_VERSION = 1.6.15
FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz
FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases
FREESWITCH_LICENSE = MPL-1.1, \
- GPLv3+ with font exception (fonts), \
+ GPL-3.0+ with font exception (fonts), \
Apache-2.0 (apr, apr-util), \
- LGPLv2+ (sofia-sip), \
- LGPLv2.1, GPLv2 (spandsp), \
- BSD-3c (libsrtp), \
+ LGPL-2.0+ (sofia-sip), \
+ LGPL-2.1, GPL-2.0 (spandsp), \
+ BSD-3-Clause (libsrtp), \
tiff license
FREESWITCH_LICENSE_FILES = \
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 15/21] freeswitch: use SPDX short identifier for license strings
2017-03-30 13:43 ` [Buildroot] [PATCH 15/21] freeswitch: use SPDX short identifier for license strings Rahul Bedarkar
@ 2017-03-30 22:19 ` Arnout Vandecappelle
2017-03-31 17:37 ` Rahul Bedarkar
2017-04-01 13:46 ` Thomas Petazzoni
0 siblings, 2 replies; 34+ messages in thread
From: Arnout Vandecappelle @ 2017-03-30 22:19 UTC (permalink / raw)
To: buildroot
On 30-03-17 15:43, Rahul Bedarkar wrote:
> Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Quick comment on this one...
First of all, I think it's a very good idea to have first the fully automatic
patches, and then do remaining fixups like this one.
However, I think there is still a lot more to be fixed up. There are also
plenty of places where we refer to (L)GPLv[23] in e.g. comments. So instead of
this patch, I would add a series of patches that uses the same (or maybe
slightly more generic) sed expressions but now doesn't limit to _LICENSE or to
.mk files. I did a quick check, there are about 25 instances of GPLv left, but
you need to filter out patches and _LICENSE_FILES, so perhaps an automatic sed
expression is going to be difficult.
Anyway, my message is: those 25 remaining instances should be replaced as well.
Regards,
Arnout
> ---
> package/freeswitch/freeswitch.mk | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/package/freeswitch/freeswitch.mk b/package/freeswitch/freeswitch.mk
> index 32439b8..0ce67f0 100644
> --- a/package/freeswitch/freeswitch.mk
> +++ b/package/freeswitch/freeswitch.mk
> @@ -8,11 +8,11 @@ FREESWITCH_VERSION = 1.6.15
> FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz
> FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases
> FREESWITCH_LICENSE = MPL-1.1, \
> - GPLv3+ with font exception (fonts), \
> + GPL-3.0+ with font exception (fonts), \
> Apache-2.0 (apr, apr-util), \
> - LGPLv2+ (sofia-sip), \
> - LGPLv2.1, GPLv2 (spandsp), \
> - BSD-3c (libsrtp), \
> + LGPL-2.0+ (sofia-sip), \
> + LGPL-2.1, GPL-2.0 (spandsp), \
> + BSD-3-Clause (libsrtp), \
> tiff license
>
> FREESWITCH_LICENSE_FILES = \
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 34+ messages in thread
* [Buildroot] [PATCH 15/21] freeswitch: use SPDX short identifier for license strings
2017-03-30 22:19 ` Arnout Vandecappelle
@ 2017-03-31 17:37 ` Rahul Bedarkar
2017-04-01 13:46 ` Thomas Petazzoni
1 sibling, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-31 17:37 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, Mar 31, 2017 at 3:49 AM, Arnout Vandecappelle <arnout@mind.be> wrote:
>
>
> On 30-03-17 15:43, Rahul Bedarkar wrote:
>> Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
>
> Quick comment on this one...
>
> First of all, I think it's a very good idea to have first the fully automatic
> patches, and then do remaining fixups like this one.
>
> However, I think there is still a lot more to be fixed up. There are also
> plenty of places where we refer to (L)GPLv[23] in e.g. comments. So instead of
> this patch, I would add a series of patches that uses the same (or maybe
> slightly more generic) sed expressions but now doesn't limit to _LICENSE or to
> .mk files. I did a quick check, there are about 25 instances of GPLv left, but
> you need to filter out patches and _LICENSE_FILES, so perhaps an automatic sed
> expression is going to be difficult.
>
> Anyway, my message is: those 25 remaining instances should be replaced as well.
I was not sure if license strings in comments should be updated to use
SPDX identifier.
May be for consistency it should be ? But it doesn't harm either, so I
will fix those
separately with this one.
Thanks,
Rahul
^ permalink raw reply [flat|nested] 34+ messages in thread
* [Buildroot] [PATCH 15/21] freeswitch: use SPDX short identifier for license strings
2017-03-30 22:19 ` Arnout Vandecappelle
2017-03-31 17:37 ` Rahul Bedarkar
@ 2017-04-01 13:46 ` Thomas Petazzoni
1 sibling, 0 replies; 34+ messages in thread
From: Thomas Petazzoni @ 2017-04-01 13:46 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 31 Mar 2017 00:19:18 +0200, Arnout Vandecappelle wrote:
> First of all, I think it's a very good idea to have first the fully automatic
> patches, and then do remaining fixups like this one.
>
> However, I think there is still a lot more to be fixed up. There are also
> plenty of places where we refer to (L)GPLv[23] in e.g. comments. So instead of
> this patch, I would add a series of patches that uses the same (or maybe
> slightly more generic) sed expressions but now doesn't limit to _LICENSE or to
> .mk files. I did a quick check, there are about 25 instances of GPLv left, but
> you need to filter out patches and _LICENSE_FILES, so perhaps an automatic sed
> expression is going to be difficult.
>
> Anyway, my message is: those 25 remaining instances should be replaced as well.
I've merged Rahul series as-is, and expect to get additional patches
fixing the remaining exceptions here and there. I didn't want to hold
off too long on Rahul series, as it's the stuff that quickly gets out
of date, and gets a lot of conflict when applied.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 34+ messages in thread
* [Buildroot] [PATCH 16/21] package: use SPDX short identifier for AFLv2.1
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (14 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 15/21] freeswitch: use SPDX short identifier for license strings Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 17/21] package: use SPDX short identifier for Boost Software License 1.0 Rahul Bedarkar
` (6 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for AFLv2.1 is AFL-2.1.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/AFLv2.1(\+)?/AFL-2.1\1/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/dbus-glib/dbus-glib.mk | 2 +-
package/dbus/dbus.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
index e14a095..22dcdb1 100644
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -7,7 +7,7 @@
DBUS_GLIB_VERSION = 0.108
DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib
DBUS_GLIB_INSTALL_STAGING = YES
-DBUS_GLIB_LICENSE = AFLv2.1 or GPL-2.0+
+DBUS_GLIB_LICENSE = AFL-2.1 or GPL-2.0+
DBUS_GLIB_LICENSE_FILES = COPYING
DBUS_GLIB_CONF_ENV = \
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index ee8ffe1..52c1912 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -6,7 +6,7 @@
DBUS_VERSION = 1.10.16
DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
-DBUS_LICENSE = AFLv2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools)
+DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools)
DBUS_LICENSE_FILES = COPYING
DBUS_INSTALL_STAGING = YES
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 17/21] package: use SPDX short identifier for Boost Software License 1.0
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (15 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 16/21] package: use SPDX short identifier for AFLv2.1 Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 18/21] packages: use SPDX short identifier for zlib license Rahul Bedarkar
` (5 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for Boost Software License 1.0 is BSL-1.0.
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/boost/boost.mk | 2 +-
package/cppdb/cppdb.mk | 2 +-
package/cryptopp/cryptopp.mk | 2 +-
package/poco/poco.mk | 2 +-
package/rapidxml/rapidxml.mk | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index dbe0f09..874c03f 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -8,7 +8,7 @@ BOOST_VERSION = 1.63.0
BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
BOOST_INSTALL_STAGING = YES
-BOOST_LICENSE = Boost Software License 1.0
+BOOST_LICENSE = BSL-1.0
BOOST_LICENSE_FILES = LICENSE_1_0.txt
# keep host variant as minimal as possible
diff --git a/package/cppdb/cppdb.mk b/package/cppdb/cppdb.mk
index 2c26c90..e73f04e 100644
--- a/package/cppdb/cppdb.mk
+++ b/package/cppdb/cppdb.mk
@@ -9,7 +9,7 @@ CPPDB_SOURCE = cppdb-$(CPPDB_VERSION).tar.bz2
CPPDB_SITE = http://downloads.sourceforge.net/project/cppcms/cppdb/$(CPPDB_VERSION)
CPPDB_INSTALL_STAGING = YES
CPPDB_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite)
-CPPDB_LICENSE = Boost-v1.0 or MIT
+CPPDB_LICENSE = BSL-1.0 or MIT
CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt
ifeq ($(BR2_PACKAGE_MYSQL),y)
diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk
index 456876c..5c5def5 100644
--- a/package/cryptopp/cryptopp.mk
+++ b/package/cryptopp/cryptopp.mk
@@ -7,7 +7,7 @@
CRYPTOPP_VERSION = 5.6.5
CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip
CRYPTOPP_SITE = http://cryptopp.com/
-CRYPTOPP_LICENSE = Boost-v1.0
+CRYPTOPP_LICENSE = BSL-1.0
CRYPTOPP_LICENSE_FILES = License.txt
CRYPTOPP_INSTALL_STAGING = YES
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
index 90dfb34..efb78be 100644
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -6,7 +6,7 @@
POCO_VERSION = poco-1.7.2-release
POCO_SITE = $(call github,pocoproject,poco,$(POCO_VERSION))
-POCO_LICENSE = Boost-v1.0
+POCO_LICENSE = BSL-1.0
POCO_LICENSE_FILES = LICENSE
POCO_INSTALL_STAGING = YES
POCO_PATCH = https://github.com/pocoproject/poco/commit/30159aea4b3f6421da9d74a8bf22aad6d3bf26b4.patch
diff --git a/package/rapidxml/rapidxml.mk b/package/rapidxml/rapidxml.mk
index a76a21b..2bec8fe 100644
--- a/package/rapidxml/rapidxml.mk
+++ b/package/rapidxml/rapidxml.mk
@@ -7,7 +7,7 @@
RAPIDXML_VERSION = 1.13
RAPIDXML_SOURCE = rapidxml-$(RAPIDXML_VERSION).zip
RAPIDXML_SITE = http://downloads.sourceforge.net/project/rapidxml/rapidxml/rapidxml%20$(RAPIDXML_VERSION)
-RAPIDXML_LICENSE = Boost Software License 1.0 or MIT
+RAPIDXML_LICENSE = BSL-1.0 or MIT
RAPIDXML_LICENSE_FILES = license.txt
# C++ headers only
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 18/21] packages: use SPDX short identifier for zlib license
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (16 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 17/21] package: use SPDX short identifier for Boost Software License 1.0 Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 19/21] Makefile: use SPDX short identifier for Buildroot license Rahul Bedarkar
` (4 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for zlib license is Zlib.
This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/zlib( )?(license)?/Zlib/g'
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
package/bullet/bullet.mk | 2 +-
package/libglfw/libglfw.mk | 2 +-
package/minizip/minizip.mk | 2 +-
package/physfs/physfs.mk | 2 +-
package/sdl2/sdl2.mk | 2 +-
package/sdl2_gfx/sdl2_gfx.mk | 2 +-
package/sdl2_image/sdl2_image.mk | 2 +-
package/sdl2_ttf/sdl2_ttf.mk | 2 +-
package/sdl_gfx/sdl_gfx.mk | 2 +-
package/sdl_image/sdl_image.mk | 2 +-
package/sdl_mixer/sdl_mixer.mk | 2 +-
package/sdl_net/sdl_net.mk | 2 +-
package/sdl_ttf/sdl_ttf.mk | 2 +-
package/tinyxml/tinyxml.mk | 2 +-
package/tinyxml2/tinyxml2.mk | 2 +-
package/zlib/zlib.mk | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/package/bullet/bullet.mk b/package/bullet/bullet.mk
index 99ff423..920ea87 100644
--- a/package/bullet/bullet.mk
+++ b/package/bullet/bullet.mk
@@ -7,7 +7,7 @@
BULLET_VERSION = 2.85.1
BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION))
BULLET_INSTALL_STAGING = YES
-BULLET_LICENSE = zlib license
+BULLET_LICENSE = Zlib
BULLET_LICENSE_FILES = LICENSE.txt
# Disable demos apps and unit tests.
diff --git a/package/libglfw/libglfw.mk b/package/libglfw/libglfw.mk
index 0b1730d..1e42404 100644
--- a/package/libglfw/libglfw.mk
+++ b/package/libglfw/libglfw.mk
@@ -9,7 +9,7 @@ LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION))
LIBGLFW_INSTALL_STAGING = YES
LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \
xlib_libXinerama xlib_libXrandr
-LIBGLFW_LICENSE = zlib
+LIBGLFW_LICENSE = Zlib
LIBGLFW_LICENSE_FILES = COPYING.txt
LIBGLFW_CONF_OPTS += \
diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk
index 3d61288..835dfb9 100644
--- a/package/minizip/minizip.mk
+++ b/package/minizip/minizip.mk
@@ -10,7 +10,7 @@ MINIZIP_DEPENDENCIES = zlib
MINIZIP_AUTORECONF = YES
MINIZIP_INSTALL_STAGING = YES
MINIZIP_CONF_OPTS = $(if $(BR2_PACKAGE_MINIZIP_DEMOS),--enable-demos)
-MINIZIP_LICENSE = zlib license
+MINIZIP_LICENSE = Zlib
MINIZIP_LICENSE_FILES = LICENSE
$(eval $(autotools-package))
diff --git a/package/physfs/physfs.mk b/package/physfs/physfs.mk
index c88d7cf..9193ad5 100644
--- a/package/physfs/physfs.mk
+++ b/package/physfs/physfs.mk
@@ -8,7 +8,7 @@ PHYSFS_VERSION = be27dfd07d97336145e7f49d3fd200a6e902f85e
PHYSFS_SITE = https://hg.icculus.org/icculus/physfs
PHYSFS_SITE_METHOD = hg
-PHYSFS_LICENSE = zlib license (physfs), LGPL with exceptions (lzma)
+PHYSFS_LICENSE = Zlib (physfs), LGPL with exceptions (lzma)
PHYSFS_LICENSE_FILES = LICENSE.txt src/lzma/LGPL.txt
PHYSFS_INSTALL_STAGING = YES
diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk
index 628d906..1db4e76 100644
--- a/package/sdl2/sdl2.mk
+++ b/package/sdl2/sdl2.mk
@@ -7,7 +7,7 @@
SDL2_VERSION = 2.0.5
SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
SDL2_SITE = http://www.libsdl.org/release
-SDL2_LICENSE = zlib
+SDL2_LICENSE = Zlib
SDL2_LICENSE_FILES = COPYING.txt
SDL2_INSTALL_STAGING = YES
SDL2_CONFIG_SCRIPTS = sdl2-config
diff --git a/package/sdl2_gfx/sdl2_gfx.mk b/package/sdl2_gfx/sdl2_gfx.mk
index 975bca7..1ec1387 100644
--- a/package/sdl2_gfx/sdl2_gfx.mk
+++ b/package/sdl2_gfx/sdl2_gfx.mk
@@ -7,7 +7,7 @@
SDL2_GFX_VERSION = 1.0.1
SDL2_GFX_SOURCE = SDL2_gfx-$(SDL2_GFX_VERSION).tar.gz
SDL2_GFX_SITE = http://www.ferzkopp.net/Software/SDL2_gfx
-SDL2_GFX_LICENSE = zlib
+SDL2_GFX_LICENSE = Zlib
SDL2_GFX_LICENSE_FILES = COPYING SDL2_framerate.h
SDL2_GFX_INSTALL_STAGING = YES
SDL2_GFX_DEPENDENCIES = sdl2 host-pkgconf
diff --git a/package/sdl2_image/sdl2_image.mk b/package/sdl2_image/sdl2_image.mk
index cf3b738..71a9634 100644
--- a/package/sdl2_image/sdl2_image.mk
+++ b/package/sdl2_image/sdl2_image.mk
@@ -8,7 +8,7 @@ SDL2_IMAGE_VERSION = 2.0.1
SDL2_IMAGE_SOURCE = SDL2_image-$(SDL2_IMAGE_VERSION).tar.gz
SDL2_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release
SDL2_IMAGE_INSTALL_STAGING = YES
-SDL2_IMAGE_LICENSE = zlib
+SDL2_IMAGE_LICENSE = Zlib
SDL2_IMAGE_LICENSE_FILES = COPYING.txt
# Unconditionally enable support for image formats that don't require
diff --git a/package/sdl2_ttf/sdl2_ttf.mk b/package/sdl2_ttf/sdl2_ttf.mk
index 86916c3..dbe30dd 100644
--- a/package/sdl2_ttf/sdl2_ttf.mk
+++ b/package/sdl2_ttf/sdl2_ttf.mk
@@ -7,7 +7,7 @@
SDL2_TTF_VERSION = 2.0.14
SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz
SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release
-SDL2_TTF_LICENSE = zlib
+SDL2_TTF_LICENSE = Zlib
SDL2_TTF_LICENSE_FILES = COPYING.txt
SDL2_TTF_INSTALL_STAGING = YES
SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf
diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
index 7f3a2ff..e7420de 100644
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -8,7 +8,7 @@ SDL_GFX_VERSION_MAJOR = 2.0
SDL_GFX_VERSION = $(SDL_GFX_VERSION_MAJOR).23
SDL_GFX_SOURCE = SDL_gfx-$(SDL_GFX_VERSION).tar.gz
SDL_GFX_SITE = http://www.ferzkopp.net/Software/SDL_gfx-$(SDL_GFX_VERSION_MAJOR)
-SDL_GFX_LICENSE = zlib
+SDL_GFX_LICENSE = Zlib
SDL_GFX_LICENSE_FILES = COPYING LICENSE
SDL_GFX_INSTALL_STAGING = YES
SDL_GFX_DEPENDENCIES = sdl
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index f88aa0e..6ea657b 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -8,7 +8,7 @@ SDL_IMAGE_VERSION = 1.2.12
SDL_IMAGE_SOURCE = SDL_image-$(SDL_IMAGE_VERSION).tar.gz
SDL_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release
SDL_IMAGE_INSTALL_STAGING = YES
-SDL_IMAGE_LICENSE = zlib
+SDL_IMAGE_LICENSE = Zlib
SDL_IMAGE_LICENSE_FILES = COPYING
SDL_IMAGE_CONF_OPTS = \
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
index 897b308..1c6912a 100644
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -7,7 +7,7 @@
SDL_MIXER_VERSION = 1.2.12
SDL_MIXER_SOURCE = SDL_mixer-$(SDL_MIXER_VERSION).tar.gz
SDL_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release
-SDL_MIXER_LICENSE = zlib
+SDL_MIXER_LICENSE = Zlib
SDL_MIXER_LICENSE_FILES = COPYING
SDL_MIXER_INSTALL_STAGING = YES
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
index 4534dee..c7e409a 100644
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -7,7 +7,7 @@
SDL_NET_VERSION = 1.2.8
SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release
SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz
-SDL_NET_LICENSE = zlib
+SDL_NET_LICENSE = Zlib
SDL_NET_LICENSE_FILES = COPYING
SDL_NET_CONF_OPTS = \
diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
index 3e494b4..1d94c6c 100644
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -7,7 +7,7 @@
SDL_TTF_VERSION = 2.0.11
SDL_TTF_SOURCE = SDL_ttf-$(SDL_TTF_VERSION).tar.gz
SDL_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release
-SDL_TTF_LICENSE = zlib
+SDL_TTF_LICENSE = Zlib
SDL_TTF_LICENSE_FILES = COPYING
SDL_TTF_INSTALL_STAGING = YES
diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk
index df7b29f..1528051 100644
--- a/package/tinyxml/tinyxml.mk
+++ b/package/tinyxml/tinyxml.mk
@@ -10,7 +10,7 @@ TINYXML_SITE = http://mirrors.xbmc.org/build-deps/sources
# configure.ac which is not present in mainline.
TINYXML_AUTORECONF = YES
TINYXML_INSTALL_STAGING = YES
-TINYXML_LICENSE = zlib
+TINYXML_LICENSE = Zlib
TINYXML_LICENSE_FILES = README
$(eval $(autotools-package))
diff --git a/package/tinyxml2/tinyxml2.mk b/package/tinyxml2/tinyxml2.mk
index 053e46e..461c36c 100644
--- a/package/tinyxml2/tinyxml2.mk
+++ b/package/tinyxml2/tinyxml2.mk
@@ -6,7 +6,7 @@
TINYXML2_VERSION = 3.0.0
TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION))
-TINYXML2_LICENSE = zlib
+TINYXML2_LICENSE = Zlib
TINYXML2_LICENSE_FILES = readme.md
TINYXML2_INSTALL_STAGING = YES
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index deea5a5..23c6e95 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -7,7 +7,7 @@
ZLIB_VERSION = 1.2.11
ZLIB_SOURCE = zlib-$(ZLIB_VERSION).tar.xz
ZLIB_SITE = http://www.zlib.net
-ZLIB_LICENSE = zlib license
+ZLIB_LICENSE = Zlib
ZLIB_LICENSE_FILES = README
ZLIB_INSTALL_STAGING = YES
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 19/21] Makefile: use SPDX short identifier for Buildroot license
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (17 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 18/21] packages: use SPDX short identifier for zlib license Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 20/21] scripts/scancpan: use SPDX short identifier for license Rahul Bedarkar
` (3 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 886bd96..941bf78 100644
--- a/Makefile
+++ b/Makefile
@@ -736,7 +736,7 @@ legal-info-prepare: $(LEGAL_INFO_DIR)
@$(call legal-license-file,buildroot,COPYING,COPYING,HOST)
@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,TARGET)
@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,HOST)
- @$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved,not saved,HOST)
+ @$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved,HOST)
@$(call legal-warning,the Buildroot source code has not been saved)
@cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 20/21] scripts/scancpan: use SPDX short identifier for license
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (18 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 19/21] Makefile: use SPDX short identifier for Buildroot license Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-30 13:43 ` [Buildroot] [PATCH 21/21] scripts/scanpypi: " Rahul Bedarkar
` (2 subsequent siblings)
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
support/scripts/scancpan | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/scripts/scancpan b/support/scripts/scancpan
index b6123de..8d44ed9 100755
--- a/support/scripts/scancpan
+++ b/support/scripts/scancpan
@@ -688,7 +688,7 @@ while (my ($distname, $dist) = each %dist) {
$license =~ s|artistic_2|Artistic-2.0|;
$license =~ s|mit|MIT|;
$license =~ s|openssl|OpenSSL|;
- $license =~ s|perl_5|Artistic or GPLv1+|;
+ $license =~ s|perl_5|Artistic or GPL-1.0+|;
my $license_files = join q{ }, @{$license_files{$distname}};
say qq{write ${mkname}} unless $quiet;
open my $fh, q{>}, $mkname;
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 21/21] scripts/scanpypi: use SPDX short identifier for license
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (19 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 20/21] scripts/scancpan: use SPDX short identifier for license Rahul Bedarkar
@ 2017-03-30 13:43 ` Rahul Bedarkar
2017-03-31 6:46 ` [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
2017-04-01 13:45 ` Thomas Petazzoni
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-30 13:43 UTC (permalink / raw)
To: buildroot
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
---
support/scripts/scanpypi | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/support/scripts/scanpypi b/support/scripts/scanpypi
index e150ae5..e174ac6 100755
--- a/support/scripts/scanpypi
+++ b/support/scripts/scanpypi
@@ -380,18 +380,18 @@ class BuildrootPackage():
license_dict = {
'Apache Software License': 'Apache-2.0',
'BSD License': 'BSD',
- 'European Union Public Licence 1.0': 'EUPLv1.0',
- 'European Union Public Licence 1.1': 'EUPLv1.1',
+ 'European Union Public Licence 1.0': 'EUPL-1.0',
+ 'European Union Public Licence 1.1': 'EUPL-1.1',
"GNU General Public License": "GPL",
- "GNU General Public License v2": "GPLv2",
- "GNU General Public License v2 or later": "GPLv2+",
- "GNU General Public License v3": "GPLv3",
- "GNU General Public License v3 or later": "GPLv3+",
- "GNU Lesser General Public License v2": "LGPLv2.1",
- "GNU Lesser General Public License v2 or later": "LGPLv2.1+",
- "GNU Lesser General Public License v3": "LGPLv3",
- "GNU Lesser General Public License v3 or later": "LGPLv3+",
- "GNU Library or Lesser General Public License": "LGPLv2",
+ "GNU General Public License v2": "GPL-2.0",
+ "GNU General Public License v2 or later": "GPL-2.0+",
+ "GNU General Public License v3": "GPL-3.0",
+ "GNU General Public License v3 or later": "GPL-3.0+",
+ "GNU Lesser General Public License v2": "LGPL-2.1",
+ "GNU Lesser General Public License v2 or later": "LGPL-2.1+",
+ "GNU Lesser General Public License v3": "LGPL-3.0",
+ "GNU Lesser General Public License v3 or later": "LGPL-3.0+",
+ "GNU Library or Lesser General Public License": "LGPL-2.0",
"ISC License": "ISC",
"MIT License": "MIT",
"Mozilla Public License 1.0": "MPL-1.0",
--
2.6.2
^ permalink raw reply related [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (20 preceding siblings ...)
2017-03-30 13:43 ` [Buildroot] [PATCH 21/21] scripts/scanpypi: " Rahul Bedarkar
@ 2017-03-31 6:46 ` Rahul Bedarkar
2017-04-01 13:45 ` Thomas Petazzoni
22 siblings, 0 replies; 34+ messages in thread
From: Rahul Bedarkar @ 2017-03-31 6:46 UTC (permalink / raw)
To: buildroot
On Thu, Mar 30, 2017 at 7:13 PM, Rahul Bedarkar
<rahulbedarkar89@gmail.com> wrote:
> This patch series aims at using SPDX short identifier as a license
> string for most widely used licenses.
>
> First patch updates documentation to refer to SPDX License List and
> removes current license abbreviations list. Next patches update
> license string in .mk file of packages. In almost all cases, update
> is done using sed command which is mentioned in corresponding patch.
> Finally scancpan and scanpypi scripts are updated to use SPDX short
> identifier.
>
> There might be some licenses, which are rarely used, are not yet
> updated to use SPDX short identifier considering this as a initial
> step to start using SPDX identifier.
>
> Rahul Bedarkar (21):
> docs/manual: refer to SPDX License List
> package: use SPDX short identifier for GPLv1/GPLv1+
> boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+
I received email from buildroot-owner at busybox.net that PATCH 03/21 is being
held until the list moderator can review it for approval because message size is
too big.
Thanks,
Rahul
^ permalink raw reply [flat|nested] 34+ messages in thread* [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string
2017-03-30 13:43 [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
` (21 preceding siblings ...)
2017-03-31 6:46 ` [Buildroot] [PATCH 00/21] Use SPDX short identifier for license string Rahul Bedarkar
@ 2017-04-01 13:45 ` Thomas Petazzoni
22 siblings, 0 replies; 34+ messages in thread
From: Thomas Petazzoni @ 2017-04-01 13:45 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 30 Mar 2017 19:13:29 +0530, Rahul Bedarkar wrote:
> Rahul Bedarkar (21):
> docs/manual: refer to SPDX License List
> package: use SPDX short identifier for GPLv1/GPLv1+
> boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+
> boot, package: use SPDX short identifier for GPLv3/GPLv3+
> boot, package: use SPDX short identifier for LGPLv2.1/LGPLv2.1+
> package: use SPDX short identifier for LGPLv3/LGPLv3+
> package: use SPDX short identifier for AGPLv3
> package: use SPDX short identifier for LGPLv2/LGPLv2+
> boot, package: use SPDX short identifier for BSD-3c
> boot, package: use SPDX short identifier for BSD-2c
> package: use SPDX short identifier for BSD-4c
> package: use SPDX short identifier for Apache version 2
> package: use SPDX short identifier for MPL family licenses
> package: use SPDX short identifier for GFDL family licenses
> freeswitch: use SPDX short identifier for license strings
> package: use SPDX short identifier for AFLv2.1
> package: use SPDX short identifier for Boost Software License 1.0
> packages: use SPDX short identifier for zlib license
> Makefile: use SPDX short identifier for Buildroot license
> scripts/scancpan: use SPDX short identifier for license
> scripts/scanpypi: use SPDX short identifier for license
Thanks, I've applied the entire series. It would be nice to re-do a
final check that no packages merged between the moment you generated
the patch series and the moment was merged is not using bogus license
codes.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 34+ messages in thread