[Astlinux-commits] SF.net SVN: astlinux: [1482] trunk

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

Revision: 1482
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1482&view=rev
Author:   krisk84
Date:     2008-01-04 15:32:19 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
add oslec, cleanup zaptel - needs some work

Modified Paths:
--------------
    trunk/astlinux.config
    trunk/package/zaptel/Config.in
    trunk/package/zaptel/zaptel.mk

Added Paths:
-----------
    trunk/package/oslec/
    trunk/package/oslec/oslec.mk

Modified: trunk/astlinux.config
===================================================================
--- trunk/astlinux.config	2008-01-04 20:47:53 UTC (rev 1481)
+++ trunk/astlinux.config	2008-01-04 23:32:19 UTC (rev 1482)
@@ -365,6 +365,7 @@
 # BR2_PACKAGE_XFSPROGS is not set
 # BR2_PACKAGE_XORG is not set
 BR2_PACKAGE_ZAPTEL=y
+BR2_PACKAGE_ZAPTEL_OSLEC=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
 BR2_PACKAGE_ZONEINFO=y

Added: trunk/package/oslec/oslec.mk
===================================================================
--- trunk/package/oslec/oslec.mk	                        (rev 0)
+++ trunk/package/oslec/oslec.mk	2008-01-04 23:32:19 UTC (rev 1482)
@@ -0,0 +1,62 @@
+#############################################################
+#
+# oslec
+#
+##############################################################
+OSLEC_VERSION := 1255
+OSLEC_SOURCE:= oslec-$(OSLEC_VERSION)
+OSLEC_SITE := http://svn.astfin.org/software/oslec/trunk
+OSLEC_DIR := $(BUILD_DIR)/oslec-$(OSLEC_VERSION)
+OSLEC_BINARY := kernel/oslec.ko
+OSLEC_TARGET_BINARY := lib/modules/2.6.20.21-astlinux/misc/oslec.ko
+
+OSLEC_TARGET_ARCH:=i386
+
+$(DL_DIR)/$(OSLEC_SOURCE)/.gotsvn:
+	svn co -r $(OSLEC_VERSION) $(OSLEC_SITE) $(DL_DIR)/$(OSLEC_SOURCE)
+	touch $(DL_DIR)/$(OSLEC_SOURCE)/.gotsvn
+
+$(OSLEC_DIR)/.source: $(DL_DIR)/$(OSLEC_SOURCE)/.gotsvn
+	cp -a $(DL_DIR)/$(OSLEC_SOURCE) $(OSLEC_DIR)
+	toolchain/patch-kernel.sh $(OSLEC_DIR) package/oslec/ oslec\*.patch
+	touch $(OSLEC_DIR)/.source
+
+$(OSLEC_DIR)/$(OSLEC_BINARY): $(OSLEC_DIR)/.source
+	$(MAKE) -C $(OSLEC_DIR)/kernel CC=$(TARGET_CC) $(ARCH)=$(OSLEC_TARGET_ARCH) \
+	UNAME=$(LINUX_VERSION) KDIR=$(LINUX_DIR) PWD=$(OSLEC_DIR)/kernel
+
+$(TARGET_DIR)/$(OSLEC_TARGET_BINARY): $(OSLEC_DIR)/$(OSLEC_BINARY)
+	$(INSTALL) -D -m 0644 $(OSLEC_DIR)/$(OSLEC_BINARY) $(TARGET_DIR)/$(OSLEC_TARGET_BINARY)
+	$(INSTALL) -D -m 0755 $(OSLEC_DIR)/kernel/oslec-ctrl-panel.sh \
+	$(TARGET_DIR)/sbin/oslec-ctrl-panel.sh
+	-$(STRIP) $(TARGET_DIR)/$(OSLEC_TARGET_BINARY)
+	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION)
+
+$(ZAPTEL_DIR)/.oslecpatch: $(OSLEC_DIR)/.source zaptel-unpack
+	patch -N -p1 -d $(ZAPTEL_DIR) < $(OSLEC_DIR)/kernel/zaptel-$(ZAPTEL_VERSION).patch
+	-cp $(OSLEC_DIR)/kernel/dir/Module.symvers $(ZAPTEL_DIR)/Module.symvers
+	touch $(ZAPTEL_DIR)/.oslecpatch
+
+oslec: uclibc linux $(ZAPTEL_DIR)/.oslecpatch $(TARGET_DIR)/$(OSLEC_TARGET_BINARY)
+
+oslec-source: $(DL_DIR)/$(OSLEC_SOURCE)
+
+oslec-clean:
+	rm -rf $(TARGET_DIR)/$(OSLEC_TARGET_BINARY)
+	rm -rf $(TARGET_DIR)/sbin/oslec-ctrl-panel.sh
+	-patch -RN -p1 -d $(ZAPTEL_DIR) < $(OSLEC_DIR)/kernel/zaptel-$(ZAPTEL_VERSION).patch
+	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(BUILD_DIR)/root -r $(LINUX_VERSION)
+	-$(MAKE) -C $(OSLEC_DIR)/kernel CC=$(TARGET_CC) $(ARCH)=$(OSLEC_TARGET_ARCH) \
+	UNAME=$(LINUX_VERSION) KDIR=$(LINUX_DIR) PWD=$(OSLEC_DIR)/kernel clean
+
+oslec-dirclean:
+	rm -rf $(OSLEC_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_ZAPTEL_OSLEC)),y)
+TARGETS+=oslec
+endif

Modified: trunk/package/zaptel/Config.in
===================================================================
--- trunk/package/zaptel/Config.in	2008-01-04 20:47:53 UTC (rev 1481)
+++ trunk/package/zaptel/Config.in	2008-01-04 23:32:19 UTC (rev 1482)
@@ -8,3 +8,12 @@
 		for use with Asterisk:
 
 		http://www.asterisk.org
+
+config BR2_PACKAGE_ZAPTEL_OSLEC
+	bool "oslec"
+	default y
+	depends on BR2_PACKAGE_ZAPTEL
+	help
+	  Open Source Line Echo Canceller - improved echo can for zaptel
+
+	  http://www.rowetel.com/ucasterisk/oslec.html

Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2008-01-04 20:47:53 UTC (rev 1481)
+++ trunk/package/zaptel/zaptel.mk	2008-01-04 23:32:19 UTC (rev 1482)
@@ -11,33 +11,21 @@
 ZAPTEL_TARGET_BINARY := sbin/ztcfg
 PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib")
 
-LINUX_VER=$(LINUX_VERSION)
-
 ifeq ($(strip $(BR2_PACKAGE_WANPIPE)),y)
-ZAPWAN=wanpipe
+ZAPEXTRAS=wanpipe
 endif
 
+ifeq ($(strip $(BR2_PACKAGE_ZAPTEL_OSLEC)),y)
+ZAPEXTRAS+=oslec
+endif
+
 ZAPTEL_TARGET_ARCH:=i386
-#ZAPTEL_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
-#		-e 's/i.86/i386/' \
-#		-e 's/sparc.*/sparc/' \
-#		-e 's/arm.*/arm/g' \
-#		-e 's/m68k.*/m68k/' \
-#		-e 's/ppc/powerpc/g' \
-#		-e 's/v850.*/v850/g' \
-#		-e 's/sh[234].*/sh/' \
-#		-e 's/mips.*/mips/' \
-#		-e 's/mipsel.*/mips/' \
-#		-e 's/cris.*/cris/' \
-#		-e 's/nios2.*/nios2/' \
-#)
 
 $(DL_DIR)/$(ZAPTEL_SOURCE):
 	$(WGET) -P $(DL_DIR) $(ZAPTEL_SITE)/$(ZAPTEL_SOURCE)
 
 $(ZAPTEL_DIR)/.source: $(DL_DIR)/$(ZAPTEL_SOURCE)
 	zcat $(DL_DIR)/$(ZAPTEL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	ln -sf $(ZAPTEL_DIR) $(BUILD_DIR)/zaptel
 ifeq ($(strip $(BR2_TARGET_RT)),y)
 	toolchain/patch-kernel.sh $(ZAPTEL_DIR) package/zaptel/ rt\*.patch
 endif
@@ -63,25 +51,25 @@
 
 $(ZAPTEL_DIR)/$(ZAPTEL_BINARY): $(ZAPTEL_DIR)/.configured
 	$(MAKE) -C $(ZAPTEL_DIR) HOSTCC=gcc CC=$(TARGET_CC) DEB_HOST_GNU_TYPE=$(ZAPTEL_TARGET_ARCH) \
-	KVERS=$(LINUX_VER) KSRC=$(LINUX_DIR) PWD=$(ZAPTEL_DIR) modules programs
+	KVERS=$(LINUX_VERSION) KSRC=$(LINUX_DIR) PWD=$(ZAPTEL_DIR) modules programs
 
 $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY): $(ZAPTEL_DIR)/$(ZAPTEL_BINARY)
 	mkdir -p $(TARGET_DIR)/$(PERLLIBDIR)
 	$(MAKE1) -C $(ZAPTEL_DIR) HOSTCC=gcc CC=$(TARGET_CC) DEB_HOST_GNU_TYPE=$(ZAPTEL_TARGET_ARCH) \
-	DESTDIR=$(STAGING_DIR) KVERS=$(LINUX_VER) KSRC=$(LINUX_DIR) PWD=$(ZAPTEL_DIR) \
+	DESTDIR=$(STAGING_DIR) KVERS=$(LINUX_VERSION) KSRC=$(LINUX_DIR) PWD=$(ZAPTEL_DIR) \
 	install-libs install-include
 	$(MAKE1) -C $(ZAPTEL_DIR) HOSTCC=gcc CC=$(TARGET_CC) DEB_HOST_GNU_TYPE=$(ZAPTEL_TARGET_ARCH) \
-	DESTDIR=$(TARGET_DIR) KVERS=$(LINUX_VER) KSRC=$(LINUX_DIR) PWD=$(ZAPTEL_DIR) \
+	DESTDIR=$(TARGET_DIR) KVERS=$(LINUX_VERSION) KSRC=$(LINUX_DIR) PWD=$(ZAPTEL_DIR) \
 	install-programs install-libs install-modules
 	-rm -rf $(TARGET_DIR)/usr/include
 	-rm -f $(TARGET_DIR)/usr/lib/*.a
 	-rm -rf $(TARGET_DIR)/$(PERLLIBDIR)
 	-$(STRIP) $(TARGET_DIR)/sbin/zt* $(TARGET_DIR)/usr/lib/libtone*
-	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VER)
+	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION)
 	$(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 newt $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
+zaptel: uclibc newt $(ZAPEXTRAS) $(TARGET_DIR)/$(ZAPTEL_TARGET_BINARY)
 
 zaptel-source: $(DL_DIR)/$(ZAPTEL_SOURCE)
 
@@ -91,15 +79,13 @@
 	rm -Rf $(STAGING_DIR)/include/zaptel.h
 	rm -Rf $(STAGING_DIR)/usr/include/zaptel.h
 	rm -Rf $(TARGET_DIR)/lib/libtone*
-	rm -Rf $(STAGING_DIR)/lib/modules/$(LINUX_VER)/misc
-	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(BUILD_DIR)/root -r $(LINUX_VER)
-	rm $(BUILD_DIR)/zaptel
-	-$(MAKE) -C $(ZAPTEL_DIR) -C $(ZAPTEL_DIR) HOSTCC=gcc CC=$(TARGET_CC) DEB_HOST_GNU_TYPE=$(ZAPTEL_TARGET_ARCH) \
-	INSTALL_PREFIX=$(STAGING_DIR) KVERS=$(LINUX_VER) KSRC=$(LINUX_DIR) clean
+	rm -Rf $(STAGING_DIR)/lib/modules/$(LINUX_VERSION)/misc
+	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(BUILD_DIR)/root -r $(LINUX_VERSION)
+	#-$(MAKE) -C $(ZAPTEL_DIR) -C $(ZAPTEL_DIR) HOSTCC=gcc CC=$(TARGET_CC) DEB_HOST_GNU_TYPE=$(ZAPTEL_TARGET_ARCH) \
+	#INSTALL_PREFIX=$(STAGING_DIR) KVERS=$(LINUX_VERSION) KSRC=$(LINUX_DIR) clean
 
 zaptel-dirclean:
 	rm -rf $(ZAPTEL_DIR)
-	rm $(BUILD_DIR)/zaptel
 
 #############################################################
 #


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