Replaced mISDN v2 of the 2.6.27 kernel with the old v1

Enabled build of asterisk

diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586
index 8f362782e199ca458ff6d3cb93da76ae7b761324..3a49b9866b64bc1f16beee6b867e0da0c3efd825 100644 (file)
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.20-ipfire
-# Sun Mar 22 12:17:03 2009
+# Linux kernel version: 2.6.27.21
+# Sun Mar 29 09:23:43 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1750,14 +1750,6 @@ CONFIG_SLIP_MODE_SLIP6=y
 # CONFIG_NET_POLL_CONTROLLER is not set
 CONFIG_VIRTIO_NET=m
 CONFIG_ISDN=y
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_XHFC=m
-CONFIG_MISDN_L1LOOP=m
 # CONFIG_ISDN_I4L is not set
 CONFIG_ISDN_CAPI=m
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
@@ -1786,6 +1778,25 @@ CONFIG_ISDN_DIVAS_PRIPCI=y
 CONFIG_ISDN_DIVAS_DIVACAPI=m
 CONFIG_ISDN_DIVAS_USERIDI=m
 CONFIG_ISDN_DIVAS_MAINT=m
+
+#
+# Modular ISDN driver
+#
+CONFIG_MISDN_DRV=m
+# CONFIG_MISDN_MEMDEBUG is not set
+CONFIG_MISDN_AVM_FRITZ=y
+CONFIG_MISDN_NETJET=y
+CONFIG_MISDN_HFCPCI=y
+CONFIG_MISDN_HFCMULTI=y
+CONFIG_HFCMULTI_PCIMEM=y
+CONFIG_MISDN_HFCUSB=y
+CONFIG_MISDN_HFCMINI=y
+CONFIG_MISDN_XHFC=y
+CONFIG_MISDN_SPEEDFAX=y
+CONFIG_MISDN_W6692=y
+CONFIG_MISDN_DSP=y
+CONFIG_MISDN_LOOP=y
+CONFIG_MISDN_L1OIP=y
 # CONFIG_PHONE is not set
 
 #

diff --git a/config/rootfiles/common/mISDN b/config/rootfiles/common/mISDN
index 25142c6ec61f828519abaac1f0cf0e85b69966d5..46c3fb85543513cd0f440e5b6a6df7271fdb7e22 100644 (file)
--- a/config/rootfiles/common/mISDN
+++ b/config/rootfiles/common/mISDN
@@ -1,17 +1,49 @@
-usr/bin/l1oipctrl
-usr/bin/misdn_bridge
-usr/bin/misdn_cleanl2
-usr/bin/misdn_info
-usr/bin/misdn_log
-usr/bin/misdn_rename
+usr/bin/loadfirm
+usr/bin/mISDNdebugtool
+usr/bin/misdnportinfo
+usr/bin/sendhwctrl
+usr/bin/testcon
+usr/bin/testcon_l2
+usr/bin/testlayer1
+usr/bin/testlayer3
+usr/bin/testlib
+usr/bin/tstlib
+usr/bin/voipisdn
 #usr/include/mISDNuser
-#usr/include/mISDNuser/compat_af_isdn.h
+#usr/include/mISDNuser/asn1.h
+#usr/include/mISDNuser/asn1_diversion.h
+#usr/include/mISDNuser/bchannel.h
+#usr/include/mISDNuser/fsm.h
+#usr/include/mISDNuser/g711.h
+#usr/include/mISDNuser/helper.h
+#usr/include/mISDNuser/ibuffer.h
+#usr/include/mISDNuser/isdn_debug.h
+#usr/include/mISDNuser/isdn_msg.h
 #usr/include/mISDNuser/isdn_net.h
+#usr/include/mISDNuser/isound.h
 #usr/include/mISDNuser/l3dss1.h
-#usr/include/mISDNuser/mISDNif.h
-#usr/include/mISDNuser/mbuffer.h
-#usr/include/mISDNuser/mlayer3.h
-#usr/include/mISDNuser/q931.h
-#usr/lib/libmisdn.a
-usr/lib/libmisdn.so
-#usr/lib/libmisdn_pic.a
+#usr/include/mISDNuser/mISDNlib.h
+#usr/include/mISDNuser/net_l2.h
+#usr/include/mISDNuser/net_l3.h
+#usr/include/mISDNuser/suppserv.h
+#usr/include/mISDNuser/tone.h
+#usr/lib/libisdnnet.a
+usr/lib/libisdnnet.so
+#usr/lib/libisdnnet_pic.a
+#usr/lib/libmISDN.a
+usr/lib/libmISDN.so
+#usr/lib/libmISDN_pic.a
+#usr/lib/libsuppserv.a
+usr/lib/libsuppserv.so
+#usr/lib/libsuppserv_pic.a
+#usr/lib/mISDN
+usr/lib/mISDN/mISDN.conf.bnx.xsl
+usr/lib/mISDN/mISDN.conf.hfcmulti.xsl
+usr/lib/mISDN/mISDN.conf.hfcsusb.xsl
+usr/lib/mISDN/mISDN.conf.inc.xsl
+usr/lib/mISDN/mISDN.conf.l1oip.xsl
+usr/lib/mISDN/mISDN.conf.mISDN_debugtool.xsl
+usr/lib/mISDN/mISDN.conf.mISDN_dsp.xsl
+usr/lib/mISDN/mISDN.conf.singlepci.xsl
+usr/lib/mISDN/mISDN.conf.xhfc.xsl
+usr/lib/mISDN/mISDN.conf.xsl

