From 3aea9262da4dfd639a9b376da09dc968042e8f8c Mon Sep 17 00:00:00 2001 From: Josep Puigdemont Date: Tue, 22 Sep 2015 12:28:21 +0200 Subject: python packages: add build dependency on python-pbr Some packages fail to build because their dependency on python-pbr during built time is not properly stated in the recipe. Sometimes the build succeeds anyway because the python-pbr package has already been built previously. To avoid the occasional build failure, this patch adds a dependency on python-pbr to all those packages that declare it as a dependency in their setup.py file. Signed-off-by: Josep Puigdemont Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-cliff_1.13.0.bb | 5 +++++ meta-openstack/recipes-devtools/python/python-glancestore_git.bb | 1 + .../recipes-devtools/python/python-heat-cfntools_1.2.8.bb | 8 ++++++++ meta-openstack/recipes-devtools/python/python-lockfile_0.10.2.bb | 8 ++++++++ meta-openstack/recipes-devtools/python/python-mox3_0.9.0.bb | 4 ++++ .../recipes-devtools/python/python-openstackclient_1.1.0.bb | 8 ++++++++ .../recipes-devtools/python/python-oslo.concurrency_1.9.0.bb | 2 ++ .../recipes-devtools/python/python-oslo.context_git.bb | 2 ++ meta-openstack/recipes-devtools/python/python-oslo.db_1.9.0.bb | 2 ++ meta-openstack/recipes-devtools/python/python-oslo.i18n_1.6.0.bb | 1 + meta-openstack/recipes-devtools/python/python-oslo.log_git.bb | 1 + .../recipes-devtools/python/python-oslo.messaging_git.bb | 2 ++ .../recipes-devtools/python/python-oslo.middleware_1.1.0.bb | 2 ++ .../recipes-devtools/python/python-oslo.policy_0.4.0.bb | 2 ++ .../recipes-devtools/python/python-oslo.rootwrap_1.7.0.bb | 2 ++ .../recipes-devtools/python/python-oslo.serialization_git.bb | 1 + meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb | 2 ++ .../recipes-devtools/python/python-oslo.vmware_1.19.0.bb | 1 + meta-openstack/recipes-devtools/python/python-oslotest_1.6.0.bb | 5 +++++ .../recipes-devtools/python/python-osprofiler_0.3.0.bb | 2 ++ meta-openstack/recipes-devtools/python/python-pycadf_0.9.0.bb | 2 ++ .../recipes-devtools/python/python-testscenarios_0.5.0.bb | 9 ++++++++- meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb | 5 ++++- meta-openstack/recipes-devtools/python/python-tooz_0.15.0.bb | 2 ++ 24 files changed, 77 insertions(+), 2 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-cliff_1.13.0.bb b/meta-openstack/recipes-devtools/python/python-cliff_1.13.0.bb index d8ef0af..49d4186 100644 --- a/meta-openstack/recipes-devtools/python/python-cliff_1.13.0.bb +++ b/meta-openstack/recipes-devtools/python/python-cliff_1.13.0.bb @@ -15,8 +15,13 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools +DEPENDS += "\ + python-pbr \ + " + RDEPENDS_${PN} += "python-prettytable \ python-cmd2 \ + python-pbr \ python-pyparsing" CLEANBROKEN = "1" diff --git a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb index ae32037..d80c570 100644 --- a/meta-openstack/recipes-devtools/python/python-glancestore_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glancestore_git.bb @@ -28,5 +28,6 @@ RDEPENDS_${PN} = " \ python-cinderclient \ python-oslo.config \ python-oslo.i18n \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb b/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb index 3d6756a..1915fc1 100644 --- a/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb +++ b/meta-openstack/recipes-devtools/python/python-heat-cfntools_1.2.8.bb @@ -15,3 +15,11 @@ SRC_URI[sha256sum] = "de7d93338d3afb71cc4c53d713740316ead0af3a9c869b1231617347e9 S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools + +DEPENDS += "\ + python-pbr \ + " + +RDPENDS_${PN} += "\ + python-pbr \ + " diff --git a/meta-openstack/recipes-devtools/python/python-lockfile_0.10.2.bb b/meta-openstack/recipes-devtools/python/python-lockfile_0.10.2.bb index 35131a7..5ae891b 100644 --- a/meta-openstack/recipes-devtools/python/python-lockfile_0.10.2.bb +++ b/meta-openstack/recipes-devtools/python/python-lockfile_0.10.2.bb @@ -14,3 +14,11 @@ SRC_URI[sha256sum] = "9e42252f17d1dd89ee31745e0c4fbe58862c25147eb0ef5295c9cd9bcb S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils + +DEPENDS += "\ + python-pbr \ + " + +RDEPENDS_${PN} += "\ + python-pbr \ + " diff --git a/meta-openstack/recipes-devtools/python/python-mox3_0.9.0.bb b/meta-openstack/recipes-devtools/python/python-mox3_0.9.0.bb index 7ef5276..6d58573 100644 --- a/meta-openstack/recipes-devtools/python/python-mox3_0.9.0.bb +++ b/meta-openstack/recipes-devtools/python/python-mox3_0.9.0.bb @@ -16,6 +16,10 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools +DEPENDS += "\ + python-pbr \ + " + RDEPENDS_${PN} += " \ python-pbr \ python-fixtures \ diff --git a/meta-openstack/recipes-devtools/python/python-openstackclient_1.1.0.bb b/meta-openstack/recipes-devtools/python/python-openstackclient_1.1.0.bb index 3fd26d3..3aa733e 100644 --- a/meta-openstack/recipes-devtools/python/python-openstackclient_1.1.0.bb +++ b/meta-openstack/recipes-devtools/python/python-openstackclient_1.1.0.bb @@ -14,3 +14,11 @@ SRC_URI[sha256sum] = "875b54ac95e29cc83ae76513b48306c8493c12d5ba7d23aea3432216f2 S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools + +DEPENDS += "\ + python-pbr \ + " + +RDEPENDS_${PN} += "\ + python-pbr \ + " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.concurrency_1.9.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.concurrency_1.9.0.bb index 76d3424..c82f6ba 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.concurrency_1.9.0.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.concurrency_1.9.0.bb @@ -19,8 +19,10 @@ inherit setuptools DEPENDS += " \ python-pip \ + python-pbr \ " # RDEPENDS_default: RDEPENDS_${PN} += " \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb index 05034f9..ec2651e 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.context_git.bb @@ -18,9 +18,11 @@ inherit setuptools DEPENDS += " \ python-pip \ python-babel \ + python-pbr \ " # RDEPENDS_default: RDEPENDS_${PN} += " \ bash \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.db_1.9.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.db_1.9.0.bb index 9ca1742..30f98f5 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.db_1.9.0.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.db_1.9.0.bb @@ -17,6 +17,7 @@ inherit setuptools DEPENDS += " \ python-pip \ + python-pbr \ " RDEPENDS_${PN} += " \ @@ -28,4 +29,5 @@ RDEPENDS_${PN} += " \ python-sqlalchemy \ python-sqlalchemy-migrate \ python-stevedore \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.6.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.6.0.bb index 575a8e5..2b47833 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.6.0.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.i18n_1.6.0.bb @@ -25,4 +25,5 @@ DEPENDS += " \ # RDEPENDS_default: RDEPENDS_${PN} += " \ python-babel \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb index 974578b..bfcbe31 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.log_git.bb @@ -18,6 +18,7 @@ inherit setuptools DEPENDS += " \ python-pip \ python-babel \ + python-pbr \ " # RDEPENDS_default: diff --git a/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb index 8bb85cb..8841ec0 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.messaging_git.bb @@ -19,9 +19,11 @@ inherit setuptools DEPENDS += " \ python-pip \ + python-pbr \ " # RDEPENDS_default: RDEPENDS_${PN} += " \ bash \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.middleware_1.1.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.middleware_1.1.0.bb index b368eca..5c891f3 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.middleware_1.1.0.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.middleware_1.1.0.bb @@ -19,8 +19,10 @@ inherit setuptools DEPENDS += " \ python-pip \ + python-pbr \ " # RDEPENDS_default: RDEPENDS_${PN} += " \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.policy_0.4.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.policy_0.4.0.bb index 2816559..bfd6953 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.policy_0.4.0.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.policy_0.4.0.bb @@ -18,10 +18,12 @@ inherit setuptools DEPENDS += " \ python-pip \ + python-pbr \ " RDEPENDS_${PN} += " \ python-oslo.config \ python-oslo.i18n \ python-oslo.serialization \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_1.7.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_1.7.0.bb index d087a38..d391ed3 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_1.7.0.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.rootwrap_1.7.0.bb @@ -19,8 +19,10 @@ inherit setuptools DEPENDS += " \ python-pip \ + python-pbr \ " # RDEPENDS_default: RDEPENDS_${PN} += " \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb index 7f0fb9c..db2869c 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.serialization_git.bb @@ -24,4 +24,5 @@ DEPENDS += " \ # RDEPENDS_default: RDEPENDS_${PN} += " \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb index 27a80b6..33c7e53 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.utils_git.bb @@ -19,8 +19,10 @@ inherit setuptools DEPENDS += " \ python-pip \ + python-pbr \ " # RDEPENDS_default: RDEPENDS_${PN} += " \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslo.vmware_1.19.0.bb b/meta-openstack/recipes-devtools/python/python-oslo.vmware_1.19.0.bb index ace65ba..f39ff57 100644 --- a/meta-openstack/recipes-devtools/python/python-oslo.vmware_1.19.0.bb +++ b/meta-openstack/recipes-devtools/python/python-oslo.vmware_1.19.0.bb @@ -21,4 +21,5 @@ DEPENDS += " \ " RDEPENDS_${PN} += " \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-oslotest_1.6.0.bb b/meta-openstack/recipes-devtools/python/python-oslotest_1.6.0.bb index 30cff23..6f4f766 100644 --- a/meta-openstack/recipes-devtools/python/python-oslotest_1.6.0.bb +++ b/meta-openstack/recipes-devtools/python/python-oslotest_1.6.0.bb @@ -18,6 +18,10 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools +DEPENDS += "\ + python-pbr \ + " + RDEPENDS_${PN} = "python-fixtures \ python-subunit \ python-testrepository \ @@ -25,5 +29,6 @@ RDEPENDS_${PN} = "python-fixtures \ python-testtools \ python-mock \ python-mox \ + python-pbr \ bash \ " diff --git a/meta-openstack/recipes-devtools/python/python-osprofiler_0.3.0.bb b/meta-openstack/recipes-devtools/python/python-osprofiler_0.3.0.bb index 7e1fc09..1883dbb 100644 --- a/meta-openstack/recipes-devtools/python/python-osprofiler_0.3.0.bb +++ b/meta-openstack/recipes-devtools/python/python-osprofiler_0.3.0.bb @@ -20,10 +20,12 @@ inherit setuptools DEPENDS += " \ python-pip \ + python-pbr \ " # RDEPENDS_default: RDEPENDS_${PN} += " \ python-six \ python-webob \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-pycadf_0.9.0.bb b/meta-openstack/recipes-devtools/python/python-pycadf_0.9.0.bb index a363119..afdc99b 100644 --- a/meta-openstack/recipes-devtools/python/python-pycadf_0.9.0.bb +++ b/meta-openstack/recipes-devtools/python/python-pycadf_0.9.0.bb @@ -19,6 +19,7 @@ FILES_${PN} += "${datadir}/etc/${SRCNAME}/*" DEPENDS += " \ python-pip \ + python-pbr \ " RDEPENDS_${PN} += " \ @@ -29,4 +30,5 @@ RDEPENDS_${PN} += " \ python-pytz \ python-six \ python-webob \ + python-pbr \ " diff --git a/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb b/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb index 34c241b..994b6b5 100644 --- a/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb +++ b/meta-openstack/recipes-devtools/python/python-testscenarios_0.5.0.bb @@ -16,4 +16,11 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit setuptools -RDEPENDS_${PN} += " python-testtools" +DEPENDS += "\ + python-pbr \ + " + +RDEPENDS_${PN} += "\ + python-testtools \ + python-pbr \ + " diff --git a/meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb b/meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb index a58c91a..fe03a5f 100644 --- a/meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb +++ b/meta-openstack/recipes-devtools/python/python-testtools_1.8.0.bb @@ -21,4 +21,7 @@ DEPENDS += " \ python-pbr \ " -RDEPENDS_${PN} += "python-extras" +RDEPENDS_${PN} += "\ + python-extras \ + python-pbr \ + " diff --git a/meta-openstack/recipes-devtools/python/python-tooz_0.15.0.bb b/meta-openstack/recipes-devtools/python/python-tooz_0.15.0.bb index dd4ed52..75e921e 100644 --- a/meta-openstack/recipes-devtools/python/python-tooz_0.15.0.bb +++ b/meta-openstack/recipes-devtools/python/python-tooz_0.15.0.bb @@ -19,6 +19,7 @@ inherit setuptools DEPENDS += " \ python-pip \ + python-pbr \ " # RDEPENDS_default: @@ -27,4 +28,5 @@ RDEPENDS_${PN} += " \ python-zake \ python-sysv-ipc \ python-memcache \ + python-pbr \ " -- cgit v1.2.3-54-g00ecf