Patchwork [2/2] avahi: Remove -systemd postfix

login
register
mail settings
Submitter Radu Moisan
Date Jan. 29, 2013, 3:24 p.m.
Message ID <1359473084-592-3-git-send-email-radu.moisan@intel.com>
Download mbox | patch
Permalink /patch/43653/
State New
Headers show

Comments

Radu Moisan - Jan. 29, 2013, 3:24 p.m.
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
---
 meta/recipes-connectivity/avahi/avahi.inc |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Ross Burton - Jan. 29, 2013, 3:51 p.m.
On 29 January 2013 15:24, Radu Moisan <radu.moisan@intel.com> wrote:
>-RDEPENDS_avahi-systemd = "avahi-daemon"
> +RDEPENDS_avahi = "avahi-daemon"

The avahi package isn't really used, so this chunk should just be deleted.

Ross
Andreas Müller - Jan. 29, 2013, 3:57 p.m.
On Tue, Jan 29, 2013 at 4:24 PM, Radu Moisan <radu.moisan@intel.com> wrote:
> Signed-off-by: Radu Moisan <radu.moisan@intel.com>
> ---
>  meta/recipes-connectivity/avahi/avahi.inc |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
> index d529b37..a02c8a5 100644
> --- a/meta/recipes-connectivity/avahi/avahi.inc
> +++ b/meta/recipes-connectivity/avahi/avahi.inc
> @@ -64,9 +64,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"

I thought the discussion where to put systemd-files is still open.
Don't misunderstand me: I am fine with both but I think we should
decide to go this or that direction not by creating facts.

Andreas
Ross Burton - Jan. 29, 2013, 4:02 p.m.
On 29 January 2013 15:57, Andreas Müller <schnitzeltony@googlemail.com> wrote:
> I thought the discussion where to put systemd-files is still open.
> Don't misunderstand me: I am fine with both but I think we should
> decide to go this or that direction not by creating facts.

I'm not convinced that the use case of "install a service but not the
init files so it doesn't auto-start" is good enough considering
systemd provides tools to not start it, and we've never had this
problem with sysvinit.

So no, I don't think its still open.

Ross

Patch

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index d529b37..a02c8a5 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -64,9 +64,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 \
@@ -84,7 +83,8 @@  FILES_avahi-daemon = "${sbindir}/avahi-daemon \
                       ${datadir}/avahi/avahi-service.dtd \
                       ${datadir}/avahi/service-types \
                       ${datadir}/dbus-1/interfaces \
-                      ${datadir}/dbus-1/system-services"
+                      ${datadir}/dbus-1/system-services \
+                      ${@base_contains('DISTRO_FEATURES','systemd','${systemd_unitdir}','',d)}"
 FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
 FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
 FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
@@ -94,7 +94,7 @@  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 = "avahi-daemon"
 
 RDEPENDS_avahi-daemon = "sysvinit-pidof"