From 0303970c646ab8079d6336e0a4eb48c10e8a5f80 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 10 Jun 2013 16:15:49 -0700 Subject: [PATCH] avahi: inherit python classes, use PACKAGECONFIG Without using our python classes and having appropriate dependencies, the build is nondeterministic, and whether a python-avahi package is produced will vary depending on the host environment, yet avahi-discover is always produced, and it depends on python-avahi. (From OE-Core rev: 4599ef630c13224506671bf84569bfc240cd3032) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb index 7d56dad..557c1c1 100644 --- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb @@ -6,6 +6,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ require avahi.inc +inherit python-dir pythonnative + +PACKAGECONFIG ??= "python" +PACKAGECONFIG[python] = "--enable-python,--disable-python,python-native python" + PR = "${INC_PR}.0" SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d" @@ -26,7 +31,7 @@ FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a" FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" -FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi/*" +FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi ${PYTHON_SITEPACKAGES_DIR}/avahi_discover" FILES_avahi-discover = "${bindir}/avahi-discover \ ${datadir}/applications/avahi-discover.desktop \ ${datadir}/avahi/interfaces/avahi-discover*" @@ -34,7 +39,7 @@ FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \ ${datadir}/avahi/interfaces/avahi-discover.glade" RDEPENDS_avahi-discover = "python-avahi python-pygtk" -RDEPENDS_python-avahi = "python-dbus" +RDEPENDS_python-avahi = "python-core python-dbus" do_install_append () { -- 2.7.4