diff options
Diffstat (limited to 'meta-openstack')
65 files changed, 270 insertions, 144 deletions
diff --git a/meta-openstack/Documentation/README.OpenLDAP b/meta-openstack/Documentation/README.OpenLDAP index a45b7691..95c2227c 100644 --- a/meta-openstack/Documentation/README.OpenLDAP +++ b/meta-openstack/Documentation/README.OpenLDAP @@ -6,7 +6,7 @@ OpenLDAP into DISTRO_FEATURES e.g. in conf/local.conf -DISTRO_FEATURES:append += " OpenLDAP" +DISTRO_FEATURES:append = " OpenLDAP" A number of variables can be specified during the build phase that configures OpenLDAP specific options: diff --git a/meta-openstack/README.setup b/meta-openstack/README.setup index d1a47034..f837f635 100644 --- a/meta-openstack/README.setup +++ b/meta-openstack/README.setup @@ -95,7 +95,7 @@ systemd will be used in your images: Additionally activiate the meta-virtualization layer: - DISTRO_FEATURES:append += "virtualization kvm" + DISTRO_FEATURES:append = " virtualization kvm" Package configurations diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf index bd5a8ac7..b035adf7 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 = "scarthgap" BB_DANGLINGAPPENDS_WARNONLY ?= "true" LAYERDEPENDS_openstack-layer = " \ diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch new file mode 100644 index 00000000..ef11366b --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Fix-usr-bin-sed-to-sed.patch @@ -0,0 +1,53 @@ +From 569886070a273e914f2662d10b03e1767d488aee Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Wed, 18 May 2022 11:32:29 +0900 +Subject: [PATCH] Fix /usr/bin/sed to sed. + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + doc/Makefile | 2 +- + etc/Makefile | 2 +- + utils/Makefile | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/doc/Makefile b/doc/Makefile +index 9ed025d..e121270 100644 +--- a/doc/Makefile ++++ b/doc/Makefile +@@ -7,7 +7,7 @@ ifeq ($(TOPDIR),) + TOPDIR = .. + endif + +-SED = /usr/bin/sed ++SED = sed + INSTALL = install + + DESTDIR ?= +diff --git a/etc/Makefile b/etc/Makefile +index d065319..2d98027 100644 +--- a/etc/Makefile ++++ b/etc/Makefile +@@ -19,7 +19,7 @@ initddir ?= $(etcdir)/init.d + + HOMEDIR ?= $(etcdir)/iscsi + +-SED = /usr/bin/sed ++SED = sed + INSTALL = install + + SYSTEMD_SOURCE_FILES = iscsid.socket iscsiuio.socket +diff --git a/utils/Makefile b/utils/Makefile +index a7eb352..15539eb 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -7,7 +7,7 @@ + # from the top-level make file. + # + +-SED = /usr/bin/sed ++SED = sed + INSTALL = install + CHMOD = chmod + +-- +2.25.1 diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Makefile-Fix-build-error-of-cross-build.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Makefile-Fix-build-error-of-cross-build.patch new file mode 100644 index 00000000..bdb9e45f --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Makefile-Fix-build-error-of-cross-build.patch @@ -0,0 +1,25 @@ +From 69fa594af5a09e356319cc0ec2e71809ac964d9b Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Wed, 18 May 2022 10:28:53 +0900 +Subject: [PATCH] Makefile: Fix build error of cross build. + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index d2f143b..127ba90 100644 +--- a/Makefile ++++ b/Makefile +@@ -69,7 +69,7 @@ user: iscsiuio/Makefile + @echo "Read README file for detailed information." + + iscsiuio/Makefile: iscsiuio/configure iscsiuio/Makefile.in +- cd iscsiuio; ./configure $(WITHOUT_ARG) --sbindir=$(SBINDIR) ++ cd iscsiuio; ./configure $(WITHOUT_ARG) --sbindir=$(SBINDIR) $(CONFIGURE_ARGS) + + iscsiuio/configure: iscsiuio/configure.ac iscsiuio/Makefile.am + cd iscsiuio; autoreconf --install +-- +2.25.1 diff --git a/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch new file mode 100644 index 00000000..8cea597e --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/files/0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch @@ -0,0 +1,25 @@ +From 280fbda492256d2ef70c6d377e8bd8935e7a4f9c Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Fri, 20 May 2022 17:59:03 +0900 +Subject: [PATCH] Modified path of systemd service from /usr/lib to /lib. + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + etc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/Makefile b/etc/Makefile +index 2d98027..d24fd03 100644 +--- a/etc/Makefile ++++ b/etc/Makefile +@@ -7,7 +7,7 @@ ifeq ($(TOPDIR),) + TOPDIR = .. + endif + +-prefix = /usr ++prefix = + DESTDIR ?= + SBINDIR ?= /sbin + +-- +2.25.1 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 deleted file mode 100644 index fe802b72..00000000 --- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.4.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720." -HOMEPAGE = "http://www.open-iscsi.org/" -LICENSE = "GPLv2" -PR = "r1" - -inherit systemd autotools pkgconfig - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "kmod openssl util-linux open-isns" -DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" - -SRC_URI = "git://github.com/open-iscsi/open-iscsi.git;protocol=https;branch=master \ - file://0001-fix-build-error-of-cross-build.patch \ - " - -SRCREV = "095f59ca464220eae285de6b5f2ee31185a6a84c" - -S = "${WORKDIR}/git" -B = "${S}" - -TARGET_CC_ARCH += "${LDFLAGS}" -EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}'" - -do_configure () { - : -} - -do_compile () { - oe_runmake user -} - -do_install () { - oe_runmake DESTDIR="${D}" install_user - install ${S}/etc/initd/initd.debian ${D}/etc/init.d/open-iscsi - install -m 0644 ${S}/etc/iscsid.conf ${D}/etc/iscsi/ - - install -d ${D}${libdir} - install -Dm 0644 ${S}/libopeniscsiusr/libopeniscsiusr.so.0.2.0 ${D}${libdir}/ - ln -sf ${libdir}/libopeniscsiusr.so.0.2.0 ${D}${libdir}/libopeniscsiusr.so -} - -# systemd support -PACKAGES =+ "${PN}-systemd" -RDEPENDS:${PN} += "bash" -RDEPENDS:${PN}-systemd += "${PN}" -FILES:${PN}-systemd += "${base_libdir}/systemd \ - ${sysconfdir}/default/iscsi-initiator \ - " -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE:${PN}-systemd = "iscsi.service \ - iscsiuio.service \ - iscsid.service \ - iscsi-init.service \ - iscsid.socket \ - iscsiuio.socket " - -do_install:append () { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/etc/systemd/* ${D}${systemd_unitdir}/system/ -} diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb new file mode 100644 index 00000000..1f84508f --- /dev/null +++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720." +HOMEPAGE = "http://www.open-iscsi.org/" +LICENSE = "GPL-2.0-only" +PR = "r1" + +inherit autotools systemd pkgconfig + +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "kmod openssl util-linux open-isns" +DEPENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +SRC_URI = "git://github.com/open-iscsi/open-iscsi.git;protocol=https;branch=master \ + file://0001-Makefile-Fix-build-error-of-cross-build.patch \ + file://0001-Fix-usr-bin-sed-to-sed.patch \ + file://0001-Modified-path-of-systemd-service-from-usr-lib-to-lib.patch \ + " + +SRCREV = "7b53fcc502da8617110fd64d675b476772c28a6f" + +S = "${WORKDIR}/git" +B = "${S}" + +PARALLEL_MAKEINST = "" +TARGET_CC_ARCH += "${LDFLAGS}" +EXTRA_OEMAKE += "CONFIGURE_ARGS='--host=${HOST_SYS}' MFLAGS='' LIB_DIR=${libdir}" +RDEPENDS:${PN} += "bash" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "iscsi.service \ + iscsid.socket \ + iscsiuio.socket \ + iscsid.service \ + iscsi-init.service \ + iscsiuio.service \ +" +SYSTEMD_AUTO_ENABLE = "disable" +FILES:${PN} += " \ + ${systemd_system_unitdir}/iscsi.service \ + ${systemd_system_unitdir}/iscsid.socket \ + ${systemd_system_unitdir}/iscsiuio.socket \ + ${systemd_system_unitdir}/iscsid.service \ + ${systemd_system_unitdir}/iscsi-init.service \ + ${systemd_system_unitdir}/iscsiuio.service \ + ${systemd_unitdir}/system-generators/ibft-rule-generator \ +" + +do_install() { + oe_runmake install DESTDIR=${D} prefix=${exec_prefix} LIBDIR=${libdir} sbindir=${sbindir} SBINDIR=${sbindir} systemddir=${systemd_unitdir} +} 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..94787e6f 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" @@ -12,7 +12,7 @@ SRC_URI += " \ SRC_URI[md5sum] = "9e7d6f695fc7f8d1c42a7905449246c9" SRC_URI[sha256sum] = "eccf962d41ca46e6326b97c8fe0a6687b58dfc1a5f6540ed071ff1474cea749e" -inherit distutils3 pypi +inherit setuptools3 pypi 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-arrow_0.17.0.bb b/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb index 449063f0..9ef1d8fa 100644 --- a/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb +++ b/meta-openstack/recipes-devtools/python/python3-arrow_0.17.0.bb @@ -11,5 +11,4 @@ inherit setuptools3 pypi RDEPENDS:${PN} += " \ ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-backports-functools-lru-cache \ " 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-heat-cfntools_1.4.2.bb b/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb index 8439daaf..a6dee5ca 100644 --- a/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb +++ b/meta-openstack/recipes-devtools/python/python3-heat-cfntools_1.4.2.bb @@ -18,6 +18,6 @@ DEPENDS += " \ python3-pbr-native \ " -RDPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ python3-pbr \ " 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-os-brick_git.bb b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb index 093b673e..cef666d4 100644 --- a/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb @@ -40,3 +40,4 @@ RDEPENDS:${PN} += " \ python3-retrying \ python3-six \ python3-os-win \ +" 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/qemu/qemu_5.%.bbappend b/meta-openstack/recipes-devtools/qemu/qemu_8.%.bbappend index 025ee4ee..025ee4ee 100644 --- a/meta-openstack/recipes-devtools/qemu/qemu_5.%.bbappend +++ b/meta-openstack/recipes-devtools/qemu/qemu_8.%.bbappend diff --git a/meta-openstack/recipes-devtools/ruby/cool.io_1.6.0.bb b/meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb index baa63403..10e9a498 100644 --- a/meta-openstack/recipes-devtools/ruby/cool.io_1.6.0.bb +++ b/meta-openstack/recipes-devtools/ruby/cool.io_1.7.0.bb @@ -4,9 +4,12 @@ HOMEPAGE = 'http://coolio.github.com' LICENSE = 'MIT' LIC_FILES_CHKSUM = 'file://LICENSE;md5=a5e7701a63eb0a961f98cd10475129b9' -SRC_URI = 'git://github.com/tarcieri/cool.io.git;protocol=https;tag=v1.6.0' +SRCREV = 'd7ab8518c11d8fe1b9a679a1686f01a295690fa9' + +SRC_URI = 'git://github.com/tarcieri/cool.io.git;protocol=https;branch=master' S = '${WORKDIR}/git' inherit ruby +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb b/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb index 94d1ec80..dc984d3a 100644 --- a/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb +++ b/meta-openstack/recipes-devtools/ruby/fluentd_1.9.2.bb @@ -3,7 +3,9 @@ HOMEPAGE = "https://www.fluentd.org/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1ffc336af228834e68e0a4d38da165f7" -SRC_URI = "git://github.com/fluent/fluentd.git;protocol=https;tag=v${PV};branch=master" +SRCREV = "9d113029d4550ce576d8825bfa9612aa3e55bff0" + +SRC_URI = "git://github.com/fluent/fluentd.git;protocol=https;branch=master" S = "${WORKDIR}/git" 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/http-parser.rb_0.6.0.bb b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.1.bb index 296b8dda..5452c126 100644 --- a/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.0.bb +++ b/meta-openstack/recipes-devtools/ruby/http-parser.rb_0.6.1.bb @@ -4,7 +4,9 @@ HOMEPAGE = "https://rubygems.org/gems/http_parser.rb" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=157efc3766c6d07d3d857ebbab43351a" -SRC_URI = "git://github.com/tmm1/http_parser.rb.git;protocol=https;tag=v0.6.0;branch=master" +SRCREV = "c8dae7c6c2c78a5016d082a7fbda7e362292c14a" + +SRC_URI = "gitsm://github.com/tmm1/http_parser.rb.git;protocol=https;branch=master" S = "${WORKDIR}/git" @@ -20,3 +22,5 @@ do_configure:prepend() { cd ${WORKDIR}/git git submodule update --init --recursive } + +FILES:${PN} += "${libdir}/*" 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-devtools/ruby/msgpack_1.3.3.bb b/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb index f40d6cfe..53826767 100644 --- a/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb +++ b/meta-openstack/recipes-devtools/ruby/msgpack_1.3.3.bb @@ -4,9 +4,12 @@ HOMEPAGE = "http://msgpack.org/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI = "git://github.com/msgpack/msgpack-ruby.git;protocol=https;tag=v${PV};branch=master" +SRCREV = "64db1bac56359c9257d22f3ffb7506b578d76741" + +SRC_URI = "git://github.com/msgpack/msgpack-ruby.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb b/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb index 516a72eb..553c5673 100644 --- a/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb +++ b/meta-openstack/recipes-devtools/ruby/serverengine_2.2.1.bb @@ -4,10 +4,14 @@ HOMEPAGE = 'https://rubygems.org/gems/serverengine' LICENSE = 'Apache-2.0' LIC_FILES_CHKSUM = 'file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57' -SRC_URI = 'git://github.com/treasure-data/serverengine.git;protocol=https;tag=v2.2.1' +SRCREV = '99d44a0989ab3e64e14ac0367aadf76aa13b3583' + +SRC_URI = 'git://github.com/treasure-data/serverengine.git;protocol=https;branch=master' S = '${WORKDIR}/git' RDEPENDS:${PN} = "sigdump" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb b/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb index 2f6b8d5a..fc5152e8 100644 --- a/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb +++ b/meta-openstack/recipes-devtools/ruby/sigdump_0.2.4.bb @@ -4,8 +4,12 @@ HOMEPAGE = "https://github.com/frsyuki/sigdump" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=07d6218b18fb6826f04fd32b4918f085" -SRC_URI = "git://github.com/frsyuki/sigdump.git;protocol=https;tag=v0.2.4;branch=master" +SRCREV = "57570f04456560512e4efc1c6fa695b76c17dc0d" + +SRC_URI = "git://github.com/frsyuki/sigdump.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/strptime_0.2.3.bb b/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb index 7167d9ab..d568272d 100644 --- a/meta-openstack/recipes-devtools/ruby/strptime_0.2.3.bb +++ b/meta-openstack/recipes-devtools/ruby/strptime_0.2.5.bb @@ -4,10 +4,14 @@ HOMEPAGE = "https://github.com/nurse/strptime" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f19575067ffc5f1ddc02c74eeef9904f" -SRC_URI = "git://github.com/nurse/strptime.git;protocol=https;tag=v0.2.3;branch=master" +SRCREV = "1583aaa510cae4660907b22c8262ab31b1eb1864" + +SRC_URI = "git://github.com/nurse/strptime.git;protocol=https;branch=master" S = "${WORKDIR}/git" RDEPENDS:${PN} = "bash" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb b/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb index 6b1d01ce..46407553 100644 --- a/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb +++ b/meta-openstack/recipes-devtools/ruby/tzinfo-data_1.2019.3.bb @@ -4,8 +4,12 @@ HOMEPAGE = "https://tzinfo.github.io/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c326926e773a4e99e89820f5d8a0966f" -SRC_URI = "git://github.com/tzinfo/tzinfo-data.git;protocol=https;tag=v1.2019.3;branch=master" +SRCREV = "74d5a2529d585e1d1ab47b6bbb2449cba29f6907" + +SRC_URI = "git://github.com/tzinfo/tzinfo-data.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb b/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb index 07680d7d..504e3a89 100644 --- a/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb +++ b/meta-openstack/recipes-devtools/ruby/tzinfo_2.0.1.bb @@ -4,10 +4,14 @@ HOMEPAGE = "https://tzinfo.github.io/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c326926e773a4e99e89820f5d8a0966f" -SRC_URI = "git://github.com/tzinfo/tzinfo.git;protocol=https;tag=v2.0.1;branch=master" +SRCREV = "16b0ff837923401da52325312c51baf9bec700e1" + +SRC_URI = "git://github.com/tzinfo/tzinfo.git;protocol=https;branch=master" S = "${WORKDIR}/git" RDEPENDS:${PN} = "concurrent-ruby" inherit ruby + +FILES:${PN} += "${libdir}/*" diff --git a/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb b/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb index a0635e3a..f91d414a 100644 --- a/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb +++ b/meta-openstack/recipes-devtools/ruby/yajl-ruby_1.4.0.bb @@ -4,8 +4,12 @@ HOMEPAGE = "http://rdoc.info/projects/brianmario/yajl-ruby" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7dbd3a9f471247a243db5b62fe091587" -SRC_URI = "git://github.com/brianmario/yajl-ruby.git;protocol=https;tag=1.4.0;branch=master" +SRCREV = "8830754ac1ca04a0c14f71f6e7c1d240934366fe" + +SRC_URI = "git://github.com/brianmario/yajl-ruby.git;protocol=https;branch=master" S = "${WORKDIR}/git" inherit ruby + +FILES:${PN} += "${libdir}/*" 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 + diff --git a/meta-openstack/recipes-support/iproute2/iproute2_5.%.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_6.%.bbappend index 025ee4ee..025ee4ee 100644 --- a/meta-openstack/recipes-support/iproute2/iproute2_5.%.bbappend +++ b/meta-openstack/recipes-support/iproute2/iproute2_6.%.bbappend 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" |