summaryrefslogtreecommitdiff
path: root/meta/recipes-connectivity/avahi
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2013-02-08 22:43:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-11 14:44:31 +0000
commit6d89c6744a98dce1fee6a21f1dad1305f6bf6fb5 (patch)
tree20d668b9ea743b1958960df4d9890b2ad25895c5 /meta/recipes-connectivity/avahi
parentf4bf51612f8be1d3dd340fc456f3fa08fcfa34ef (diff)
downloadopenembedded-core-6d89c6744a98dce1fee6a21f1dad1305f6bf6fb5.tar.gz
openembedded-core-6d89c6744a98dce1fee6a21f1dad1305f6bf6fb5.tar.bz2
openembedded-core-6d89c6744a98dce1fee6a21f1dad1305f6bf6fb5.zip
avahi: Enabling with systemd
Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Sander van Grieken <sander@outrightsolutions.nl> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/avahi')
-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 \
-c \"Avahi autoip daemon\" \
avahi-autoipd"
-inherit autotools pkgconfig update-rc.d gettext useradd
+inherit autotools pkgconfig update-rc.d gettext systemd useradd
-EXTRA_OECONF = "--with-distro=debian \
- --disable-introspection \
+SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
+SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
+SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
+
+EXTRA_OECONF = "--disable-introspection \
--with-avahi-priv-access-group=adm \
--disable-stack-protector \
--disable-gdbm \
@@ -50,10 +53,15 @@ EXTRA_OECONF = "--with-distro=debian \
--disable-qt4 \
--disable-python \
--disable-doxygen-doc \
- --with-systemdsystemunitdir=${systemd_unitdir}/system/ \
+ ${EXTRA_OECONF_SYSVINIT} \
+ ${EXTRA_OECONF_SYSTEMD} \
${AVAHI_GTK} \
"
+# The distro choice determines what init scripts are installed
+EXTRA_OECONF_SYSVINIT = "${@base_contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
+EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','',d)}"
+
AVAHI_GTK ?= "--disable-gtk --disable-gtk3"
LDFLAGS_append_libc-uclibc = " -lintl"
@@ -64,9 +72,8 @@ do_configure_prepend() {
}
-PACKAGES =+ "avahi-systemd avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils"
+PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-autoipd avahi-utils"
-FILES_avahi-systemd = "${systemd_unitdir}"
FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
${sysconfdir}/avahi/avahi-autoipd.action \
${sysconfdir}/dhcp/*/avahi-autoipd \
@@ -94,8 +101,6 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*"
FILES_avahi-utils = "${bindir}/avahi-*"
-RDEPENDS_avahi-systemd = "avahi-daemon"
-
RDEPENDS_avahi-daemon = "sysvinit-pidof"
# uclibc has no nss