diff options
Diffstat (limited to 'meta-openstack')
144 files changed, 384 insertions, 252 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 58e58988..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 \ - 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-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index 85ab146a..c71229d4 100644 --- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb +++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb @@ -8,7 +8,7 @@ PR = "r0" SRCNAME = "barbican" BARBICAN_MAX_PACKET_SIZE ?= "65535" -SRC_URI = "git://github.com/openstack/barbican.git;branch=master \ +SRC_URI = "git://github.com/openstack/barbican.git;branch=master;protocol=https \ file://barbican.init \ file://barbican-increase-buffer-size-to-support-PKI-tokens.patch \ file://barbican-fix-path-to-find-configuration-files.patch \ diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb index 2d6d708b..ca5d62f3 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "ceilometer" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https \ file://ceilometer.conf \ file://ceilometer.init \ file://fix_ceilometer_memory_leak.patch \ diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index e72d7216..2a3ef47b 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "cinder" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https \ file://cinder-init \ file://cinder-init.service \ file://cinder-api.service \ diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb index e8d6ffc7..bd360edf 100644 --- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb @@ -8,7 +8,7 @@ DEPENDS = "python-setuptools3-git" SRCNAME = "python-cinderclient" SRC_URI = "\ - git://github.com/openstack/python-cinderclient.git;branch=stable/pike \ + git://github.com/openstack/python-cinderclient.git;branch=stable/pike;protocol=https \ file://cinder-api-check.sh \ " diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index a9537ce1..9fa23ed8 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "glance" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https \ file://glance.init \ file://glance-api.service \ file://glance-registry.service \ diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb index acfc6e71..01be0cff 100644 --- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/openstack/python-glanceclient" SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -SRC_URI = "git://github.com/openstack/python-glanceclient.git \ +SRC_URI = "git://github.com/openstack/python-glanceclient.git;branch=master;protocol=https \ file://glance-api-check.sh \ " diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb index e769bbd3..9ae104a6 100644 --- a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb @@ -8,7 +8,7 @@ SRCREV = "c816b38d9f12be75d989409cbab6dfefa8f49dc3" PV = "0.9.1+git${SRCPV}" SRC_URI = "\ - git://github.com/openstack/glance_store.git \ + git://github.com/openstack/glance_store.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index 0f2f1949..00709283 100644 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "heat" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https \ file://heat.conf \ file://heat.init \ file://autoscaling_example.template \ diff --git a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb index db6fd60a..0c153805 100644 --- a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb @@ -27,7 +27,7 @@ RDEPENDS:${PN} +="python-cliff \ PR = "r0" SRCNAME = "heatclient" -SRC_URI = "git://github.com/openstack/python-heatclient.git;branch=master" +SRC_URI = "git://github.com/openstack/python-heatclient.git;branch=master;protocol=https" PV = "1.17.0+git${SRCPV}" SRCREV = "8af5deb458d51f4ec16e769d7fd6c94655f82f5f" diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index 9e36656c..4eedeadc 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -78,7 +78,7 @@ RDEPENDS:${PN} += " \ SRCNAME = "horizon" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https \ file://wsgi-horizon.conf \ file://fix_bindir_path.patch \ file://local_settings.py \ diff --git a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb index cd86952f..72f5a04d 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone-hybrid-backend_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://hybrid_identity.py;beginline=1;endline=14;md5=06c14f6 PR = "r0" -SRC_URI = "git://github.com/SUSE-Cloud/keystone-hybrid-backend.git;branch=havana" +SRC_URI = "git://github.com/SUSE-Cloud/keystone-hybrid-backend.git;branch=havana;protocol=https" PV="git${SRCPV}" SRCREV="0bd376242f8522edef7031d2339b9533b86c17aa" diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index e533fcd0..a1b5dd0b 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "keystone" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https \ file://keystone-init \ file://keystone-init.service \ file://keystone.conf \ diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index 59738341..11dbb843 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "neutron" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https \ file://neutron-server.service \ file://neutron.conf \ file://l3_agent.ini \ diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb index 090f963a..42993e67 100644 --- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb @@ -34,7 +34,7 @@ RDEPENDS:${PN} += " \ bash \ " -SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=stable/pike \ +SRC_URI = "git://github.com/openstack/python-neutronclient.git;branch=stable/pike;protocol=https \ file://neutronclient-use-csv-flag-instead-of-json.patch \ file://neutron-api-check.sh \ " diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 77e7b82b..7afe347d 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb @@ -13,7 +13,7 @@ SRCNAME = "nova" FILESEXTRAPATHS:append := "${THISDIR}/${PN}" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https \ file://neutron-api-set-default-binding-vnic_type.patch \ " diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb index 9f0ac5c9..af9c601f 100644 --- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7cdb54622cacc9bc9b2883091e6dd669" SRC_URI = "\ - git://github.com/openstack/python-novaclient.git;branch=stable/pike \ + git://github.com/openstack/python-novaclient.git;branch=stable/pike;protocol=https \ file://nova-api-check.sh \ " diff --git a/meta-openstack/recipes-devtools/python/python-novnc_git.bb b/meta-openstack/recipes-devtools/python/python-novnc_git.bb deleted file mode 100644 index 3f36ef57..00000000 --- a/meta-openstack/recipes-devtools/python/python-novnc_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -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" - -SRCREV = "3b8ec46fd26d644e6edbea4f46e630929297e448" -PV = "0.5.1+git${SRCPV}" - -SRC_URI = "git://github.com/kanaka/noVNC.git \ - file://python-distutils.patch" - -S = "${WORKDIR}/git" - -inherit distutils3 - -DEPENDS += " python-websockify" 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-openstackclient_git.bb b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb index b90f4968..b345c396 100644 --- a/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-openstackclient_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRC_URI = " \ - git://github.com/openstack/python-openstackclient.git;branch=stable/pike \ + git://github.com/openstack/python-openstackclient.git;branch=stable/pike;protocol=https \ " PV = "3.12.0+git${SRCPV}" diff --git a/meta-openstack/recipes-devtools/python/python-os-client-config.inc b/meta-openstack/recipes-devtools/python/python-os-client-config.inc index 356845aa..e05746d8 100644 --- a/meta-openstack/recipes-devtools/python/python-os-client-config.inc +++ b/meta-openstack/recipes-devtools/python/python-os-client-config.inc @@ -8,7 +8,7 @@ PV = "1.28.0" SRCREV = "261c05f0057d556a8910457f1e22ca4d81801081" SRCNAME = "os-client-config" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" S = "${WORKDIR}/git" 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-rally_git.bb b/meta-openstack/recipes-devtools/python/python-rally_git.bb index 063a2b99..9327ff50 100644 --- a/meta-openstack/recipes-devtools/python/python-rally_git.bb +++ b/meta-openstack/recipes-devtools/python/python-rally_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5" PR = "r0" SRCNAME = "rally" -SRC_URI = "git://github.com/stackforge/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/stackforge/${SRCNAME}.git;branch=master;protocol=https \ file://rally.init \ file://rally.conf \ file://task-example.json \ diff --git a/meta-openstack/recipes-devtools/python/python-ryu_git.bb b/meta-openstack/recipes-devtools/python/python-ryu_git.bb index 83fc88cd..8b4fa84a 100644 --- a/meta-openstack/recipes-devtools/python/python-ryu_git.bb +++ b/meta-openstack/recipes-devtools/python/python-ryu_git.bb @@ -8,7 +8,7 @@ PV = "4.19+git${SRCPV}" SRCREV = "51a1130f6cdcb029a51b6a75d43ac5e4cdde7072" SRCNAME = "ryu" -SRC_URI = "git://github.com/osrg/${SRCNAME}.git" +SRC_URI = "git://github.com/osrg/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" 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/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb index 675a1850..a62d6ab2 100644 --- a/meta-openstack/recipes-devtools/python/python-swift_git.bb +++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" PR = "r0" SRCNAME = "swift" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https \ file://proxy-server.conf \ file://dispersion.conf \ file://test.conf \ diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb index 7e6b6f61..b9045e2c 100755 --- a/meta-openstack/recipes-devtools/python/python-trove_git.bb +++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "trove" -SRC_URI = "git://github.com/openstack/trove.git;branch=master \ +SRC_URI = "git://github.com/openstack/trove.git;branch=master;protocol=https \ file://trove-init \ " diff --git a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb index 9955f2e9..a9d20edf 100644 --- a/meta-openstack/recipes-devtools/python/python-troveclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-troveclient_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "troveclient" SRC_URI = "\ - git://github.com/openstack/python-troveclient.git;branch=master \ + git://github.com/openstack/python-troveclient.git;branch=master;protocol=https \ " PV = "3.0.0+git${SRCPV}" 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-barbicanclient_git.bb b/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb index 53f1ed98..7a0fc81e 100644 --- a/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-barbicanclient_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e031cff4528978748f9cc064c6e6fa73" SRC_URI = "\ - git://github.com/openstack/python-barbicanclient.git \ + git://github.com/openstack/python-barbicanclient.git;branch=master;protocol=https \ " PV = "5.0.1+git${SRCPV}" 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-kafka_git.bb b/meta-openstack/recipes-devtools/python/python3-kafka_git.bb index b40e39c8..24b3220a 100644 --- a/meta-openstack/recipes-devtools/python/python3-kafka_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-kafka_git.bb @@ -9,7 +9,7 @@ SRCREV = "5bb126bf20bbb5baeb4e9afc48008dbe411631bc" SRCNAME = "kafka-python" LIC_FILES_CHKSUM = "file://LICENSE;md5=22efebb1e053dcc946f4b9d17f3cbbea" -SRC_URI = "git://github.com/mumrah/${SRCNAME}.git" +SRC_URI = "git://github.com/mumrah/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb index 7511de34..689cb0da 100644 --- a/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-keystoneclient_git.bb @@ -9,7 +9,7 @@ SRCNAME = "keystoneclient" SRC_URI = "file://keystone-api-check.sh" SRC_URI = "\ - git://github.com/openstack/python-keystoneclient.git;branch=stable/pike \ + git://github.com/openstack/python-keystoneclient.git;branch=stable/pike;protocol=https \ file://keystone-api-check.sh \ " 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 4e6f40ea..aaa5d686 100644 --- a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb @@ -5,13 +5,13 @@ 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}" SRCREV = "959e068fec8b4c956b0d82269336818e667726e7" -SRC_URI = "git://github.com/linsomniac/python-memcached.git" +SRC_URI = "git://github.com/linsomniac/python-memcached.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb b/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb index 3cf8b73d..0860aae6 100644 --- a/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-microversion-parse_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "\ - git://github.com/openstack/microversion-parse.git;branch=master \ + git://github.com/openstack/microversion-parse.git;branch=master;protocol=https \ " PV = "1.0.1+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/python3-novnc_git.bb b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb new file mode 100644 index 00000000..b41b5876 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python3-novnc_git.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "This package contains the core python parts of NoVNC" +HOMEPAGE = "https://github.com/kanaka/noVNC" +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99aebbcc36b17df855fad64d4b792bff" + +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 setuptools3 + +DEPENDS += " python3-websockify" diff --git a/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb index 3a78fb9e..5e5035d4 100644 --- a/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-openstacksdk_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRC_URI = " \ - git://github.com/openstack/python-openstacksdk.git;branch=master \ + git://github.com/openstack/python-openstacksdk.git;branch=master;protocol=https \ " PV = "0.52.0+git${SRCPV}" 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 c52526ac..cef666d4 100644 --- a/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-os-brick_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRC_URI = "\ - git://github.com/openstack/os-brick.git;branch=stable/victoria \ + git://github.com/openstack/os-brick.git;branch=stable/victoria;protocol=https \ " SRCREV = "f0cf77672fed70f20896c23015cb50341f311f38" @@ -40,3 +40,4 @@ RDEPENDS:${PN} += " \ python3-retrying \ python3-six \ python3-os-win \ +" diff --git a/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb b/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb index 82e53b14..a8fe3c01 100644 --- a/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-os-vif_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRC_URI = "\ - git://github.com/openstack/os-vif.git \ + git://github.com/openstack/os-vif.git;branch=master;protocol=https \ " PV = "2.2.0+git${SRCPV}" diff --git a/meta-openstack/recipes-devtools/python/python3-os-win_git.bb b/meta-openstack/recipes-devtools/python/python3-os-win_git.bb index bbbd96c0..b8a23fbd 100644 --- a/meta-openstack/recipes-devtools/python/python3-os-win_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-os-win_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRC_URI = "\ - git://github.com/openstack/os-win.git \ + git://github.com/openstack/os-win.git;branch=master;protocol=https \ " PV = "5.1.0+git${SRCPV}" diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb index 8b087b28..5ce82ed5 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.cache_git.bb @@ -8,7 +8,7 @@ PV = "2.6.1+git${SRCPV}" SRCREV = "df075b2465195de53e42897e7d9be6c6c375ce5e" SRCNAME = "oslo.cache" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" 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 04178c24..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,14 +1,14 @@ 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}" SRCREV = "1b25351d1c63e573068fff3d16faca440bbdcabf" SRCNAME = "oslo.concurrency" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb index 9a0caa80..2aa318fb 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.context_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "oslo.context" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" PV = "2.17.0+git${SRCPV}" SRCREV = "f4b6914db02e6bcf0de4a97bbc3dc85dd6e06d91" diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb index ed5a2fc0..0a5a05dc 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.db_git.bb @@ -8,7 +8,7 @@ PV = "8.4.0+git${SRCPV}" SRCREV = "e42c73343f640eaacb0a76d204eb55c85de4f5d5" SRCNAME = "oslo.db" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" 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 59a5a0a1..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,14 +1,14 @@ 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}" SRCREV = "73187bd86903fc87665a829c9a0c714db6aa3022" SRCNAME = "oslo.i18n" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" inherit setuptools3 diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb index 6536478f..c702e5ca 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.log_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRCNAME = "oslo.log" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" PV = "3.30.3+git${SRCPV}" SRCREV = "76d1dee7b80c62172ea3900b75a47edf5b64cab4" diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb index 4f201fef..0dc65bed 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.messaging_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=c46f31914956e4579f9b488e71415ac8" SRCNAME = "oslo.messaging" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" PV = "12.5.0+git${SRCPV}" SRCREV = "62e104bdb57714a0754f788795d1b4faf8ebb74d" 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 090a3650..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,14 +1,14 @@ 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}" SRCREV = "7355d905bc0e6b7d8884e290cc26895eed0f7179" SRCNAME = "oslo.middleware" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" S = "${WORKDIR}/git" 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 fac6ba98..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,14 +2,14 @@ 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}" SRCREV = "cab28649c689067970a51a2f9b329bdd6a0f0501" SRCNAME = "oslo.policy" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb index 46f95c00..f6e51021 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.privsep_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "oslo.privsep" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" PV = "2.4.0+git${SRCPV}" SRCREV = "512b5d9f6b79b798474d8bb2dac2462b0f705cb9" 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 2706df00..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,14 +1,14 @@ 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}" SRCREV = "bc631aedef131bc45225720e5c8f8e4ca35ff020" SRCNAME = "oslo.reports" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" 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 5e3bb7cc..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,14 +1,14 @@ 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}" SRCREV = "ff61e1577c3aaec6242951876263108559d1a203" SRCNAME = "oslo.rootwrap" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb index 3935026b..542404a9 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.serialization_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRCNAME = "oslo.serialization" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" PV = "2.20.0+git${SRCPV}" SRCREV = "e56d91427c11a3813a0154d47e804018e580086e" 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 c2f6702c..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,14 +1,14 @@ 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" SRCREV = "8481ce67951aa1b44203c03639b79e06f65bd8bc" SRCNAME = "oslo.service" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb index 7036bd03..7bec9804 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.utils_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRCNAME = "oslo.utils" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" PV = "3.28.0+git${SRCPV}" SRCREV = "8b3965b9bbe1e31a4939f2f69c5239d6d5c7f72c" 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 e3bfc53f..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,14 +1,14 @@ 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}" SRCREV = "8db69628834332ed2df6690135be5d5c1ebd3ca1" SRCNAME = "oslo.versionedobjects" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb b/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb index 6f060be8..e748a1f5 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslo.vmware_git.bb @@ -8,7 +8,7 @@ PV = "3.4.0+git${SRCPV}" SRCREV = "32c8d43a20cb6a29f03324fbc2e6cad3bfb5a294" SRCNAME = "oslo.vmware" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb b/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb index 04f6d490..c4416505 100644 --- a/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-oslotest_git.bb @@ -10,7 +10,7 @@ PV = "2.17.2+git${SRCPV}" SRCREV = "54ac29c3edd46530c1ee90eb860a7e686d9a3740" SRCNAME = "oslotest" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb b/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb index bdd05030..b5de2621 100644 --- a/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-ovsdbapp_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2" SRCNAME = "ovsdbapp" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/pike;protocol=https" PV = "0.4.4+git${SRCPV}" SRCREV = "40064ca2d99389f278028508a17f2e38d6df6f10" diff --git a/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb b/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb index b243a4ab..4f9618d4 100644 --- a/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-pycadf_git.bb @@ -8,7 +8,7 @@ PV = "3.1.0+git${SRCPV}" SRCREV = "2402013a8719873d65136fc283e1855166adbc26" SRCNAME = "pycadf" -SRC_URI = "git://github.com/openstack/${SRCNAME}.git" +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https" S = "${WORKDIR}/git" 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-saharaclient_git.bb b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb index c75ef5d6..7dfd0f82 100644 --- a/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-saharaclient_git.bb @@ -22,7 +22,7 @@ SRCNAME = "saharaclient" inherit setuptools3 -SRC_URI = "git://github.com/openstack/python-saharaclient.git;branch=master" +SRC_URI = "git://github.com/openstack/python-saharaclient.git;branch=master;protocol=https" PV = "3.2.1+git${SRCPV}" SRCREV = "a9fee07108c432e20a3ca7760541d4fcb4f14811" diff --git a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb index d146730c..51cf18ec 100644 --- a/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-salttesting_git.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=f36f1e9e3e30f90180efdf7e40d943e5" -SRC_URI = "git://github.com/saltstack/salt-testing.git;branch=develop \ +SRC_URI = "git://github.com/saltstack/salt-testing.git;branch=develop;protocol=https \ file://0001-Add-ptest-output-option-to-test-suite.patch \ " 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-trollius_git.bb b/meta-openstack/recipes-devtools/python/python3-trollius_git.bb index 8df1948c..12941baa 100644 --- a/meta-openstack/recipes-devtools/python/python3-trollius_git.bb +++ b/meta-openstack/recipes-devtools/python/python3-trollius_git.bb @@ -8,7 +8,7 @@ PV = "3.4.3+git${SRCPV}" SRCREV = "7b2d8abfce1d7ef18ef516f9b1b7032172630375" SRCNAME = "trollius" -SRC_URI = "git://github.com/haypo/${SRCNAME}.git;branch=trollius" +SRC_URI = "git://github.com/haypo/${SRCNAME}.git;branch=trollius;protocol=https" S = "${WORKDIR}/git" 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/bundler_git.bb b/meta-openstack/recipes-devtools/ruby/bundler_git.bb index f7617a0c..a4300a27 100644 --- a/meta-openstack/recipes-devtools/ruby/bundler_git.bb +++ b/meta-openstack/recipes-devtools/ruby/bundler_git.bb @@ -25,7 +25,7 @@ SRCREV = "06e3647c117da210ffd15a174624497830addd7b" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/bundler/bundler.git;branch=1-7-stable \ + git://github.com/bundler/bundler.git;branch=1-7-stable;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb index 993e2926..199fd41e 100644 --- a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb +++ b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb @@ -21,7 +21,7 @@ SRCREV = "28fe2928469885b0138de4d4270c6eccac8ab482" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/chef-zero.git;branch=master \ + git://github.com/opscode/chef-zero.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/coderay_git.bb b/meta-openstack/recipes-devtools/ruby/coderay_git.bb index 32536993..a45942f6 100644 --- a/meta-openstack/recipes-devtools/ruby/coderay_git.bb +++ b/meta-openstack/recipes-devtools/ruby/coderay_git.bb @@ -16,7 +16,7 @@ SRCREV = "a48037b85a12228431b32103786456f36beb355f" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/rubychan/coderay.git \ + git://github.com/rubychan/coderay.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.6.bb b/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.9.bb index a328203e..e2c99d7d 100644 --- a/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.6.bb +++ b/meta-openstack/recipes-devtools/ruby/concurrent-ruby_1.1.9.bb @@ -2,11 +2,17 @@ SUMMARY = "Modern concurrency tools including agents, futures, promises, thread HOMEPAGE = "http://www.concurrent-ruby.com" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fde65ae93d18826f70c6fe125aa04297" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e319104fe1435b64fc0a67032db44f02" -SRC_URI = "git://github.com/ruby-concurrency/concurrent-ruby.git;protocol=https;tag=v1.1.6\ - file://0001-Removed-check-for-concurrent_ruby.jar.patch" +SRC_URI = "git://github.com/ruby-concurrency/concurrent-ruby.git;protocol=https;branch=master \ + file://0001-Removed-check-for-concurrent_ruby.jar.patch \ + " +SRCREV = "52c08fca13cc3811673ea2f6fdb244a0e42e0ebe" S = "${WORKDIR}/git" +do_install:append () { + rmdir --ignore-fail-on-non-empty ${D}${libdir}/ruby/gems/${RUBY_GEM_VERSION}/plugins +} + inherit ruby 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/diff-lcs_git.bb b/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb index 8566fb3b..6f6758c0 100644 --- a/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb +++ b/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb @@ -20,7 +20,7 @@ SRCREV = "704bc2c0000b5f9bf49d607dcd0d3989b63b2595" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/halostatue/diff-lcs.git \ + git://github.com/halostatue/diff-lcs.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/erubis_git.bb b/meta-openstack/recipes-devtools/ruby/erubis_git.bb index 540231a9..16fd5429 100644 --- a/meta-openstack/recipes-devtools/ruby/erubis_git.bb +++ b/meta-openstack/recipes-devtools/ruby/erubis_git.bb @@ -16,7 +16,7 @@ SRCREV = "1f0b38d9e66885f8af0244d12d1a6702fc04a8de" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/kwatch/erubis.git \ + git://github.com/kwatch/erubis.git;branch=master;protocol=https \ " inherit ruby 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 71b0533e..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}" +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/hashie_git.bb b/meta-openstack/recipes-devtools/ruby/hashie_git.bb index f26cadb6..65ccb119 100644 --- a/meta-openstack/recipes-devtools/ruby/hashie_git.bb +++ b/meta-openstack/recipes-devtools/ruby/hashie_git.bb @@ -16,7 +16,7 @@ SRCREV = "02df8918dd07ef2da1aceba5fd17e8757027345a" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/intridea/hashie.git \ + git://github.com/intridea/hashie.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/highline_git.bb b/meta-openstack/recipes-devtools/ruby/highline_git.bb index 3bfcd882..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" @@ -22,7 +22,7 @@ SRCREV = "327051c1c217df2880c3a53f31484f7e815e847f" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/JEG2/highline.git \ + git://github.com/JEG2/highline.git;branch=master;protocol=https \ " inherit ruby 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 6bf809ed..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" +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/ipaddress_git.bb b/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb index 017c6c73..29a89336 100644 --- a/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb +++ b/meta-openstack/recipes-devtools/ruby/ipaddress_git.bb @@ -20,7 +20,7 @@ SRCREV = "96aaf68210d644157bd57a6ec3e38c49f38bfc34" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/ipaddress-gem/ipaddress.git \ + git://github.com/ipaddress-gem/ipaddress.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/json_git.bb b/meta-openstack/recipes-devtools/ruby/json_git.bb index f7b3dd79..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" @@ -16,7 +16,7 @@ SRCREV = "4cf6c6270f52888997ec1b626b9f557db4f26f2e" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/flori/json.git;branch=v1.8 \ + git://github.com/flori/json.git;branch=v1.8;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/method-source_git.bb b/meta-openstack/recipes-devtools/ruby/method-source_git.bb index 39b24d1c..6756f998 100644 --- a/meta-openstack/recipes-devtools/ruby/method-source_git.bb +++ b/meta-openstack/recipes-devtools/ruby/method-source_git.bb @@ -16,7 +16,7 @@ SRCREV = "1b1f8323a7c25f29331fe32511f50697e5405dbd" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/banister/method_source.git \ + git://github.com/banister/method_source.git;branch=master;protocol=https \ file://gemspec-bump-version.patch \ " diff --git a/meta-openstack/recipes-devtools/ruby/mime-types_git.bb b/meta-openstack/recipes-devtools/ruby/mime-types_git.bb index 4216db17..989cb626 100644 --- a/meta-openstack/recipes-devtools/ruby/mime-types_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mime-types_git.bb @@ -19,7 +19,7 @@ SRCREV = "bc15d62118b59aabbc9cb6e5734b65bf3bc273f0" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/halostatue/mime-types.git \ + git://github.com/halostatue/mime-types.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb index c34b74bc..d10835d9 100644 --- a/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb @@ -17,7 +17,7 @@ SRCREV = "db24a56c6f5b99114998a50942220a7023060229" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/mixlib-authentication.git \ + git://github.com/opscode/mixlib-authentication.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb index 02bf49ca..44309c46 100644 --- a/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mixlib-cli_git.bb @@ -17,7 +17,7 @@ SRCREV = "b3b3c12141b5380ec61945770690fc1ae31d92b0" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/mixlib-cli.git \ + git://github.com/opscode/mixlib-cli.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb index f58c15c2..68eb393e 100644 --- a/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mixlib-config_git.bb @@ -17,7 +17,7 @@ SRCREV = "d7bdd7c999e13a0bd67607011731a536323dd51c" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/mixlib-config.git \ + git://github.com/opscode/mixlib-config.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb index cef61cb0..52a95d6e 100644 --- a/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mixlib-log_git.bb @@ -17,7 +17,7 @@ SRCREV = "b750625a79cc46fffe6b886320f96e7874497fa0" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/mixlib-log.git \ + git://github.com/opscode/mixlib-log.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb index 9abe92c8..70e316e5 100644 --- a/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb +++ b/meta-openstack/recipes-devtools/ruby/mixlib-shellout_git.bb @@ -20,7 +20,7 @@ SRCREV = "27ba1e882dcab280527aa1764d1b45aca3ef5961" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/mixlib-shellout.git \ + git://github.com/opscode/mixlib-shellout.git;branch=master;protocol=https \ " inherit ruby 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 063a8521..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}" +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/net-ssh-gateway_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb index 21fe4064..160237c3 100644 --- a/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb +++ b/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb @@ -20,7 +20,7 @@ SRCREV = "1de7611a7f7cedbe7a4c6cf3798c88d00637582d" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/net-ssh/net-ssh-gateway.git \ + git://github.com/net-ssh/net-ssh-gateway.git;branch=master;protocol=https \ file://gemspec-don-t-force-the-use-of-gem-private_key.pem.patch \ " diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb index 965eae1e..d95042e5 100644 --- a/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb +++ b/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb @@ -20,7 +20,7 @@ SRCREV = "5b668d5ef34102c9ac159a8f21c889fdc7f99f1b" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/net-ssh/net-ssh-multi.git \ + git://github.com/net-ssh/net-ssh-multi.git;branch=master;protocol=https \ file://gemspec-don-t-force-the-use-of-gem-private_key.pem.patch \ " diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb index f2591ffa..344b34bb 100644 --- a/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb +++ b/meta-openstack/recipes-devtools/ruby/net-ssh_git.bb @@ -18,7 +18,7 @@ SRCREV = "9f8607984d8e904f211cc5edb39ab2a2ca94008e" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/net-ssh/net-ssh.git \ + git://github.com/net-ssh/net-ssh.git;branch=master;protocol=https \ file://gemspec-don-t-force-the-use-of-gem-private_key.pem.patch \ " diff --git a/meta-openstack/recipes-devtools/ruby/ohai_git.bb b/meta-openstack/recipes-devtools/ruby/ohai_git.bb index ee5c7351..f7bad071 100644 --- a/meta-openstack/recipes-devtools/ruby/ohai_git.bb +++ b/meta-openstack/recipes-devtools/ruby/ohai_git.bb @@ -20,7 +20,7 @@ SRCREV = "5c166cf3fa4b2af541ee54855aae73c809044b3d" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/ohai.git \ + git://github.com/opscode/ohai.git;branch=master;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/pry_git.bb b/meta-openstack/recipes-devtools/ruby/pry_git.bb index 3480cdc9..d2c33256 100644 --- a/meta-openstack/recipes-devtools/ruby/pry_git.bb +++ b/meta-openstack/recipes-devtools/ruby/pry_git.bb @@ -18,7 +18,7 @@ SRCREV = "191dc519813402acd6db0d7f73e652ed61f8111f" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/pry/pry.git \ + git://github.com/pry/pry.git;branch=master;protocol=https \ file://rdoc-fixup-opt.banner-heredoc.patch \ " diff --git a/meta-openstack/recipes-devtools/ruby/rack_git.bb b/meta-openstack/recipes-devtools/ruby/rack_git.bb index 41f01c54..2c03cff3 100644 --- a/meta-openstack/recipes-devtools/ruby/rack_git.bb +++ b/meta-openstack/recipes-devtools/ruby/rack_git.bb @@ -20,7 +20,7 @@ SRCREV = "134d6218d0881d87ae6a522e88eafbddb6cd1bb7" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/rack/rack.git;branch=1-6-stable \ + git://github.com/rack/rack.git;branch=1-6-stable;protocol=https \ " inherit ruby diff --git a/meta-openstack/recipes-devtools/ruby/rest-client_git.bb b/meta-openstack/recipes-devtools/ruby/rest-client_git.bb index 0837a3b3..706af39c 100644 --- a/meta-openstack/recipes-devtools/ruby/rest-client_git.bb +++ b/meta-openstack/recipes-devtools/ruby/rest-client_git.bb @@ -18,7 +18,7 @@ SRCREV = "40eddc184a7b3fe79f9b68f291e06df4c1fbcb0b" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/rest-client/rest-client.git \ + git://github.com/rest-client/rest-client.git;branch=master;protocol=https \ " inherit ruby 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 fbf651eb..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" +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/slop_git.bb b/meta-openstack/recipes-devtools/ruby/slop_git.bb index 043284cd..14debbf2 100644 --- a/meta-openstack/recipes-devtools/ruby/slop_git.bb +++ b/meta-openstack/recipes-devtools/ruby/slop_git.bb @@ -16,7 +16,7 @@ SRCREV = "50c4d5a6553c9d0b78dee35a092ea3a40c136fa1" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/leejarvis/slop.git \ + git://github.com/leejarvis/slop.git;branch=master;protocol=https \ " inherit ruby 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 53a2f8a0..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" +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/systemu_git.bb b/meta-openstack/recipes-devtools/ruby/systemu_git.bb index 606103e3..fa407f1d 100644 --- a/meta-openstack/recipes-devtools/ruby/systemu_git.bb +++ b/meta-openstack/recipes-devtools/ruby/systemu_git.bb @@ -17,7 +17,7 @@ SRCREV = "cb253a8bf213beea69f27418202e936a22d7308f" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/ahoward/systemu.git \ + git://github.com/ahoward/systemu.git;branch=master;protocol=https \ " inherit ruby 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 5fb6005d..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" +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 2f7bc66a..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" +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 43934763..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" +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-devtools/ruby/yard_git.bb b/meta-openstack/recipes-devtools/ruby/yard_git.bb index e7a25b1f..2728802e 100644 --- a/meta-openstack/recipes-devtools/ruby/yard_git.bb +++ b/meta-openstack/recipes-devtools/ruby/yard_git.bb @@ -20,7 +20,7 @@ SRCREV = "d83194e1a09098ec5be28b616cde3b9a15380873" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/lsegal/yard.git;branch=main \ + git://github.com/lsegal/yard.git;branch=main;protocol=https \ " inherit ruby 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/images/openstack-image-aio.bb b/meta-openstack/recipes-extended/images/openstack-image-aio.bb index 858c8e99..f01d0ed5 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-aio.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-aio.bb @@ -27,7 +27,7 @@ inherit identity inherit monitor # check for 5G of free space, so we use 5G as a starting point. -IMAGE_ROOTFS_EXTRA_SPACE:append += "+ 5000000" +IMAGE_ROOTFS_EXTRA_SPACE += "+ 5000000" POST_KEYSTONE_SETUP_COMMAND = "/etc/keystone/hybrid-backend-setup" diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb index 15726fde..a725e2e9 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-compute.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb @@ -19,6 +19,6 @@ inherit monitor # Ensure extra space for guest images, and rabbit MQ has a hard coded # check for 2G of free space, so we use 3G as a starting point. -IMAGE_ROOTFS_EXTRA_SPACE:append += "+ 3000000" +IMAGE_ROOTFS_EXTRA_SPACE:append = " + 3000000" # ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb index 7f41a086..96dc80c4 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb @@ -24,5 +24,5 @@ inherit monitor # Ensure extra space for guest images, and rabbit MQ has a hard coded # check for 2G of free space, so we use 5G as a starting point. -IMAGE_ROOTFS_EXTRA_SPACE:append += "+ 5000000" +IMAGE_ROOTFS_EXTRA_SPACE:append = " + 5000000" 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/novnc/novnc_git.bb b/meta-openstack/recipes-extended/novnc/novnc_git.bb index 19802c91..82dcd4b3 100644 --- a/meta-openstack/recipes-extended/novnc/novnc_git.bb +++ b/meta-openstack/recipes-extended/novnc/novnc_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b428e7772bf00c07fb7b863b80358adf" SRCREV = "9142f8f0f7b4a53447f5cfec3a797cbf0d6204a9" PV = "1.2.0+git${SRCPV}" -SRC_URI = "git://github.com/kanaka/noVNC.git" +SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https" S = "${WORKDIR}/git" 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-extended/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb index ed5c4048..4854516c 100644 --- a/meta-openstack/recipes-extended/tempest/tempest_git.bb +++ b/meta-openstack/recipes-extended/tempest/tempest_git.bb @@ -9,7 +9,7 @@ SRCNAME = "tempest" inherit setuptools3 identity hosts -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https \ file://tempest.conf \ file://logging.conf \ " diff --git a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb index f6559f97..62e0df42 100644 --- a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb +++ b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=33ab1ce13e2312dddfad07f97f66321f" SRCNAME = "uwsgi" -SRC_URI = "git://github.com/unbit/uwsgi.git;branch=uwsgi-2.0 \ +SRC_URI = "git://github.com/unbit/uwsgi.git;branch=uwsgi-2.0;protocol=https \ file://Add-explicit-breaks-to-avoid-implicit-passthrough.patch \ file://more-Add-explicit-breaks-to-avoid-implicit-passthrough.patch \ " diff --git a/meta-openstack/recipes-support/chef/chef_git.bb b/meta-openstack/recipes-support/chef/chef_git.bb index 8a325846..8a881523 100644 --- a/meta-openstack/recipes-support/chef/chef_git.bb +++ b/meta-openstack/recipes-support/chef/chef_git.bb @@ -18,7 +18,7 @@ SRCREV = "1dc20627aa5d742376269dc5b4d5c67f34d08008" S = "${WORKDIR}/git" SRC_URI = " \ - git://github.com/opscode/chef.git;branch=12.4-stable \ + git://github.com/opscode/chef.git;branch=12.4-stable;protocol=https \ file://0001-chang-ksh-to-sh.patch \ " 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 fbb46d31..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,18 +9,18 @@ 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" SRCNAME = "mod_wsgi" SRC_URI = "\ - git://github.com/GrahamDumpleton/mod_wsgi.git \ + git://github.com/GrahamDumpleton/mod_wsgi.git;branch=master;protocol=https \ 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/salt/salt_3001.1.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb index fbd58558..4a77fb81 100644 --- a/meta-openstack/recipes-support/salt/salt_3001.1.bb +++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb @@ -18,7 +18,7 @@ PACKAGECONFIG ??= "zeromq" PACKAGECONFIG[zeromq] = ",,python3-pyzmq python3-pycrypto," PACKAGECONFIG[tcp] = ",,python3-pycrypto" -SRC_URI = "https://files.pythonhosted.org/packages/source/s/${PN}/${PN}-${PV}.tar.gz \ +SRC_URI = "https://files.pythonhosted.org/packages/source/s/${BPN}/${BPN}-${PV}.tar.gz \ " SRC_URI[md5sum] = "4174a6dd2c7eee808086ca06bdd928c9" 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 2006e1f9..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" @@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "\ # Version is based on checkout 0.1.4" PV = "0.1.4" SRCREV = "19ade3cf38cc5f5b61fd038f5ce5f4cdb080e9ca" -SRC_URI = "git://anongit.freedesktop.org/spice/spice-html5" +SRC_URI = "git://anongit.freedesktop.org/spice/spice-html5;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb index d74de4ef..9c5c24bf 100644 --- a/meta-openstack/recipes-support/tgt/tgt_git.bb +++ b/meta-openstack/recipes-support/tgt/tgt_git.bb @@ -1,13 +1,13 @@ 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" SRCREV = "b43dbc6711e43c0a32cc4d9df22884841d911d51" PV = "1.0.79+git${SRCPV}" -SRC_URI = "git://github.com/fujita/tgt.git \ +SRC_URI = "git://github.com/fujita/tgt.git;branch=master;protocol=https \ file://0001-Correct-the-path-of-header-files-check-in-Yocto-buil.patch \ file://0001-usr-Makefile-WARNING-fix.patch \ file://usr-Makefile-apply-LDFLAGS-to-all-executables.patch \ |