diff --git a/config/rootfiles/packages/asterisk-disabled b/config/rootfiles/packages/asterisk
similarity index 100%
rename from config/rootfiles/packages/asterisk-disabled
rename to config/rootfiles/packages/asterisk

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index abe0e7271082e6e43e0a4fe9f1a023d0be6c1dd1..2deb58443e8f0eccccefdd337e12d9496fa61ffe 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -40,6 +40,7 @@
 * applejuice-0.31
 * arping-2.05
 * as86-0.16.17
+* asterisk-1.4.18
 * atl2-2.0.5-kmod-2.6.27.21
 * autoconf-2.59
 * automake-1.9.6
@@ -182,7 +183,8 @@
 * lynis-1.2.3
 * lzo-2.02
 * m4-1.4.4
-* mISDNuser-20090322
+* mISDNuser-1_1_9
+* mISDNuser-1_1_9.1
 * madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.27.21
 * make-3.81
 * man-db-2.4.3

diff --git a/lfs/linux b/lfs/linux
index ec74b2a6e27f74028a49ac20a4d19afc6e8ba004..c210fe13aa1e127a5620afdbe37d9c4fc4d1920f 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -34,6 +34,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
+mISDN_VER  = mISDN-1_1_9
+
 # Normal build or SMP build.
 #
 ifeq "$(SMP)" "1"
@@ -46,7 +48,7 @@ endif
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-       mISDN-20090322.tar.gz \
+       $(mISDN_VER).tar.gz \
        squashfs3.4.tar.gz \
        netfilter-layer7-v2.21.tar.gz \
        patch-2.6.16-nath323-1.3.bz2 \
@@ -56,14 +58,14 @@ $(DL_FILE)                          = $(URL_IPFIRE)/$(DL_FILE)
 netfilter-layer7-v2.21.tar.gz          = $(URL_IPFIRE)/netfilter-layer7-v2.21.tar.gz
 patch-2.6.16-nath323-1.3.bz2           = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
 squashfs3.4.tar.gz                     = $(URL_IPFIRE)/squashfs3.4.tar.gz
-mISDN-20090322.tar.gz                  = $(URL_IPFIRE)/mISDN-20090322.tar.gz
+$(mISDN_VER).tar.gz                    = $(URL_IPFIRE)/$(mISDN_VER).tar.gz
 reiser4-for-2.6.27.19.patch.bz2                = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
 
 $(DL_FILE)_MD5                         = 2912af7938fae1a3f2a9a6bcf8c0009f
 netfilter-layer7-v2.21.tar.gz_MD5      = 838422e7d9a06b42e682e9064e5210b5
 patch-2.6.16-nath323-1.3.bz2_MD5       = f926409ff703a307baf54b57ab75d138
 squashfs3.4.tar.gz_MD5                 = 2a4d2995ad5aa6840c95a95ffa6b1da6
-mISDN-20090322.tar.gz_MD5              = 8495c13ef09dacf4a5e42b93da2ac3fc
+$(mISDN_VER).tar.gz_MD5                = bb8beb974d581243442d89f66e6928da
 reiser4-for-2.6.27.19.patch.bz2_MD5    = 22988387f64f299489b90b484b2642cc
 
 install : $(TARGET)
@@ -131,10 +133,14 @@ ifeq "$(XEN)" ""
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-imq.patch
 endif
 
-       # mISDN
-       cd $(DIR_SRC) && rm -rf mISDN-* && mkdir mISDN-socket
-       cd $(DIR_SRC)/mISDN-socket && tar xfz $(DIR_DL)/mISDN-20090322.tar.gz
-       cd $(DIR_SRC)/mISDN-socket && yes 'yes' | ./std2kern -k /usr/src/linux
+       # remove mISDNv2 from Kernel (incomaptible to asterisk)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-disable_mISDNv2.patch
+       cd $(DIR_APP) rm -rf drivers/isdn/mISDN drivers/isdn/hardware/mISDN
+
+       # add mISDNv1
+       cd $(DIR_SRC) && rm -rf mISDN-*
+       cd $(DIR_SRC) && tar xfz $(DIR_DL)/$(mISDN_VER).tar.gz
+       cd $(DIR_SRC)/$(mISDN_VER) && yes 'yes' | ./std2kern -k /usr/src/linux
        
        # Cleanup kernel source
        cd $(DIR_APP) && make mrproper
