aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi/avahi.inc
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-06-08 14:06:13 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-09 15:48:28 +0100
commite8b3a1244440ea01a6671cc265ecc2244e1fd446 (patch)
tree3eba9e198126d3175fc72b9178938a87c3f46730 /meta/recipes-connectivity/avahi/avahi.inc
parent2c6ac68006c4ddbd05e3b621ad7a96d27e0e7a33 (diff)
downloadopenembedded-core-contrib-e8b3a1244440ea01a6671cc265ecc2244e1fd446.tar.gz
avahi: fix dbus system-service packaging and move more things to .inc
(From OE-Core rev: dca03beb98f123cfc3e09a3b2870f7537f49dd3c) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/avahi/avahi.inc')
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc23
1 files changed, 15 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 9e26a20f22..2ab037eaf2 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -17,14 +17,10 @@ LICENSE = "GPLv2+ & LGPLv2.1+"
DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
-# uclibc has no nss
-RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
-RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
-
SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
- file://00avahi-autoipd \
- file://99avahi-autoipd \
- file://initscript.patch"
+ file://00avahi-autoipd \
+ file://99avahi-autoipd \
+ file://initscript.patch"
inherit autotools pkgconfig update-rc.d gettext
@@ -34,6 +30,7 @@ EXTRA_OECONF = "--with-distro=debian \
--disable-gdbm \
--disable-mono \
--disable-monodoc \
+ --disable-gtk3 \
--disable-qt3 \
--disable-qt4 \
--disable-python \
@@ -64,6 +61,15 @@ pkg_postrm_avahi-systemd() {
systemctl disable avahi-daemon.service
}
+# uclibc has no nss
+RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
+RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
+
+RDEPENDS_avahi-daemon = "sysvinit-pidof"
+
+FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
+ ${sysconfdir}/avahi/avahi-autoipd.action \
+ ${sysconfdir}/dhcp3/*/avahi-autoipd"
FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
@@ -78,7 +84,8 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \
${sysconfdir}/init.d/avahi-daemon \
${datadir}/avahi/introspection/*.introspect \
${datadir}/avahi/avahi-service.dtd \
- ${datadir}/avahi/service-types"
+ ${datadir}/avahi/service-types \
+ ${datadir}/dbus-1/system-services"
FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
${sysconfdir}/avahi/avahi-dnsconfd.action \