[oe] [oe-commits] Radu Moisan : avahi: Enabling with systemd

[Martin Jansa]

On Mon, Feb 11, 2013 at 02:45:49PM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: 6d89c6744a98dce1fee6a21f1dad1305f6bf6fb5
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6d89c6744a98dce1fee6a21f1dad1305f6bf6fb5
> 
> Author: Radu Moisan <radu.moisan at intel.com>
> Date:   Fri Feb  8 22:43:18 2013 +0000
> 
> avahi: Enabling with systemd
> 
> Signed-off-by: Radu Moisan <radu.moisan at intel.com>
> Signed-off-by: Sander van Grieken <sander at outrightsolutions.nl>
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> 
> ---
> 
>  meta/recipes-connectivity/avahi/avahi.inc |   21 +++++++++++++--------
>  1 files changed, 13 insertions(+), 8 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> index 185207b..3a4547c 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"

The same avahi.inc is also included in avahi-ui.

meta/recipes-connectivity/avahi/avahi-ui_0.6.31.bb:require avahi.inc

where this is not working correctly.

> +
> +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
> 
> 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20130227/7a6d7b38/attachment-0002.sig>