@@ -181,3 +187,4 @@ endif
 
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
        @$(POSTBUILD)
+

diff --git a/lfs/mISDN b/lfs/mISDN
index 4ec19f57a55c281c0b35f5c2eee791c248cee5e1..5509184376cba7262014042ada9d33d46f815264 100644 (file)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -24,12 +24,12 @@
 
 include Config
 
-VER        = 20090322
+VER        = 1_1_9
 
 THISAPP    = mISDNuser-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/mISDNuser
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -40,7 +40,8 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 90d180518d5bcc8157c290275299e8bc
+$(DL_FILE)_MD5 = e174a60e7040c88d1184364714e55c1b
+
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -68,10 +69,11 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP)
-       cd $(DIR_SRC) && mkdir mISDNuser
-       cd $(DIR_SRC)/mISDNuser && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make MISDNDIR=/usr/src/linux
        cd $(DIR_APP) && make install MISDNDIR=/usr/src/linux
+       -mkdir -p /usr/lib/mISDN
+       cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-$(VER).tar.gz
+       cd $(DIR_SRC)/mISDN-$(VER) && cp -v config/*.xsl /usr/lib/mISDN
+       @rm -rf $(DIR_SRC)/mISDN*
        @$(POSTBUILD)
-

diff --git a/make.sh b/make.sh
index 849b72c17a08fe2610d7385bbae6f4bb5b9a7977..d454a6cc5daa8f23b2c9b9a37549e4c718d3757e 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -508,7 +508,7 @@ buildipfire() {
   ipfiremake libmpeg2
   ipfiremake cmake
   ipfiremake libpri
-#  ipfiremake asterisk
+  ipfiremake asterisk
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice

diff --git a/src/initscripts/init.d/mISDN b/src/initscripts/init.d/mISDN
index c0f2afdc266616a9a454d677867d9c78e8b1a09b..a9c1c9081003c1f6bc69dd5477be95760a25c983 100644 (file)
--- a/src/initscripts/init.d/mISDN
+++ b/src/initscripts/init.d/mISDN
@@ -660,7 +660,7 @@ function create_misdn_init_conf {
 #      and hfcmulti work properly.
 #
 poll=128
-dsp_poll=128
+dsp_poll=80
 dsp_options=0
 dtmfthreshold=100
 debug=0"

diff --git a/src/patches/linux-2.6.27-disable_mISDNv2.patch b/src/patches/linux-2.6.27-disable_mISDNv2.patch
new file mode 100644 (file)
index 0000000..a58d831
--- /dev/null
+++ b/src/patches/linux-2.6.27-disable_mISDNv2.patch
@@ -0,0 +1,31 @@
+diff -Naur linux-2.6.27.21.org/drivers/isdn/hardware/Makefile linux-2.6.27.21/drivers/isdn/hardware/Makefile
+--- linux-2.6.27.21.org/drivers/isdn/hardware/Makefile 2009-03-23 23:04:09.000000000 +0100
++++ linux-2.6.27.21/drivers/isdn/hardware/Makefile     2009-03-29 11:08:02.000000000 +0200
+@@ -4,4 +4,3 @@
+ 
+ obj-$(CONFIG_CAPI_AVM)                += avm/
+ obj-$(CONFIG_CAPI_EICON)      += eicon/
+-obj-$(CONFIG_MISDN)           += mISDN/
+diff -Naur linux-2.6.27.21.org/drivers/isdn/Kconfig linux-2.6.27.21/drivers/isdn/Kconfig
+--- linux-2.6.27.21.org/drivers/isdn/Kconfig   2009-03-23 23:04:09.000000000 +0100
++++ linux-2.6.27.21/drivers/isdn/Kconfig       2009-03-29 11:07:20.000000000 +0200
+@@ -21,8 +21,6 @@
+ 
+ if ISDN
+ 
+-source "drivers/isdn/mISDN/Kconfig"
+-
+ menuconfig ISDN_I4L
+       tristate "Old ISDN4Linux (deprecated)"
+       ---help---
+diff -Naur linux-2.6.27.21.org/drivers/isdn/Makefile linux-2.6.27.21/drivers/isdn/Makefile
+--- linux-2.6.27.21.org/drivers/isdn/Makefile  2009-03-23 23:04:09.000000000 +0100
++++ linux-2.6.27.21/drivers/isdn/Makefile      2009-03-29 11:07:30.000000000 +0200
+@@ -4,7 +4,6 @@
+ 
+ obj-$(CONFIG_ISDN_I4L)                        += i4l/
+ obj-$(CONFIG_ISDN_CAPI)                       += capi/
+-obj-$(CONFIG_MISDN)                   += mISDN/
+ obj-$(CONFIG_ISDN)                    += hardware/
+ obj-$(CONFIG_ISDN_DIVERSION)          += divert/
+ obj-$(CONFIG_ISDN_DRV_HISAX)          += hisax/