diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-03-09 17:01:55 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-12 22:11:44 +0000 |
| commit | 0c6d7cb95ea9e6a44f50560d6d2dd5a5da355a70 (patch) | |
| tree | 2523e2d9e60af6e74f19e81164c1ba37b2fafb62 /meta | |
| parent | 4fbf761027dcfc0b163e23701f9ea814cdca359a (diff) | |
| download | poky-0c6d7cb95ea9e6a44f50560d6d2dd5a5da355a70.tar.gz | |
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb | 14 |
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 | |||
| 17 | 17 | ||
| 18 | DEPENDS += "avahi gtk+ libglade" | 18 | DEPENDS += "avahi gtk+ libglade" |
| 19 | 19 | ||
| 20 | AVAHI_GTK = "--enable-gtk --disable-gtk3" | 20 | AVAHI_GTK = "--enable-gtk --disable-gtk3 --disable-pygtk" |
| 21 | 21 | ||
| 22 | S = "${WORKDIR}/avahi-${PV}" | 22 | S = "${WORKDIR}/avahi-${PV}" |
| 23 | 23 | ||
| 24 | PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc python-avahi avahi-discover avahi-discover-standalone" | 24 | PACKAGES = "${PN} ${PN}-utils ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc python-avahi avahi-discover" |
| 25 | 25 | ||
| 26 | FILES_${PN} = "${libdir}/libavahi-ui*.so.*" | 26 | FILES_${PN} = "${libdir}/libavahi-ui*.so.*" |
| 27 | FILES_${PN}-dev += "${libdir}/libavahi-ui${SOLIBSDEV}" | 27 | FILES_${PN}-dev += "${libdir}/libavahi-ui${SOLIBSDEV}" |
| @@ -30,13 +30,11 @@ FILES_${PN}-staticdev += "${libdir}/libavahi-ui.a" | |||
| 30 | FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" | 30 | FILES_${PN}-utils = "${bindir}/b* ${datadir}/applications/b*" |
| 31 | 31 | ||
| 32 | FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi ${PYTHON_SITEPACKAGES_DIR}/avahi_discover" | 32 | FILES_python-avahi = "${PYTHON_SITEPACKAGES_DIR}/avahi ${PYTHON_SITEPACKAGES_DIR}/avahi_discover" |
| 33 | FILES_avahi-discover = "${bindir}/avahi-discover \ | 33 | FILES_avahi-discover = "${datadir}/applications/avahi-discover.desktop \ |
| 34 | ${datadir}/applications/avahi-discover.desktop \ | 34 | ${datadir}/avahi/interfaces/avahi-discover* \ |
| 35 | ${datadir}/avahi/interfaces/avahi-discover*" | 35 | ${bindir}/avahi-discover-standalone \ |
| 36 | FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \ | 36 | ${datadir}/avahi/interfaces/avahi-discover.glade" |
| 37 | ${datadir}/avahi/interfaces/avahi-discover.glade" | ||
| 38 | 37 | ||
| 39 | RDEPENDS_avahi-discover = "python-avahi python-pygtk" | ||
| 40 | RDEPENDS_python-avahi = "python-core python-dbus" | 38 | RDEPENDS_python-avahi = "python-core python-dbus" |
| 41 | 39 | ||
| 42 | 40 | ||