Commit 3b4ec0c6 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

avahi: do not install S05avahi-setup.sh in systemd setup 



The AVAHI_INSTALL_AUTOIPD was unconditionally installing
S05avahi-setup.sh to /etc/init.d/, even in systemd
configurations. Therefore, this commit:

 * Moves the installation of S05avahi-setup.sh to a separate variable
   called AVAHI_INSTALL_AUTOIPD_INIT_SYSV.

 * Makes sure to use 'install -D' and a full destination path when
   installing S05avahi-setup.sh.

 * Moves the definition of AVAHI_INSTALL_AUTOIPD inside the
   BR2_PACKAGE_AVAHI_AUTOIPD conditional, so that both the variable
   definition and its addition to AVAHI_POST_INSTALL_TARGET_HOOKS are
   enclosed in the conditional.

 * Moves the S50avahi-daemon installation from AVAHI_INSTALL_INIT_SYSV
   to AVAHI_INSTALL_DAEMON_INIT_SYSV.

 * Uses 'install -D' to install S50avahi-daemon.

 * Adds a AVAHI_INSTALL_INIT_SYSV definition which calls both
   AVAHI_INSTALL_AUTOIPD_INIT_SYSV and AVAHI_INSTALL_DAEMON_INIT_SYSV.

Note: in a systemd configuration, there is no provision to do what
S05avahi-setup.sh is doing for sysv init configurations. Maybe this is
something that our systemd people should have a look at.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 6c947771

package/avahi/avahi.mk

+12 −4
Original line number Diff line number Diff line
@@ -150,14 +150,17 @@ endef 


AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_REMOVE_INITSCRIPT



ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y)

define AVAHI_INSTALL_AUTOIPD

	$(INSTALL) -m 0755 package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/

	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd

	$(INSTALL) -d -m 0755 $(TARGET_DIR)/var/lib

	ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd

endef



ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y)

define AVAHI_INSTALL_AUTOIPD_INIT_SYSV

	$(INSTALL) -D -m 0755 package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/S05avahi-setup.sh

endef



AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_AUTOIPD

endif
@@ -176,12 +179,17 @@ define AVAHI_INSTALL_INIT_SYSTEMD 
		$(TARGET_DIR)/usr/lib/tmpfiles.d/avahi.conf

endef



define AVAHI_INSTALL_INIT_SYSV

	$(INSTALL) -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/

define AVAHI_INSTALL_DAEMON_INIT_SYSV

	$(INSTALL) -D -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/S50avahi-daemon

endef



endif



define AVAHI_INSTALL_INIT_SYSV

	$(AVAHI_INSTALL_AUTOIPD_INIT_SYSV)

	$(AVAHI_INSTALL_DAEMON_INIT_SYSV)

endef



# applications expects to be able to #include <dns_sd.h>

define AVAHI_STAGING_INSTALL_LIBDNSSD_LINK

	ln -sf avahi-compat-libdns_sd/dns_sd.h \