summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc21
1 files changed, 13 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 185207b65d..3a4547c3cf 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -37,10 +37,13 @@ USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \
37 -c \"Avahi autoip daemon\" \ 37 -c \"Avahi autoip daemon\" \
38 avahi-autoipd" 38 avahi-autoipd"
39 39
40inherit autotools pkgconfig update-rc.d gettext useradd 40inherit autotools pkgconfig update-rc.d gettext systemd useradd
41 41
42EXTRA_OECONF = "--with-distro=debian \ 42SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
43 --disable-introspection \ 43SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
44SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
45
46EXTRA_OECONF = "--disable-introspection \
44 --with-avahi-priv-access-group=adm \ 47 --with-avahi-priv-access-group=adm \
45 --disable-stack-protector \ 48 --disable-stack-protector \
46 --disable-gdbm \ 49 --disable-gdbm \
@@ -50,10 +53,15 @@ EXTRA_OECONF = "--with-distro=debian \
50 --disable-qt4 \ 53 --disable-qt4 \
51 --disable-python \ 54 --disable-python \
52 --disable-doxygen-doc \ 55 --disable-doxygen-doc \
53 --with-systemdsystemunitdir=${systemd_unitdir}/system/ \ 56 ${EXTRA_OECONF_SYSVINIT} \
57 ${EXTRA_OECONF_SYSTEMD} \
54 ${AVAHI_GTK} \ 58 ${AVAHI_GTK} \
55 " 59 "
56 60
61# The distro choice determines what init scripts are installed
62EXTRA_OECONF_SYSVINIT = "${@base_contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
63EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','',d)}"
64
57AVAHI_GTK ?= "--disable-gtk --disable-gtk3" 65AVAHI_GTK ?= "--disable-gtk --disable-gtk3"
58 66
59LDFLAGS_append_libc-uclibc = " -lintl" 67LDFLAGS_append_libc-uclibc = " -lintl"
@@ -64,9 +72,8 @@ do_configure_prepend() {
64} 72}
65 73
66 74
67PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils" 75PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils"
68 76
69FILES_avahi-systemd = "${systemd_unitdir}"
70FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ 77FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
71 ${sysconfdir}/avahi/avahi-autoipd.action \ 78 ${sysconfdir}/avahi/avahi-autoipd.action \
72 ${sysconfdir}/dhcp/*/avahi-autoipd \ 79 ${sysconfdir}/dhcp/*/avahi-autoipd \
@@ -94,8 +101,6 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
94FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*" 101FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
95FILES_avahi-utils = "${bindir}/avahi-*" 102FILES_avahi-utils = "${bindir}/avahi-*"
96 103
97RDEPENDS_avahi-systemd = "avahi-daemon"
98
99RDEPENDS_avahi-daemon = "sysvinit-pidof" 104RDEPENDS_avahi-daemon = "sysvinit-pidof"
100 105
101# uclibc has no nss 106# uclibc has no nss