wok-4.x rev 1567

bristuff: fix zconfig.h
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Oct 13 20:29:52 2008 +0000 (2008-10-13)
parents 123997fe83c0
children 71183fd70c31
files bristuff/receipt bristuff/stuff/bristuff.u
line diff
     1.1 --- a/bristuff/receipt	Mon Oct 13 15:33:45 2008 +0000
     1.2 +++ b/bristuff/receipt	Mon Oct 13 20:29:52 2008 +0000
     1.3 @@ -58,15 +58,24 @@
     1.4  	# cd asterisk-addons
     1.5  	# patch -p0 < chan_mobile-1.4.x.patch
     1.6  	tar xjf agx-ast-addons-$ADD_VER.tar.bz2
     1.7 -	patch -p0 < ../stuff/CMakeLists.u || return 1
     1.8 -	patch -p0 < ../stuff/bristuff.u || return 1
     1.9 +	for i in CMakeLists.u bristuff.u; do
    1.10 +		[ -f done.$i ] && continue
    1.11 +		patch -p0 < ../stuff/$i || return 1
    1.12 +		touch done.$i
    1.13 +	done
    1.14  	chmod +x apply-patches.sh
    1.15  	sh ./download.sh
    1.16 -	patch -p0 < ../stuff/sounds.u || return 1
    1.17 +	for i in sounds.u; do
    1.18 +		[ -f done.$i ] && continue
    1.19 +		patch -p0 < ../stuff/$i || return 1
    1.20 +		touch done.$i
    1.21 +	done
    1.22  	ln -s . zaptel/zaptel
    1.23  	ln -s . zaptel/linux
    1.24  	mkdir -p _pkg/etc/init.d _pkg/usr/include/zaptel
    1.25 +	[ -f done.uname ] ||
    1.26  	grep -rsl "uname -r" . | xargs sed -i -e "s/uname -r/echo $KVERS/g"
    1.27 +	touch done.uname
    1.28  	export BRISTUFF_ZAP_PARAMS="KBUILD_NOPEDANTIC=1"
    1.29  	sh ./compile.sh -d $(cd _pkg; pwd) -i
    1.30  	cp asterisk/configs/* _pkg/etc/asterisk/
     2.1 --- a/bristuff/stuff/bristuff.u	Mon Oct 13 15:33:45 2008 +0000
     2.2 +++ b/bristuff/stuff/bristuff.u	Mon Oct 13 20:29:52 2008 +0000
     2.3 @@ -85,7 +85,7 @@
     2.4  +slitaz
     2.5  --- patches/zaptel/slitaz	
     2.6  +++ patches/zaptel/slitaz	
     2.7 -@@ -0,0 +1,73 @@
     2.8 +@@ -0,0 +1,88 @@
     2.9  +--- zaptel-1.4.8/zaptel-base.c	2008-04-29 11:04:40.000000000 +0200
    2.10  ++++ zaptel-1.4.8/zaptel-base.c	2008-04-29 11:05:16.000000000 +0200
    2.11  +@@ -4432,3 +4432,3 @@
    2.12 @@ -159,6 +159,22 @@
    2.13  +   endif
    2.14  + endif
    2.15  + ifneq (,$(COPY_NETSCR))
    2.16 ++
    2.17 ++--- zaptel-1.4.8/zconfig.h.org	2008-10-13 21:49:25.000000000 +0200
    2.18 +++++ zaptel-1.4.8/zconfig.h	2008-10-13 21:49:43.000000000 +0200
    2.19 ++@@ -88,9 +88,11 @@
    2.20 ++ /* #define NO_ECHOCAN_DISABLE */
    2.21 ++ 
    2.22 ++ /* udev support */
    2.23 +++#ifdef LINUX_VERSION_CODE
    2.24 ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1)
    2.25 ++ #define CONFIG_ZAP_UDEV
    2.26 ++ #endif
    2.27 +++#endif
    2.28 ++ 
    2.29 ++ /* We now use the linux kernel config to detect which options to use */
    2.30 ++ /* You can still override them below */
    2.31 +
    2.32  --- patches/zaphfc/series	
    2.33  +++ patches/zaphfc/series	
    2.34  @@ -1,3 +1,4 @@