summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/avahi/avahi.inc
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-06-08 12:06:13 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-09 14:48:28 (GMT)
commite8b3a1244440ea01a6671cc265ecc2244e1fd446 (patch)
tree3eba9e198126d3175fc72b9178938a87c3f46730 /meta/recipes-connectivity/avahi/avahi.inc
parent2c6ac68006c4ddbd05e3b621ad7a96d27e0e7a33 (diff)
downloadpoky-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 9e26a20..2ab037e 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -17,14 +17,10 @@ LICENSE = "GPLv2+ & LGPLv2.1+"
17 17
18DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade" 18DEPENDS = "expat libcap libdaemon dbus glib-2.0 gtk+ libglade"
19 19
20# uclibc has no nss
21RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
22RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
23
24SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ 20SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
25 file://00avahi-autoipd \ 21 file://00avahi-autoipd \
26 file://99avahi-autoipd \ 22 file://99avahi-autoipd \
27 file://initscript.patch" 23 file://initscript.patch"
28 24
29inherit autotools pkgconfig update-rc.d gettext 25inherit autotools pkgconfig update-rc.d gettext
30 26
@@ -34,6 +30,7 @@ EXTRA_OECONF = "--with-distro=debian \
34 --disable-gdbm \ 30 --disable-gdbm \
35 --disable-mono \ 31 --disable-mono \
36 --disable-monodoc \ 32 --disable-monodoc \
33 --disable-gtk3 \
37 --disable-qt3 \ 34 --disable-qt3 \
38 --disable-qt4 \ 35 --disable-qt4 \
39 --disable-python \ 36 --disable-python \
@@ -64,6 +61,15 @@ pkg_postrm_avahi-systemd() {
64 systemctl disable avahi-daemon.service 61 systemctl disable avahi-daemon.service
65} 62}
66 63
64# uclibc has no nss
65RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns"
66RRECOMMENDS_${PN}_append_libc-glibc = "libnss-mdns"
67
68RDEPENDS_avahi-daemon = "sysvinit-pidof"
69
70FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
71 ${sysconfdir}/avahi/avahi-autoipd.action \
72 ${sysconfdir}/dhcp3/*/avahi-autoipd"
67FILES_libavahi-common = "${libdir}/libavahi-common.so.*" 73FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
68FILES_libavahi-core = "${libdir}/libavahi-core.so.*" 74FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
69FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*" 75FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
@@ -78,7 +84,8 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \
78 ${sysconfdir}/init.d/avahi-daemon \ 84 ${sysconfdir}/init.d/avahi-daemon \
79 ${datadir}/avahi/introspection/*.introspect \ 85 ${datadir}/avahi/introspection/*.introspect \
80 ${datadir}/avahi/avahi-service.dtd \ 86 ${datadir}/avahi/avahi-service.dtd \
81 ${datadir}/avahi/service-types" 87 ${datadir}/avahi/service-types \
88 ${datadir}/dbus-1/system-services"
82FILES_libavahi-client = "${libdir}/libavahi-client.so.*" 89FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
83FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ 90FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
84 ${sysconfdir}/avahi/avahi-dnsconfd.action \ 91 ${sysconfdir}/avahi/avahi-dnsconfd.action \