aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-extended
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openstack/recipes-extended')
-rw-r--r--meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb2
-rw-r--r--meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend (renamed from meta-openstack/recipes-extended/libvirt/libvirt_6.%.bbappend)0
-rw-r--r--meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb2
-rw-r--r--meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb3
4 files changed, 4 insertions, 3 deletions
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/libvirt/libvirt_6.%.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend
index 025ee4ee..025ee4ee 100644
--- a/meta-openstack/recipes-extended/libvirt/libvirt_6.%.bbappend
+++ b/meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend
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-extended/qpid/qpid-python_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
index 9db46859..3a486b4f 100644
--- a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
+++ b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
@@ -12,4 +12,5 @@ SRC_URI[sha256sum] = "3ca55a5aa11fbbd4e26cb4cdafc9658489c159acadceac60c89d4bfb5c
S = "${WORKDIR}/qpid-${PV}/python"
-inherit distutils3
+inherit setuptools3
+