[Astlinux-commits] SF.net SVN: astlinux:[7696] branches/1.0/package/avahi

[<abe...@us...>]

Revision: 7696
          http://sourceforge.net/p/astlinux/code/7696
Author:   abelbeck
Date:     2016-06-01 22:45:05 +0000 (Wed, 01 Jun 2016)
Log Message:
-----------
avahi, add a /etc/init.d/avahi service, edit configs from /mnt/kd/avahi symlinked to /etc/avahi in the standard AstLinux fashion

Modified Paths:
--------------
    branches/1.0/package/avahi/Config.in
    branches/1.0/package/avahi/avahi.mk

Added Paths:
-----------
    branches/1.0/package/avahi/avahi.init

Removed Paths:
-------------
    branches/1.0/package/avahi/S05avahi-setup.sh
    branches/1.0/package/avahi/S50avahi-daemon

Modified: branches/1.0/package/avahi/Config.in
===================================================================
--- branches/1.0/package/avahi/Config.in	2016-05-31 19:52:36 UTC (rev 7695)
+++ branches/1.0/package/avahi/Config.in	2016-06-01 22:45:05 UTC (rev 7696)
@@ -24,6 +24,7 @@
 	bool "mDNS/DNS-SD daemon"
 	select BR2_PACKAGE_LIBDAEMON
 	select BR2_PACKAGE_EXPAT
+	default y
 	help
 	  The Avahi mDNS/DNS-SD daemon implementing Apple's ZeroConf
 	  architecture (also known as "Rendezvous" or "Bonjour").

Deleted: branches/1.0/package/avahi/S05avahi-setup.sh
===================================================================
--- branches/1.0/package/avahi/S05avahi-setup.sh	2016-05-31 19:52:36 UTC (rev 7695)
+++ branches/1.0/package/avahi/S05avahi-setup.sh	2016-06-01 22:45:05 UTC (rev 7696)
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-    start|"")
-	if [ ! -d /tmp/avahi-autopid ]; then
-	    rm -rf /tmp/avahi-autoipd
-	    mkdir /tmp/avahi-autoipd
-	    chown nobody:nobody /tmp/avahi-autoipd
-	fi
-	;;
-    stop) ;;
-    *)
-	echo "Usage: S05avahi-setup.sh {start|stop}" >&2
-	exit 1
-	;;
-esac

Deleted: branches/1.0/package/avahi/S50avahi-daemon
===================================================================
--- branches/1.0/package/avahi/S50avahi-daemon	2016-05-31 19:52:36 UTC (rev 7695)
+++ branches/1.0/package/avahi/S50avahi-daemon	2016-06-01 22:45:05 UTC (rev 7696)
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# avahi-daemon init script
-
-DAEMON=/usr/sbin/avahi-daemon
-case "$1" in
-    start)
-	$DAEMON -c || $DAEMON -D
-	;;
-    stop)
-	$DAEMON -c && $DAEMON -k
-	;;
-    reload)
-	$DAEMON -c && $DAEMON -r
-	;;
-    *)
-	echo "Usage: S50avahi-daemon {start|stop|reload}" >&2
-	exit 1
-	;;
-esac

Added: branches/1.0/package/avahi/avahi.init
===================================================================
--- branches/1.0/package/avahi/avahi.init	                        (rev 0)
+++ branches/1.0/package/avahi/avahi.init	2016-06-01 22:45:05 UTC (rev 7696)
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+DAEMON=/usr/sbin/avahi-daemon
+
+if [ ! -x $DAEMON ]; then
+  exit
+fi
+
+init ()
+{
+  if [ "$AVAHI_ENABLE" != "yes" ]; then
+    exit
+  fi
+
+  if [ ! -d /mnt/kd/avahi ]; then
+    mkdir /mnt/kd/avahi
+    if [ -d /stat/etc/avahi ]; then
+      cp -a /stat/etc/avahi/* /mnt/kd/avahi/
+    fi
+  fi
+
+  ln -snf /mnt/kd/avahi /tmp/etc/avahi
+}
+
+start ()
+{
+  if [ "$AVAHI_ENABLE" = "yes" ] && ! $DAEMON --check; then
+    echo "Starting Avahi mDNS/DNS-SD..."
+    $DAEMON --daemonize
+  fi
+}
+
+stop ()
+{
+  if $DAEMON --check; then
+    echo "Stopping Avahi mDNS/DNS-SD..."
+    $DAEMON --kill
+  fi
+}
+
+case $1 in
+
+init)
+  init
+  start
+  ;;
+
+start)
+  start
+  ;;
+
+stop)
+  stop
+  ;;
+
+restart)
+  stop
+  sleep 2
+  start
+  ;;
+
+*)
+  echo "Usage: start|stop|restart" >&2
+  exit 1
+  ;;
+
+esac


Property changes on: branches/1.0/package/avahi/avahi.init
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/avahi/avahi.mk
===================================================================
--- branches/1.0/package/avahi/avahi.mk	2016-05-31 19:52:36 UTC (rev 7695)
+++ branches/1.0/package/avahi/avahi.mk	2016-06-01 22:45:05 UTC (rev 7696)
@@ -154,19 +154,30 @@
 	ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
 endef
 
-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 AVAHI_INSTALL_AUTOIPD_INIT_SYSV
+AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_AUTOIPD
 endif
 
 ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
 define AVAHI_INSTALL_DAEMON_INIT_SYSV
-	$(INSTALL) -D -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/S50avahi-daemon
+	mkdir -p $(TARGET_DIR)/stat/etc/avahi
+	cp -a $(TARGET_DIR)/etc/avahi/* $(TARGET_DIR)/stat/etc/avahi/
+	rm -rf $(TARGET_DIR)/etc/avahi
+	ln -s /tmp/etc/avahi $(TARGET_DIR)/etc/avahi
+	$(INSTALL) -D -m 0755 package/avahi/avahi.init $(TARGET_DIR)/etc/init.d/avahi
+	ln -sf ../../init.d/avahi $(TARGET_DIR)/etc/runlevels/default/S92avahi
+	ln -sf ../../init.d/avahi $(TARGET_DIR)/etc/runlevels/default/K05avahi
 endef
 
+define AVAHI_DAEMON_DEFAULT_FIXUP
+	$(SED) 's:^#*use-ipv6=.*$$:use-ipv6=no:' \
+	    -e 's:^#*allow-interfaces=.*$$:allow-interfaces=:' \
+	        $(TARGET_DIR)/stat/etc/avahi/avahi-daemon.conf
+	rm -f $(TARGET_DIR)/stat/etc/avahi/services/*.service
+	rm -f $(TARGET_DIR)/stat/etc/avahi/avahi-dnsconfd.action
+endef
+
 AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_DAEMON_INIT_SYSV
+AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_DAEMON_DEFAULT_FIXUP
 endif
 
 ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y)
@@ -179,4 +190,14 @@
 AVAHI_POST_INSTALL_STAGING_HOOKS += AVAHI_STAGING_INSTALL_LIBDNSSD_LINK
 endif
 
+define AVAHI_UNINSTALL_TARGET_CMDS
+	rm -rf $(TARGET_DIR)/stat/etc/avahi
+	rm -f $(TARGET_DIR)/etc/avahi
+	rm -f $(TARGET_DIR)/usr/sbin/avahi-*
+	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
+	rm -f $(TARGET_DIR)/etc/init.d/avahi
+	rm -f $(TARGET_DIR)/etc/runlevels/default/S92avahi
+	rm -f $(TARGET_DIR)/etc/runlevels/default/K05avahi
+endef
+
 $(eval $(call AUTOTARGETS,package,avahi))

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.