aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/layer.conf2
-rw-r--r--meta-openstack/conf/layer.conf2
-rw-r--r--meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb2
-rw-r--r--meta-openstack/recipes-devtools/perl/libconfig-general-perl_2.63.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-oauthlib_0.7.2.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-psycopg2_2.7.5.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-suds_0.4.1.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-amqplib_1.0.2.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-avahi_0.6.32.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-debtcollector_2.2.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-memcached_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-nose-exclude_0.5.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch (renamed from meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch)4
-rw-r--r--meta-openstack/recipes-devtools/python/python3-novnc_git.bb (renamed from meta-openstack/recipes-devtools/python/python-novnc_git.bb)12
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.concurrency_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.i18n_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.middleware_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.policy_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.reports_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.rootwrap_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.service_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-oslo.versionedobjects_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-rfc3986_1.4.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-rtslib-fb_2.1.74.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-suds-jurko_0.6.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-warlock_1.3.3.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-weakrefmethod_1.0.3.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-websockify_0.9.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-xstatic-bootstrap-scss_3.4.1.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python3-xstatic-jquery-ui_1.12.1.1.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/highline_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/ruby/json_git.bb2
-rw-r--r--meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb2
-rw-r--r--meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb2
-rw-r--r--meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch37
-rw-r--r--meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb6
-rw-r--r--meta-openstack/recipes-support/spice-html5/spice-html5_git.bb2
-rw-r--r--meta-openstack/recipes-support/tgt/tgt_git.bb2
-rw-r--r--recipes-connectivity/consul/consul_git.bb2
-rw-r--r--recipes-devtools/python/python-ansible.inc2
-rw-r--r--recipes-extended/glusterfs/glusterfs.inc4
-rw-r--r--recipes-extended/librdmacm/librdmacm_1.1.0.bb2
-rw-r--r--recipes-support/celt051/celt051_git.bb2
-rw-r--r--recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb2
-rw-r--r--recipes-support/spice/spice_git.bb2
50 files changed, 75 insertions, 78 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 4f71854d..805e1ade 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -7,5 +7,5 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
BBFILE_COLLECTIONS += "cloud-services-layer"
BBFILE_PATTERN_cloud-services-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_cloud-services-layer = "5"
-LAYERSERIES_COMPAT_cloud-services-layer = "honister"
+LAYERSERIES_COMPAT_cloud-services-layer = "kirkstone"
LAYERDEPENDS_cloud-services-layer = "core filesystems-layer networking-layer"
diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index bd5a8ac7..b112030f 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
BBFILE_COLLECTIONS += "openstack-layer"
BBFILE_PATTERN_openstack-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_openstack-layer = "5"
-LAYERSERIES_COMPAT_openstack-layer = "honister"
+LAYERSERIES_COMPAT_openstack-layer = "kirkstone"
BB_DANGLINGAPPENDS_WARNONLY ?= "true"
LAYERDEPENDS_openstack-layer = " \
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 fe802b72..928290fb 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 ec84c44a..51ce60ca 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 b6741afe..a3b6853b 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 2c9378a5..d054214b 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 c1e79a03..3ff818c1 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 218d92b4..5e7c140e 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 f92f979c..614c4eb9 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 65e1bbdc..e216c8b0 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-fixtures_3.0.0.bb b/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb
index 6cd0d810..a9335317 100644
--- a/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-fixtures_3.0.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=239e2f4698b85aad5ed39bae5d2ef226"
SRC_URI[md5sum] = "cd6345b497a62fad739efee66346c2e0"
SRC_URI[sha256sum] = "fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef"
-inherit distutils3 pypi
+inherit setuptools3 pypi
DISTUTILS_INSTALL_ARGS = "--root=${D} \
--prefix=${prefix} \
diff --git a/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb b/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
index 2706954a..bb236eb8 100644
--- a/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-ipaddr_2.2.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;md5=e7e54827196088e6e96b33e9aec35c4a"
SRC_URI[md5sum] = "f88353e40dec06410acfa075b8209b27"
SRC_URI[sha256sum] = "4092dfe667588d16aa12b59acb7c8a4024e5dcb23a681cd0b0b602373eca88d6"
-inherit distutils3 pypi
+inherit setuptools3 pypi
DEPENDS += " \
python3-pip \
diff --git a/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb b/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
index 81e1f22b..ba446380 100644
--- a/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
+++ b/meta-openstack/recipes-devtools/python/python3-lockfile_0.12.2.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2340dffbbfea534b58f1349984eeef72"
SRC_URI[md5sum] = "a6a1a82957a23afdf44cfdd039b65ff9"
SRC_URI[sha256sum] = "6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"
-inherit distutils3 pypi
+inherit setuptools3 pypi
DEPENDS += "\
python3-pbr \
diff --git a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
index 8724bfb8..aaa5d686 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-mimeparse_1.6.0.bb b/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
index da87dfdb..ae7bd430 100644
--- a/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-mimeparse_1.6.0.bb
@@ -9,7 +9,7 @@ PYPI_PACKAGE = "python-mimeparse"
SRC_URI[md5sum] = "a32ae1df93be1ddb581d1c0fa124bab4"
SRC_URI[sha256sum] = "76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78"
-inherit distutils3 pypi setuptools3
+inherit pypi setuptools3
DISTUTILS_INSTALL_ARGS = "--root=${D} \
--prefix=${prefix} \
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 2127ccf3..765c9b08 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/python-novnc/python-distutils.patch b/meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch
index ef3393f3..85befc9f 100644
--- a/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch
+++ b/meta-openstack/recipes-devtools/python/python3-novnc/python-distutils.patch
@@ -1,13 +1,13 @@
Index: git/setup.py
===================================================================
--- /dev/null
-+++ git/setup.py
++++ b/setup.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+
-+setup(name='python-novnc',
++setup(name='python3-novnc',
+ version='2012.1~e3',
+ description='NoVNC python libraries',
+ author='Ghe Rivero',
diff --git a/meta-openstack/recipes-devtools/python/python-novnc_git.bb b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb
index 50041ac9..b41b5876 100644
--- a/meta-openstack/recipes-devtools/python/python-novnc_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb
@@ -2,19 +2,17 @@ DESCRIPTION = "This package contains the core python parts of NoVNC"
HOMEPAGE = "https://github.com/kanaka/noVNC"
SECTION = "devel/python"
-PR = "r0"
-
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6458695fb66dcd893becb5f9f912715e"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99aebbcc36b17df855fad64d4b792bff"
-SRCREV = "3b8ec46fd26d644e6edbea4f46e630929297e448"
-PV = "0.5.1+git${SRCPV}"
+SRCREV = "463c39e4af98ec4106b87bbea17e1605aa4c6180"
+PV = "1.3.0"
SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https \
file://python-distutils.patch"
S = "${WORKDIR}/git"
-inherit distutils3
+inherit setuptools3
-DEPENDS += " python-websockify"
+DEPENDS += " python3-websockify"
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 051f23f2..abcff6ba 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 e86a656f..49709d62 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 6fe85444..51b3e7c2 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 e4df6dd5..e5674328 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 cdbd3814..1b9e4930 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 a61ff55a..b873afdb 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 4ca31f1d..7ea4373f 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 4b4634af..b24158e3 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 09b10036..d338a9e4 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 929fb500..644c3de7 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 5cff8eeb..a590cfb3 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-termcolor_1.1.0.bb b/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb
index a8d50097..127287a7 100644
--- a/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb
+++ b/meta-openstack/recipes-devtools/python/python3-termcolor_1.1.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=809e8749b63567978acfbd81d9f6a27d"
SRC_URI[md5sum] = "043e89644f8909d462fbbfa511c768df"
SRC_URI[sha256sum] = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"
-inherit distutils3 pypi
+inherit setuptools3 pypi
DEPENDS += " \
python3-pip \
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 6c09b948..219e1594 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 fd2c918d..445d266d 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 40b694e1..84e3f72b 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 2094d62c..3c21c791 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 a853f2c5..6c45bc3e 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 56965345..546bfc9e 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 407f812f..61655e5a 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 63f8e03b..23e326bb 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 9308d893..6c703709 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/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch b/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch
index 4683db0a..79aedffd 100644
--- a/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch
+++ b/meta-openstack/recipes-support/mod-wsgi/files/configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch
@@ -7,28 +7,31 @@ This allows the recipe to specify specific values instead of them
being 'discovered' which may lead to host contamination or similar
issues.
+Updated for 4.9.0: Jeremy Puhlman
+
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
----
+----
configure.ac | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
+
diff --git a/configure.ac b/configure.ac
-index 25afe44..b5a9e03 100644
+index 37a0f86..9b77c7f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -100,26 +100,38 @@ fi
+@@ -106,26 +106,38 @@ fi
AC_SUBST(PYTHON)
+if test -z "${PYTHON_VERSION}"; then
PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
+ import sysconfig; \
stdout.write(sysconfig.get_config_var("VERSION"))'`
+fi
+if test -z "${PYTHON_LDVERSION}"; then
PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
+ import sysconfig; \
stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
+fi
@@ -38,7 +41,7 @@ index 25afe44..b5a9e03 100644
+if test -z "${PYTHON_INCLUDEPY}"; then
CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
+ import sysconfig; \
stdout.write("-I" + sysconfig.get_config_var("INCLUDEPY"))'`
+else
+CPPFLAGS1="${PYTHON_INCLUDEPY}"
@@ -46,7 +49,7 @@ index 25afe44..b5a9e03 100644
+if test -z "${PYTHON_CFLAGS}"; then
CPPFLAGS2=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
+ import sysconfig; \
stdout.write(" ".join(filter(lambda x: x.startswith("-D"), \
sysconfig.get_config_var("CFLAGS").split())))'`
+else
@@ -55,13 +58,13 @@ index 25afe44..b5a9e03 100644
if test "${ENABLE_EMBEDDED}" != "yes"; then
CPPFLAGS3="-DMOD_WSGI_DISABLE_EMBEDDED"
-@@ -131,22 +143,43 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
+@@ -137,22 +149,42 @@ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS1} ${CPPFLAGS2} ${CPPFLAGS3}"
AC_SUBST(CPPFLAGS)
+if test -z "${PYTHON_LIBDIR}"; then
PYTHONLIBDIR=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
+ import sysconfig; \
stdout.write(sysconfig.get_config_var("LIBDIR"))'`
+else
+PYTHONLIBDIR="${PYTHON_LIBDIR}"
@@ -76,22 +79,21 @@ index 25afe44..b5a9e03 100644
+fi
+if test -z "${PYTHON_FRAMEWORKDIR}"; then
PYTHONFRAMEWORKDIR=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
+ import sysconfig; \
stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKDIR"))'`
+else
+PYTHONFRAMEWORKDIR="${PYTHON_FRAMEWORKDIR}"
+fi
-+
+if test -z "${PYTHON_FRAMEWORKPREFIX}"; then
PYTHONFRAMEWORKPREFIX=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
+ import sysconfig; \
stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORKPREFIX"))'`
+else
+PYTHONFRAMEWORKPREFIX="${PYTHON_FRAMEWORKPREFIX}"
+fi
+if test -z "${PYTHON_FRAMEWORK}"; then
PYTHONFRAMEWORK=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
+ import sysconfig; \
stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
+else
+PYTHONFRAMEWORK="${PYTHON_FRAMEWORK}"
@@ -99,20 +101,20 @@ index 25afe44..b5a9e03 100644
if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then
PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}"
-@@ -170,12 +203,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
+@@ -180,12 +212,20 @@ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
LDLIBS1="-lpython${PYTHON_VERSION}"
fi
+ if test -z "${PYTHON_LIBS}"; then
LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
+ import sysconfig; \
stdout.write(sysconfig.get_config_var("LIBS"))'`
+ else
+ LDLIBS2="${PYTHON_LIBS}"
+ fi
+ if test -z "${PYTHON_SYSLIBS}"; then
LDLIBS3=`${PYTHON} -c 'from sys import stdout; \
- from distutils import sysconfig; \
+ import sysconfig; \
stdout.write(sysconfig.get_config_var("SYSLIBS"))'`
+ else
+ LDLIBS3="${PYTHON_SYSLIBS}"
@@ -120,6 +122,3 @@ index 25afe44..b5a9e03 100644
else
LDFLAGS1="-Wl,-F${PYTHONFRAMEWORKPREFIX} -framework ${PYTHONFRAMEWORK}"
---
-2.7.4
-
diff --git a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
index 79afba81..b0daf54d 100644
--- a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
+++ b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
@@ -9,8 +9,8 @@ HOMEPAGE = "https://github.com/GrahamDumpleton/mod_wsgi"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRCREV = "217e80b7436035723b80ff02ee349365e8553dfc"
-PV = "4.6.8+git${SRCPV}"
+SRCREV = "df9faf954a1ab6208f45ba6fde90f0b41f605483"
+PV = "4.9.0+git${SRCPV}"
S = "${WORKDIR}/git"
@@ -20,7 +20,7 @@ SRC_URI = "\
file://configure.ac-allow-PYTHON-values-to-be-passed-via-en.patch \
"
-inherit autotools-brokensep distutils3-base
+inherit autotools-brokensep setuptools3-base
DEPENDS += "apache2-native apache2 python3"
RDEPENDS:${PN} = "python3"
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 dac933d1..b69b08c0 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 b297c9fd..9c5c24bf 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-connectivity/consul/consul_git.bb b/recipes-connectivity/consul/consul_git.bb
index 828a20ec..0d084b0d 100644
--- a/recipes-connectivity/consul/consul_git.bb
+++ b/recipes-connectivity/consul/consul_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/hashicorp/consul/LICENSE;md5=b278a92d2
GO_IMPORT = "github.com/hashicorp/consul"
SRCREV = "944cc71026c007e7de9467ec3f38f0ad14464fcc"
-SRC_URI = "git://${GO_IMPORT}.git;branch=main \
+SRC_URI = "git://${GO_IMPORT}.git;branch=main;protocol=https \
file://0001-Migration-Rename-imports-throughout.patch \
file://consul.service \
"
diff --git a/recipes-devtools/python/python-ansible.inc b/recipes-devtools/python/python-ansible.inc
index 2b8d655e..0bb663ae 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 646b521f..baa8962b 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -22,12 +22,12 @@ 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"
-inherit autotools pkgconfig distutils3-base update-rc.d systemd
+inherit autotools pkgconfig setuptools3-base update-rc.d systemd
inherit python3-dir
DEPENDS += "bison-native flex-native python3-native fuse libaio libtirpc libxml2 ncurses \
diff --git a/recipes-extended/librdmacm/librdmacm_1.1.0.bb b/recipes-extended/librdmacm/librdmacm_1.1.0.bb
index 2e18b0a9..edc7895f 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"
+LICENSE = "BSD-2-Clause | GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=39cc3044d68741f9005da73e9b92db95"
DEPENDS = "virtual/libibverbs"
diff --git a/recipes-support/celt051/celt051_git.bb b/recipes-support/celt051/celt051_git.bb
index 6eab5669..52c7cf38 100644
--- a/recipes-support/celt051/celt051_git.bb
+++ b/recipes-support/celt051/celt051_git.bb
@@ -9,7 +9,7 @@ with high quality. Unlike these formats CELT imposes very little delay \
on the signal, even less than is typical for speech centric formats \
like Speex, GSM, or G.729."
-LICENSE = "BSD"
+LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=375f60ab360d17f0172737036ff155b2"
PV = "0.5.1.3"
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 0c73ccb0..d7354c44 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 478813ce..44e7ce15 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"