[meta-oe][PATCH 0/3] fix python-pygobject broken

[meta-oe][PATCH 0/3] fix python-pygobject broken

[Hongxu Jia]

The following changes since commit 9cd117a5dc5f26133a855d1cc3bf9604ae178685:

  chrony: Versatile implementation of NTP (2016-06-16 13:28:16 -0400)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib hongxu/fix-python
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=hongxu/fix-python

Hongxu Jia (3):
  Revert "python-pygobject, python-cloudeebus, python-dbusmock:
    Blacklist because of python-pygobject is broken"
  python-pygobject: fix do_configure failed
  python-cloudeebus: fix do_compile failure

 meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb             | 5 +----
 meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb     | 7 ++++---
 meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb | 5 +----
 meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb  | 3 ---
 4 files changed, 6 insertions(+), 14 deletions(-)

-- 
2.8.1

[PATCH 1/3] Revert "python-pygobject, python-cloudeebus, python-dbusmock: Blacklist because of python-pygobject is broken"

[Hongxu Jia]

This reverts commit b0fae32dfc447ef9864e077d05c51bbbf763565b.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb             | 5 +----
 meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb     | 2 --
 meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb | 3 ---
 meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb  | 3 ---
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
index 05e3daf..d6d16c0 100644
--- a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -27,10 +27,7 @@ do_install_append() {
 }
 
 RDEPENDS_${PN}-dev = "bluez-hcidump"
-RDEPENDS_${PN}-testtools += "python python-dbus"
-
-# http://lists.openembedded.org/pipermail/openembedded-devel/2016-June/107798.html
-# RDEPENDS_${PN}-testtools += "python-pygobject"
+RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
 
 ALLOW_EMPTY_libasound-module-bluez = "1"
 PACKAGES =+ "libasound-module-bluez ${PN}-testtools"
diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb
index 1c78e26..e4eeafb 100644
--- a/meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb
+++ b/meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb
@@ -29,5 +29,3 @@ do_install_append() {
     rm ${D}${includedir}/pygobject-3.0/pygobject.h ${D}${libdir}/pkgconfig/pygobject-3.0.pc
 }
 
-# http://lists.openembedded.org/pipermail/openembedded-devel/2016-June/107798.html
-PNBLACKLIST[python-pygobject] ?= "BROKEN: fails to build since it was moved to meta-oe"
diff --git a/meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb b/meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb
index d067358..120a8a7 100644
--- a/meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb
+++ b/meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb
@@ -14,9 +14,6 @@ inherit distutils
 DEPENDS_${PN} = "python python-distribute"
 RDEPENDS_${PN} = "python python-dbus python-json python-argparse python-pygobject python-autobahn python-twisted python-subprocess"
 
-# http://lists.openembedded.org/pipermail/openembedded-devel/2016-June/107798.html
-PNBLACKLIST[python-cloudeebus] ?= "Rdepends on broken python-pygobject"
-
 do_install_prepend() {
   install -d ${D}${PYTHON_SITEPACKAGES_DIR}/${PN}
 }
diff --git a/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb b/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb
index 244e59f..2520bfc 100644
--- a/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb
+++ b/meta-python/recipes-devtools/python/python-dbusmock_0.10.1.bb
@@ -9,9 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
 DEPENDS += "python-pygobject python-dbus"
 
-# http://lists.openembedded.org/pipermail/openembedded-devel/2016-June/107798.html
-PNBLACKLIST[python-dbusmock] ?= "Depends on broken python-pygobject"
-
 SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
 SRC_URI[md5sum] = "7370d325c4a75494dd71885ca65b79e8"
 SRC_URI[sha256sum] = "03aadc93bdc26ea18d4d78fcff7b6cb34f4e18623bc5cc41cf9539d663cee11e"
-- 
2.8.1

[PATCH 2/3] python-pygobject: fix do_configure failed

[Hongxu Jia]

Fix build failure since it was moved to meta-oe

http://lists.openembedded.org/pipermail/openembedded-devel/2016-June/107798.html

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb b/meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb
index e4eeafb..52ef425 100644
--- a/meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb
+++ b/meta-oe/recipes-devtools/python/python-pygobject_3.18.2.bb
@@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
 
 inherit autotools pkgconfig gnomebase distutils-base gobject-introspection
 
+PYTHON_BASEVERSION = "2.7"
+PYTHON_PN = "python"
+
 DEPENDS += "python glib-2.0"
 
 SRCNAME="pygobject"
@@ -20,7 +23,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 BBCLASSEXTEND = "native"
 
-EXTRA_OECONF = "--disable-cairo --with-python=python2.7"
+EXTRA_OECONF = "--disable-cairo --with-python=${PYTHON}"
 
 RDEPENDS_${PN} += "python-setuptools python-importlib"
 
-- 
2.8.1

[PATCH 3/3] python-cloudeebus: fix do_compile failure

[Hongxu Jia]

It fixed the following failure:
...
  2 Traceback (most recent call last):
  3   File "setup.py", line 24, in <module>
  4     from setuptools import setup
  5 ImportError: No module named setuptools
...

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb b/meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb
index 120a8a7..1490e22 100644
--- a/meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb
+++ b/meta-python/recipes-devtools/python/python-cloudeebus_0.6.0.bb
@@ -9,7 +9,7 @@ SRCREV = "b5cc957eeabfe98cb996baf8e5a0ac848993c3d4"
 
 S = "${WORKDIR}/git"
 
-inherit distutils 
+inherit distutils setuptools
 
 DEPENDS_${PN} = "python python-distribute"
 RDEPENDS_${PN} = "python python-dbus python-json python-argparse python-pygobject python-autobahn python-twisted python-subprocess"
-- 
2.8.1