Updated mISDN to current socket trunk

Removed asterisk chan_misdn
Add linux call router package and chan_lcr for asterisk
This commit is contained in:
Arne Fitzenreiter
2009-04-11 15:22:35 +02:00
parent b04e1df8b7
commit d644d86f7e
10 changed files with 50 additions and 104 deletions

View File

@@ -1,6 +1,6 @@
MENUSELECT_APPS=app_flash app_ivrdemo app_meetme app_osplookup app_page app_rpt app_skel app_zapbarge app_zapras app_zapscan
MENUSELECT_CDR=cdr_odbc cdr_pgsql cdr_radius cdr_sqlite cdr_tds
MENUSELECT_CHANNELS=chan_gtalk chan_h323 chan_nbs chan_zap chan_vpb
MENUSELECT_CHANNELS=chan_gtalk chan_h323 chan_misdn chan_nbs chan_zap chan_vpb
MENUSELECT_CODECS=codec_speex codec_zap
MENUSELECT_FORMATS=
MENUSELECT_FUNCS=func_odbc
@@ -27,6 +27,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite
MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_gtalk
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_zap
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb

View File

@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27.21
# Sun Mar 29 09:23:43 2009
# Fri Apr 10 17:21:16 2009
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1750,6 +1750,15 @@ 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
#
# mISDN hardware drivers
#
CONFIG_MISDN_HFCPCI=m
CONFIG_MISDN_HFCMULTI=m
# CONFIG_ISDN_I4L is not set
CONFIG_ISDN_CAPI=m
CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
@@ -1778,25 +1787,6 @@ 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 is not set
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
#

View File

@@ -1,51 +1,17 @@
etc/rc.d/init.d/mISDN
usr/bin/isdnbridge
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/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/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
#lib/modules/2.6.27.21-ipfire/mISDN
#lib/modules/2.6.27.21-ipfire/mISDN/hfcmulti.ko
#lib/modules/2.6.27.21-ipfire/mISDN/hfcpci.ko
#lib/modules/2.6.27.21-ipfire/mISDN/hfcsusb.ko
#lib/modules/2.6.27.21-ipfire/mISDN/l1oip.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_core.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_kb1ec.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_mec2.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_mg2ec.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_octwareec.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dsp_oslec.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_dtmf.ko
#lib/modules/2.6.27.21-ipfire/mISDN/mISDN_l1loop.ko
#lib/modules/2.6.27.21-ipfire/mISDN/octvqe
#lib/modules/2.6.27.21-ipfire/mISDN/octvqe/octvqe.ko
#lib/modules/2.6.27.21-ipfire/mISDN/xhfc.ko

View File

@@ -1 +0,0 @@
../../../common/mISDN

View File

@@ -177,7 +177,6 @@ usr/lib/asterisk/modules/chan_features.so
usr/lib/asterisk/modules/chan_iax2.so
usr/lib/asterisk/modules/chan_local.so
usr/lib/asterisk/modules/chan_mgcp.so
usr/lib/asterisk/modules/chan_misdn.so
usr/lib/asterisk/modules/chan_ooh323.so
usr/lib/asterisk/modules/chan_oss.so
usr/lib/asterisk/modules/chan_phone.so

View File

@@ -125,7 +125,7 @@
* gzip-1.3.5
* hddtemp-0.3-beta14
* hdparm-8.9
* hostapd-0.6.8
* hostapd-0.6.9
* hplip-2.7.10
* htop-0.8.1
* httpd-2.2.11
@@ -185,8 +185,9 @@
* lynis-1.2.3
* lzo-2.02
* m4-1.4.4
* mISDNuser.git-f69adb52764c392135800f9a87c9018f9f268139
* madwifi-hal-0.10.5.6-r3942-20090205-kmod-2.6.27.21
* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93
* mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641
* madwifi-trunk-r3994-20090410-kmod-2.6.27.21
* make-3.81
* man-db-2.4.3
* man-pages-2.34
@@ -318,7 +319,7 @@
* whatmask-1.2
* which-2.16
* wireless_tools.30.pre6
* wpa_supplicant-0.6.8
* wpa_supplicant-0.6.9
* xfsprogs-2.9.4
* xvidcore-1.2.1
* zlib-1.2.3

View File

