global: convert license to SPDX variants

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

37 files changed, 37 insertions, 37 deletions

diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
index fe802b7..928290f 100644
--- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
+++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."
 HOMEPAGE = "http://www.open-iscsi.org/"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 PR = "r1"
 
 inherit systemd autotools pkgconfig
diff --git a/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb b/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb
index ec84c44..51ce60c 100644
--- a/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb
+++ b/meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Config file parser module"
 HOMEPAGE = "http://search.cpan.org/dist/Config-General/"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
+LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
 SECTION = "libs"
 LIC_FILES_CHKSUM = "file://README;beginline=90;endline=90;md5=3ba4bbac1e79a08332688196f637d2b2"
 
diff --git a/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb b/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb
index b6741af..a3b6853 100644
--- a/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"
 HOMEPAGE = "https://github.com/idan/oauthlib"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5ba9ce41463615e082609806255bce1b"
 
 SRC_URI[md5sum] = "eb60abdb002b9c08d248707b79a1cc92"
diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb
index 2c9378a..d054214 100644
--- a/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb
+++ b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python-PostgreSQL Database Adapter"
 HOMEPAGE = "http://initd.org/psycopg/"
 SECTION = "devel/python"
-LICENSE = "GPLv3+"
+LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=72bded22a37845c7d9dc3fd39d699a2d"
 DEPENDS = "postgresql"
 
diff --git a/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb b/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb
index c1e79a0..3ff818c 100644
--- a/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Lightweight SOAP client"
 HOMEPAGE = "https://fedorahosted.org/suds/"
 SECTION = "devel/python"
-LICENSE = "LGPLv3"
+LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=847e96bce86d8774f491a92924343a29"
 
 PR = "r0"
diff --git a/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb b/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb
index 218d92b..5e7c140 100644
--- a/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python client for the Advanced Message Queuing Procotol (AMQP)"
 HOMEPAGE = "http://code.google.com/p/py-amqplib/"
 SECTION = "devel/python"
-LICENSE = "LGPL-3.0"
+LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1702a92c723f09e3fab3583b165a8d90"
 
 PR = "r1"
diff --git a/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb b/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
index f92f979..614c4eb 100644
--- a/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
+++ b/meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb
@@ -3,7 +3,7 @@ SUMMARY = "Python bindings for the avahi zeroconf client"
 HOMEPAGE = "https://github.com/lathiat/avahi"
 SECTION = "devel/python"
 
-LICENSE = "GPLv2+"
+LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV}.tar.gz"
diff --git a/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb b/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb
index 65e1bbd..e216c8b 100644
--- a/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner."
 HOMEPAGE = "http://docs.openstack.org/developer/debtcollector/"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 SRC_URI[md5sum] = "6ac3af37693e0f517e51593d9ea33f23"
diff --git a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
index 8724bfb..aaa5d68 100644
--- a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "\
   memcached servers. Search google for memcached for more information."
 HOMEPAGE = "https://pypi.python.org/pypi/python-memcached/"
 SECTION = "devel/python"
-LICENSE = "PSF"
+LICENSE = "PSF-2.0"
 LIC_FILES_CHKSUM = "file://PSF.LICENSE;md5=7dd786e8594f1e787da94a946557b40e"
 
 PV = "1.59+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb b/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb
index 2127ccf..765c9b0 100644
--- a/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "Nose plugin that allows you to easily specify directories to be excluded from testing."
 HOMEPAGE = "http://bitbucket.org/kgrandis/nose-exclude"
 SECTION = "devel/python"
-LICENSE = "LGPL-2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
 
 SRC_URI[md5sum] = "072f72e782f28a9c42356976f8ec22d9"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
index 051f23f..abcff6b 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "oslo.concurrency library"
 HOMEPAGE = "http://launchpad.net/oslo"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
 PV = "3.21.2+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
index e86a656..49709d6 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "oslo.i18n library"
 HOMEPAGE = "http://launchpad.net/oslo"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
 PV = "5.0.1+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
index 6fe8544..51b3e7c 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Oslo Middleware library"
 HOMEPAGE = "http://launchpad.net/oslo"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
 PV = "4.1.0+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
index e4df6dd..e567432 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Oslo Policy library"
 DESCRIPTION = "The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
 HOMEPAGE = "https://github.com/openstack/oslo.policy"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 PV = "3.3.0+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
index cdbd381..1b9e493 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "oslo.reports library"
 HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 PV = "2.2.0+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
index a61ff55..b873afd 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Oslo Rootwrap"
 HOMEPAGE = "https://launchpad.net/oslo"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8"
 
 PV = "6.1.0+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
