Commit 7c1db80c authored by Mike Williams's avatar Mike Williams Committed by Thomas Petazzoni
Browse files

avahi: systemd cleanups 



* Move service files to /usr/lib/systemd/system/
* Only disable systemd support on non-systemd systems

[Thomas: use positive logic for the systemd test.]

Signed-off-by: default avatarMike Williams <mike@mikebwilliams.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 1d2448e4

package/avahi/0002-disable-systemd-support.patch

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
[PATCH] avahi-daemon: disable systemd support



Disable systemd support as it isn't needed for BR, and uses SOCK_CLOEXEC

which isn't available on uClibc.



Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 avahi-daemon/sd-daemon.h |    1 +

 1 file changed, 1 insertion(+)



Index: avahi-0.6.27/avahi-daemon/sd-daemon.h

===================================================================

--- avahi-0.6.27.orig/avahi-daemon/sd-daemon.h

+++ avahi-0.6.27/avahi-daemon/sd-daemon.h

@@ -66,6 +66,7 @@ extern "C" {

 

   See sd-daemon(7) for more information.

 */

+#define DISABLE_SYSTEMD /* no systemd support in BR */

 

 #if __GNUC__ >= 4

 #define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b)))

package/avahi/avahi.mk

+10 −2
Original line number Diff line number Diff line
@@ -88,6 +88,12 @@ AVAHI_DEPENDENCIES = \ 
	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \

	host-pkgconf host-gettext



AVAHI_CFLAGS = $(TARGET_CFLAGS)



ifeq ($(BR2_PACKAGE_SYSTEMD),)

AVAHI_CFLAGS += -DDISABLE_SYSTEMD

endif



ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)

AVAHI_DEPENDENCIES += libdaemon

else
@@ -154,6 +160,8 @@ else 
AVAHI_CONF_OPTS += --disable-python-dbus

endif



AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)"



AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)



define AVAHI_USERS
@@ -185,10 +193,10 @@ ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) 
define AVAHI_INSTALL_INIT_SYSTEMD

	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants



	ln -fs /lib/systemd/system/avahi-daemon.service \

	ln -fs ../../../../usr/lib/systemd/system/avahi-daemon.service \

		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-daemon.service



	ln -fs /lib/systemd/system/avahi-dnsconfd.service \

	ln -fs ../../../../usr/lib/systemd/system/avahi-dnsconfd.service \

		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service



	$(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \