# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1223929792 0
# Node ID 6fd8242e9be0674f5c407ad8cc08c1b1305984fb
# Parent  123997fe83c05586559e4960bbaaec9714a9120b
bristuff: fix zconfig.h

diff -r 123997fe83c0 -r 6fd8242e9be0 bristuff/receipt
--- a/bristuff/receipt	Mon Oct 13 15:33:45 2008 +0000
+++ b/bristuff/receipt	Mon Oct 13 20:29:52 2008 +0000
@@ -58,15 +58,24 @@
 	# cd asterisk-addons
 	# patch -p0 < chan_mobile-1.4.x.patch
 	tar xjf agx-ast-addons-$ADD_VER.tar.bz2
-	patch -p0 < ../stuff/CMakeLists.u || return 1
-	patch -p0 < ../stuff/bristuff.u || return 1
+	for i in CMakeLists.u bristuff.u; do
+		[ -f done.$i ] && continue
+		patch -p0 < ../stuff/$i || return 1
+		touch done.$i
+	done
 	chmod +x apply-patches.sh
 	sh ./download.sh
-	patch -p0 < ../stuff/sounds.u || return 1
+	for i in sounds.u; do
+		[ -f done.$i ] && continue
+		patch -p0 < ../stuff/$i || return 1
+		touch done.$i
+	done
 	ln -s . zaptel/zaptel
 	ln -s . zaptel/linux
 	mkdir -p _pkg/etc/init.d _pkg/usr/include/zaptel
+	[ -f done.uname ] ||
 	grep -rsl "uname -r" . | xargs sed -i -e "s/uname -r/echo $KVERS/g"
+	touch done.uname
 	export BRISTUFF_ZAP_PARAMS="KBUILD_NOPEDANTIC=1"
 	sh ./compile.sh -d $(cd _pkg; pwd) -i
 	cp asterisk/configs/* _pkg/etc/asterisk/
diff -r 123997fe83c0 -r 6fd8242e9be0 bristuff/stuff/bristuff.u
--- a/bristuff/stuff/bristuff.u	Mon Oct 13 15:33:45 2008 +0000
+++ b/bristuff/stuff/bristuff.u	Mon Oct 13 20:29:52 2008 +0000
@@ -85,7 +85,7 @@
 +slitaz
 --- patches/zaptel/slitaz	
 +++ patches/zaptel/slitaz	
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,88 @@
 +--- zaptel-1.4.8/zaptel-base.c	2008-04-29 11:04:40.000000000 +0200
 ++++ zaptel-1.4.8/zaptel-base.c	2008-04-29 11:05:16.000000000 +0200
 +@@ -4432,3 +4432,3 @@
@@ -159,6 +159,22 @@
 +   endif
 + endif
 + ifneq (,$(COPY_NETSCR))
++
++--- zaptel-1.4.8/zconfig.h.org	2008-10-13 21:49:25.000000000 +0200
+++++ zaptel-1.4.8/zconfig.h	2008-10-13 21:49:43.000000000 +0200
++@@ -88,9 +88,11 @@
++ /* #define NO_ECHOCAN_DISABLE */
++ 
++ /* udev support */
+++#ifdef LINUX_VERSION_CODE
++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1)
++ #define CONFIG_ZAP_UDEV
++ #endif
+++#endif
++ 
++ /* We now use the linux kernel config to detect which options to use */
++ /* You can still override them below */
+
 --- patches/zaphfc/series	
 +++ patches/zaphfc/series	
 @@ -1,3 +1,4 @@