index 4ca31f1..7ea4373 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "oslo.service library"
 HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 PV = "1.25.2"
diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
index 4b4634a..b24158e 100644
--- a/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "oslo.versionedobjects library"
 HOMEPAGE = "https://wiki.openstack.org/wiki/Oslo"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
 PV = "2.3.0+git${SRCPV}"
diff --git a/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb b/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb
index 09b1003..d338a9e 100644
--- a/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Validating URI References per RFC 3986"
 HOMEPAGE = "https://rfc3986.rtfd.org"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=03731a0e7dbcb30cecdcec77cc93ec29"
 
 SRC_URI[md5sum] = "1b03ad2853e33d47eea698571255247c"
diff --git a/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb b/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb
index 929fb50..644c3de 100644
--- a/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb
+++ b/meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "API for Linux kernel SCSI target (aka LIO)"
 HOMEPAGE = "http://github.com/agrover/rtslib-fb"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://PKG-INFO;md5=cf391b108961d84a581f45259ec47c52"
 
 SRC_URI[md5sum] = "85ab011e3a98fb585d8a0fb337c5dab4"
diff --git a/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb b/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb
index 5cff8ee..a590cfb 100644
--- a/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb
+++ b/meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Lightweight SOAP client (Jurko's fork)"
 HOMEPAGE = "https://bitbucket.org/jurko/suds"
 SECTION = "devel/python"
-LICENSE = "LGPLv3"
+LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=847e96bce86d8774f491a92924343a29"
 
 PYPI_PACKAGE_EXT = "tar.bz2"
diff --git a/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb b/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb
index 6c09b94..219e159 100644
--- a/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Build self-validating python objects using JSON schemas"
 HOMEPAGE = "http://github.com/bcwaldon/warlock"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 DEPENDS += "python3-jsonschema python3-jsonpatch"
diff --git a/meta-openstack/recipes-devtools/python/python3-weakrefmethod_1.0.3.bb b/meta-openstack/recipes-devtools/python/python3-weakrefmethod_1.0.3.bb
index fd2c918..445d266 100644
--- a/meta-openstack/recipes-devtools/python/python3-weakrefmethod_1.0.3.bb
+++ b/meta-openstack/recipes-devtools/python/python3-weakrefmethod_1.0.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "A WeakMethod class for storing bound methods using weak references."
 HOMEPAGE = "https://github.com/twang817/weakrefmethod"
 SECTION = "devel/python"
-LICENSE = "PSF"
+LICENSE = "PSF-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03"
 
 SRC_URI[md5sum] = "39e7450191dea0b17a646b929784ac6f"
diff --git a/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb b/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb
index 40b694e..84e3f72 100644
--- a/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "WebSockets support for any application/server"
 HOMEPAGE = "https://github.com/kanaka/websockify"
 SECTION = "devel/python"
-LICENSE = "LGPLv3"
+LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://PKG-INFO;md5=eb81922f483833198eace60f1469f99d"
 
 SRC_URI[md5sum] = "ff745fd67457fd077915753c9b808b2a"
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb
index 2094d62..3c21c79 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "%DESCRIPTION%"
 HOMEPAGE = "%URL%"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 PYPI_PACKAGE = "XStatic-Bootstrap-SCSS"
diff --git a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb
index a853f2c..6c45bc3 100644
--- a/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb
+++ b/meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "%DESCRIPTION%"
 HOMEPAGE = "%URL%"
 SECTION = "devel/python"
-LICENSE = "Apache-2"
+LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://PKG-INFO;md5=7de5500e6244db6d698bbb724aea9a17"
 
 PYPI_PACKAGE = "XStatic-jquery-ui"
diff --git a/meta-openstack/recipes-devtools/ruby/highline_git.bb b/meta-openstack/recipes-devtools/ruby/highline_git.bb
index 5696534..546bfc9 100644
--- a/meta-openstack/recipes-devtools/ruby/highline_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/highline_git.bb
@@ -10,7 +10,7 @@ rules and without needing to convert the typed Strings into what your \
 program really needs. Just tell HighLine what you're after, and let it \
 do all the work."
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=884766faee6a0d2931af978757e1a5fc"
 
 PR = "r0"
diff --git a/meta-openstack/recipes-devtools/ruby/json_git.bb b/meta-openstack/recipes-devtools/ruby/json_git.bb
index 407f812..61655e5 100644
--- a/meta-openstack/recipes-devtools/ruby/json_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/json_git.bb
@@ -4,7 +4,7 @@
 SUMMARY = "An implementation of the JSON specification according to RFC 4627"
 DESCRIPTION = "An implementation of the JSON specification according to RFC 4627"
 
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://CHANGES;md5=af8cad0ff27a1593ac5ee461bc2d71ab"
 
 PR = "r0"
diff --git a/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb b/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb
index 63f8e03..23e326b 100644
--- a/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb
+++ b/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb
@@ -2,7 +2,7 @@ SUMMARY = "An image containing the cirros cloud guest"
 DESCRIPTION = "CirrOS a tiny cloud guest"
 HOMEPAGE = "https://launchpad.net/cirros"
 
-LICENSE="GPLv2"
+LICENSE="GPL-2.0-only"
 
 SRC_URI = "http://download.cirros-cloud.net/${PV}/${PN}-${PV}-x86_64-disk.img"
 
diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb
index 9308d89..6c70370 100644
--- a/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb
+++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Dummy packagegroup to provide virtual/monitoring"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
 inherit packagegroup
diff --git a/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb b/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb
index dac933d..b69b08c 100644
--- a/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb
+++ b/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb
@@ -11,7 +11,7 @@ DESCRIPTION = "\
  where it is running, but from anywhere on the Internet and from a wide \
  variety of machine architectures. \
  "
-LICENSE = "GPLv3 & LGPLv3"
+LICENSE = "GPL-3.0-only & LGPL-3.0-only"
 LIC_FILES_CHKSUM = "\
   file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
   file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02"
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb
index b297c9f..9c5c24b 100644
--- a/meta-openstack/recipes-support/tgt/tgt_git.bb
+++ b/meta-openstack/recipes-support/tgt/tgt_git.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Linux SCSI target framework (tgt)"
 HOMEPAGE = "http://stgt.sourceforge.net"
-LICENSE = "GPLv2"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://scripts/tgtd.spec;beginline=7;endline=7;md5=21c19ea7dad04648b9c2f791b6e29b4c"
 DEPENDS = "sg3-utils libaio"
 
diff --git a/recipes-devtools/python/python-ansible.inc b/recipes-devtools/python/python-ansible.inc
index 2b8d655..0bb663a 100644
--- a/recipes-devtools/python/python-ansible.inc
+++ b/recipes-devtools/python/python-ansible.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Ansible is a simple IT automation platform that makes your applications and systems easier to deploy."
 HOMEPAGE = "https://github.com/ansible/ansible/"
 SECTION = "devel/python"
-LICENSE = "GPLv3"
+LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
 
 SRCNAME = "ansible"
diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index 5c960bc..baa8962 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -22,7 +22,7 @@ SRC_URI += "file://glusterd.init \
             file://0001-cli-duplicate-defns-of-cli_default_conn_timeout-and-.patch \
            "
 
-LICENSE = "(LGPLv3+ | GPLv2) & GPLv3+ & LGPLv3+ & GPLv2+ & LGPLv2+ & LGPLv2.1+ & Apache-2.0"
+LICENSE = "(LGPL-3.0-or-later | GPL-2.0-only) & GPL-3.0-or-later & LGPL-3.0-or-later & GPL-2.0-or-later & LGPL-2.0-or-later & LGPL-2.1-or-later & Apache-2.0"
 LIC_FILES_CHKSUM = "file://COPYING-GPLV2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING-LGPLV3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
                     file://contrib/fuse-util/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
diff --git a/recipes-extended/librdmacm/librdmacm_1.1.0.bb b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
index a3271df..edc7895 100644
--- a/recipes-extended/librdmacm/librdmacm_1.1.0.bb
+++ b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
@@ -9,7 +9,7 @@ Also includes ACM (communication management assistant) service."
 HOMEPAGE = "http://www.openfabrics.org/downloads/rdmacm/"
 SECTION = "libs/devel"
 
-LICENSE = "BSD-2-Clause | GPLv2"
+LICENSE = "BSD-2-Clause | GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=39cc3044d68741f9005da73e9b92db95"
 
 DEPENDS = "virtual/libibverbs"
diff --git a/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb b/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb
index 0c73ccb..d7354c4 100644
--- a/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb
+++ b/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "\
 
 HOMEPAGE = "http://arthurdejong.org/nss-pam-ldapd/"
 
-LICENSE = "LGPLv2.1"
+LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 SECTION = "base"
 
diff --git a/recipes-support/spice/spice_git.bb b/recipes-support/spice/spice_git.bb
index 478813c..44e7ce1 100644
--- a/recipes-support/spice/spice_git.bb
+++ b/recipes-support/spice/spice_git.bb
@@ -10,7 +10,7 @@ environment - not only on its computer-server machine, but also from \
 anywhere on the Internet and using a wide variety of machine \
 architectures."
 
-LICENSE = "BSD & LGPLv2.1+"
+LICENSE = "BSD & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 PR = "r0"