[Astlinux-commits] SF.net SVN: astlinux: [1302] trunk/package/zaptel

[<kr...@us...>]

Revision: 1302
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1302&view=rev
Author:   krisk84
Date:     2007-10-19 09:46:22 -0700 (Fri, 19 Oct 2007)

Log Message:
-----------
slight zaptel cleanup

Modified Paths:
--------------
    trunk/package/zaptel/zaptel.init
    trunk/package/zaptel/zaptel.mk

Removed Paths:
-------------
    trunk/package/zaptel/zaptel-udev.init

Deleted: trunk/package/zaptel/zaptel-udev.init
===================================================================
--- trunk/package/zaptel/zaptel-udev.init	2007-10-19 16:39:39 UTC (rev 1301)
+++ trunk/package/zaptel/zaptel-udev.init	2007-10-19 16:46:22 UTC (rev 1302)
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-. /etc/rc.conf
-
-init () {
-
-if [ -d /mnt/kd/wanpipe ]
-then
-ln -s /mnt/kd/wanpipe /tmp/etc/wanpipe
-else
-if [ -d /stat/etc/wanpipe ]
-then
-mkdir /tmp/etc/wanpipe
-cp -a /stat/etc/wanpipe/* /tmp/etc/wanpipe/
-fi
-fi
-
-## udev should create these
-
-#if [ ! -d /dev/zap ]
-#then
-#mkdir -p /dev/zap
-#mknod /dev/zap/ctl c 196 0
-#mknod /dev/zap/timer c 196 253
-#mknod /dev/zap/channel c 196 254
-#mknod /dev/zap/pseudo c 196 255
-#for i in `seq 1 250`
-#do
-#mknod /dev/zap/$i c 196 $i
-#done
-#fi
-
-if [ -f /stat/etc/zaptel.conf ]
-then
-ln -sf /stat/etc/zaptel.conf /tmp/etc/zaptel.conf
-fi
-
-if [ -f /mnt/kd/zaptel.conf ]
-then
-ln -sf /mnt/kd/zaptel.conf /tmp/etc/zaptel.conf
-fi
-}
-
-start () {
-
-if [ -r /etc/wanpipe/wanpipe*.conf ]
-then
-/usr/sbin/wanrouter start
-fi
-
-if [ -r /etc/zaptel.conf ]
-then
-
-if [ "$ZAPMODS" ]
-then
-for i in $ZAPMODS
-do
-modprobe -q $i
-done
-fi
-
-ztcfg
-
-if [ "$EXTIF" = "hdlc0" ]
-then
-if [ "$EXTENC" ]
-then
-sethdlc "$EXTIF" "$EXTENC"
-fi
-fi
-
-if [ "$EXTIF" = "pvc0" ]
-then
-if [ "$HDLCLMI" -a "$HDLCDLCI" ]
-then
-sethdlc hdlc0 fr lmi "$HDLCLMI"
-sethdlc hdlc0 create "$HDLCDLCI"
-ifconfig hdlc0 up
-fi
-fi
-
-else
-echo "No Zap hardware - loading ztdummy"
-modprobe ztdummy
-fi
-}
-
-stop () {
-if [ "$ZAPMODS" ]
-then
-for i in "$ZAPMODS"
-do
-modprobe -r $i
-done
-else
-modprobe -r ztdummy
-fi
-
-if [ -r /etc/wanpipe/wanpipe*.conf ]
-then
-/usr/sbin/wanrouter stop
-fi
-
-}
-
-case $1 in
-
-init)
-init
-start
-;;
-
-start)
-start
-;;
-
-stop)
-stop
-;;
-
-restart)
-stop
-sleep 2
-start
-;;
-
-*)
-echo "Usage: start|stop|restart"
-;;
-
-esac

Modified: trunk/package/zaptel/zaptel.init
===================================================================
--- trunk/package/zaptel/zaptel.init	2007-10-19 16:39:39 UTC (rev 1301)
+++ trunk/package/zaptel/zaptel.init	2007-10-19 16:46:22 UTC (rev 1302)
@@ -15,7 +15,7 @@
 fi
 fi
 
-if [ ! -d /dev/zap ]
+if [ ! -d /dev/zap -a ! -x /sbin/udevd ]
 then
 mkdir -p /dev/zap
 mknod /dev/zap/ctl c 196 0

Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2007-10-19 16:39:39 UTC (rev 1301)
+++ trunk/package/zaptel/zaptel.mk	2007-10-19 16:46:22 UTC (rev 1302)
@@ -19,10 +19,8 @@
 ifeq ($(strip $(BR2_PACKAGE_UDEV)),y)
 ZAPUDEV=udev
 ZAPHOTPLUG=yes
-ZAPINIT=zaptel-udev.init
 else
 ZAPHOTPLUG=no
-ZAPINIT=zaptel.init
 endif
 
 ZAPTEL_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
@@ -71,7 +69,6 @@
 	KSRC=$(BUILD_DIR)/linux KVERS=$(LINUX_VER) $(TARGET_CONFIGURE_OPTS) PATH="$(ZAPTEL_DIR):$(PATH)" \
 	INSTALL_PREFIX=$(STAGING_DIR) INSTALL_BASE=/ ZTTOOL=zttool PWD=$(ZAPTEL_DIR) HOTPLUG_FIRMWARE=$(ZAPHOTPLUG) \
 	install
-
 	mkdir -p $(STAGING_DIR)/usr/include/linux
 	cp -a $(STAGING_DIR)/include/linux/zaptel.h $(STAGING_DIR)/usr/include/linux/zaptel.h #Hack for Asterisk to find us
 	cp -a $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc $(TARGET_DIR)/lib/modules/$(LINUX_VER)/
@@ -98,7 +95,7 @@
 	-$(STRIP) -g $(TARGET_DIR)/sbin/fxotune
 	-$(STRIP) -g $(TARGET_DIR)/sbin/torisatool
 	$(DEPMOD) -ae -F $(BUILD_DIR)/linux/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
-	$(INSTALL) -D -m 755 package/zaptel/$(ZAPINIT) $(TARGET_DIR)/etc/init.d/zaptel
+	$(INSTALL) -D -m 755 package/zaptel/zaptel.init $(TARGET_DIR)/etc/init.d/zaptel
 	ln -sf /tmp/etc/zaptel.conf $(TARGET_DIR)/etc/zaptel.conf
 
 zaptel: uclibc linux newt $(ZAPUDEV) $(ZAPWAN) $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)


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