[OE-core] [PATCH] avahi: move systemd support where it belongs

[Richard Purdie]

On Mon, 2013-03-04 at 14:25 +0100, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  meta/recipes-connectivity/avahi/avahi.inc       | 6 +-----
>  meta/recipes-connectivity/avahi/avahi_0.6.31.bb | 6 ++++++
>  2 files changed, 7 insertions(+), 5 deletions(-)

"where it belongs"? Is this due to the avahi-ui recipe?

Cheers,

Richard

> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> index 3a4547c..51cbe38 100644
> --- a/meta/recipes-connectivity/avahi/avahi.inc
> +++ b/meta/recipes-connectivity/avahi/avahi.inc
> @@ -37,11 +37,7 @@ USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \
>                                -c \"Avahi autoip daemon\" \
>                                avahi-autoipd"
>  
> -inherit autotools pkgconfig update-rc.d gettext systemd useradd
> -
> -SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
> -SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
> -SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
> +inherit autotools pkgconfig update-rc.d gettext useradd
>  
>  EXTRA_OECONF = "--disable-introspection \
>               --with-avahi-priv-access-group=adm \
> diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> index cff0974..22731f9 100644
> --- a/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
> @@ -1,5 +1,11 @@
>  require avahi.inc
>  
> +inherit systemd
> +
> +SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-dnsconfd"
> +SYSTEMD_SERVICE_avahi-daemon = "avahi-daemon.service"
> +SYSTEMD_SERVICE_avahi-dnsconfd = "avahi-dnsconfd.service"
> +
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
>                      file://avahi-common/address.h;endline=25;md5=b1d1d2cda1c07eb848ea7d6215712d9d \
>                      file://avahi-core/dns.h;endline=23;md5=6fe82590b81aa0ddea5095b548e2fdcb \