@@ -64,7 +64,7 @@ $(TARGET) :
cp -a /lib/modules/$(KVER)-ipfire/ /install/initrd/lib/modules/
rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,source,misc/*,kernel/{sound,drivers/{bluetooth,hwmon,gpu,rtc,isdn,media,video,watchdog}}} \
rm -rf /install/initrd/lib/modules/$(KVER)-ipfire/{build,mISDN,source,misc/*,kernel/{sound,drivers/{bluetooth,hwmon,gpu,rtc,isdn,media,video,watchdog}}} \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan* \
/install/initrd/lib/modules/$(KVER)-ipfire/net/{bridge,netfilter,ipsec}

View File

@@ -34,8 +34,6 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
mISDN_VER = mISDN.git-ad5e8abaed89ce6539104b819eef011655cd0b04
# Normal build or SMP build.
#
ifeq "$(SMP)" "1"
@@ -48,7 +46,6 @@ endif
# Top-level Rules
###############################################################################
objects =$(DL_FILE) \
$(mISDN_VER).tar.gz \
squashfs3.4.tar.gz \
netfilter-layer7-v2.21.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
@@ -58,14 +55,12 @@ $(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_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_VER).tar.gz_MD5 = 480a947458c3f254aba489a807f98a29
reiser4-for-2.6.27.19.patch.bz2_MD5 = 22988387f64f299489b90b484b2642cc
install : $(TARGET)
@@ -130,16 +125,6 @@ ifeq "$(XEN)" ""
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27-imq.patch
endif
# 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.2
cd $(DIR_SRC) && rm -rf mISDN-*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/$(mISDN_VER).tar.gz
cd $(DIR_SRC)/mISDN.git && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-remove2.6.27-dsp-features.diff
cd $(DIR_SRC)/mISDN.git && yes 'yes' | ./std2kern -k /usr/src/linux
# Cleanup kernel source
cd $(DIR_APP) && make mrproper
@@ -183,6 +168,10 @@ endif
mv /lib/modules/$(VER)-ipfire/kernel/drivers/ide/ide-cd_mod.ko \
/lib/modules/$(VER)-ipfire/kernel/drivers/ide/ide-cd.ko
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
# Remove mISDN modules
@rm -rf /lib/modules/$(VER)-ipfire/kernel/drivers/isdn/mISDN
@rm -rf /lib/modules/$(VER)-ipfire/kernel/drivers/isdn/hardware/mISDN
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
@$(POSTBUILD)

View File

@@ -24,9 +24,9 @@
include Config
VER = f69adb52764c392135800f9a87c9018f9f268139
VER = 9bf7deaa4b8829ab8fbccb34529a17aab2ddea93
THISAPP = mISDNuser.git-$(VER)
THISAPP = mISDN.git-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 26cd2bdaa094892c3ee30cd8fdacad8a
$(DL_FILE)_MD5 = a9e9aaff23cda58c4d71aab8eab9bba5
install : $(TARGET)
@@ -70,10 +70,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC)/mISDNuser.git && make MISDNDIR=/usr/src/linux
cd $(DIR_SRC)/mISDNuser.git && make install MISDNDIR=/usr/src/linux
-mkdir -p /usr/lib/mISDN
cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN.git-ad5e8abaed89ce6539104b819eef011655cd0b04.tar.gz
cd $(DIR_SRC)/mISDN.git && cp -v config/*.xsl /usr/lib/mISDN
cd $(DIR_SRC)/mISDN.git && make force
cd $(DIR_SRC)/mISDN.git && make $(MAKETUNING)
cd $(DIR_SRC)/mISDN.git && make install
mv /lib/modules/$(KVER)-ipfire/extra /lib/modules/$(KVER)-ipfire/mISDN
@rm -rf $(DIR_SRC)/mISDN*
@$(POSTBUILD)

View File

@@ -344,6 +344,7 @@ buildipfire() {
ipfiremake madwifi
ipfiremake alsa KMOD=1
ipfiremake openswan KMOD=1
ipfiremake mISDN
ipfiremake pkg-config
ipfiremake linux-atm
ipfiremake cpio
@@ -411,7 +412,7 @@ buildipfire() {
ipfiremake iptstate
ipfiremake iputils
ipfiremake l7-protocols
ipfiremake mISDN
ipfiremake mISDNuser
ipfiremake capi4k-utils
ipfiremake hwdata
ipfiremake kudzu
@@ -596,6 +597,7 @@ buildipfire() {
ipfiremake net-snmp
ipfiremake perl-DBI
ipfiremake perl-DBD-mysql
ipfiremake lcr
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild