summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-03-09 17:01:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-12 22:11:44 +0000
commit0c6d7cb95ea9e6a44f50560d6d2dd5a5da355a70 (patch)
tree2523e2d9e60af6e74f19e81164c1ba37b2fafb62
parent4fbf761027dcfc0b163e23701f9ea814cdca359a (diff)
downloadopenembedded-core-contrib-0c6d7cb95ea9e6a44f50560d6d2dd5a5da355a70.tar.gz
openembedded-core-contrib-0c6d7cb95ea9e6a44f50560d6d2dd5a5da355a70.tar.bz2
openembedded-core-contrib-0c6d7cb95ea9e6a44f50560d6d2dd5a5da355a70.zip
avahi-ui: remove the dependency on python-pygtk by disabling avahi-discover
python-pygtk is removed in a separate commit; the reasons for that are explained in that commit's message. (From OE-Core rev: 40e7d522f1e0f9e5533cbb2660f7cec4d62b5d11) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb14
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
index adf93f0828..64e46a1ce4 100644
--- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
+++ b/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb
@@ -17,11 +17,11 @@ SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc
DEPENDS += "avahi gtk+ libglade"
-AVAHI_GTK = "--enable-gtk --disable-gtk3"
+AVAHI_GTK = "--enable-gtk --disable-gtk3 --disable-pygtk"
S = "${WORKDIR}/avahi-${PV}"
-PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc python-avahi avahi-discover avahi-discover-standalone"
+PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc python-avahi avahi-discover"
FILES_${PN} = "${libdir}/libavahi-ui*.so.*"
FILES_${PN}-dev += "${libdir}/libavahi-ui${SOLIBSDEV}"
@@ -30,13 +30,11 @@ FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a"
FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*"
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*"
-FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \
- ${datadir}/avahi/interfaces/avahi-discover.glade"
+FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \
+ ${datadir}/avahi/interfaces/avahi-discover* \
+ ${bindir}/avahi-discover-standalone \
+ ${datadir}/avahi/interfaces/avahi-discover.glade"
-RDEPENDS_avahi-discover = "python-avahi python-pygtk"
RDEPENDS_python-avahi = "python-core python-dbus"