From 76628c777fc3a0eec69e2a998e8dc53e9ac8e247 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 24 Aug 2012 15:23:41 +0200 Subject: [PATCH] dahdi: Update to 2.6.1. --- config/rootfiles/packages/dahdi | 63 ++++++++++++++++++++++----------- lfs/dahdi | 24 ++++++------- make.sh | 10 +++--- 3 files changed, 58 insertions(+), 39 deletions(-) diff --git a/config/rootfiles/packages/dahdi b/config/rootfiles/packages/dahdi index 8e7b8d7cef..d3291b86bc 100644 --- a/config/rootfiles/packages/dahdi +++ b/config/rootfiles/packages/dahdi @@ -1,22 +1,26 @@ etc/dahdi -#etc/hotplug -#etc/hotplug/usb -etc/hotplug/usb/xpp_fxloader -etc/hotplug/usb/xpp_fxloader.usermap -etc/modprobe.d/dahdi -etc/modprobe.d/dahdi.blacklist +etc/modprobe.d/dahdi.blacklist.conf +etc/modprobe.d/dahdi.conf etc/rc.d/init.d/dahdi etc/rc.d/rc0.d/K30dahdi etc/rc.d/rc3.d/S15dahdi etc/rc.d/rc6.d/K30dahdi etc/udev/rules.d/dahdi.rules etc/udev/rules.d/xpp.rules +lib/firmware/.dahdi-fw-hx8-2.06 lib/firmware/.dahdi-fw-oct6114-064-1.05.01 lib/firmware/.dahdi-fw-oct6114-128-1.05.01 +lib/firmware/.dahdi-fw-oct6114-256-1.05.01 lib/firmware/.dahdi-fw-tc400m-MR6.12 +lib/firmware/.dahdi-fw-te820-1.76 +lib/firmware/.dahdi-fw-vpmoct032-1.12.0 +lib/firmware/dahdi-fw-hx8.bin lib/firmware/dahdi-fw-oct6114-064.bin lib/firmware/dahdi-fw-oct6114-128.bin +lib/firmware/dahdi-fw-oct6114-256.bin lib/firmware/dahdi-fw-tc400m.bin +lib/firmware/dahdi-fw-te820.bin +lib/firmware/dahdi-fw-vpmoct032.bin #usr/include/dahdi #usr/include/dahdi/dahdi_config.h #usr/include/dahdi/fasthdlc.h @@ -26,38 +30,47 @@ lib/firmware/dahdi-fw-tc400m.bin #usr/include/dahdi/wctdm_user.h #usr/lib/hotplug #usr/lib/hotplug/firmware -#usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-1.05.01 -#usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-1.05.01 -#usr/lib/hotplug/firmware/.dahdi-fw-tc400m-MR6.12 -#usr/lib/hotplug/firmware/dahdi-fw-oct6114-064.bin -#usr/lib/hotplug/firmware/dahdi-fw-oct6114-128.bin -#usr/lib/hotplug/firmware/dahdi-fw-tc400m.bin +usr/lib/hotplug/firmware/.dahdi-fw-hx8-2.06 +usr/lib/hotplug/firmware/.dahdi-fw-oct6114-064-1.05.01 +usr/lib/hotplug/firmware/.dahdi-fw-oct6114-128-1.05.01 +usr/lib/hotplug/firmware/.dahdi-fw-oct6114-256-1.05.01 +usr/lib/hotplug/firmware/.dahdi-fw-tc400m-MR6.12 +usr/lib/hotplug/firmware/.dahdi-fw-te820-1.76 +usr/lib/hotplug/firmware/.dahdi-fw-vpmoct032-1.12.0 +usr/lib/hotplug/firmware/dahdi-fw-hx8.bin +usr/lib/hotplug/firmware/dahdi-fw-oct6114-064.bin +usr/lib/hotplug/firmware/dahdi-fw-oct6114-128.bin +usr/lib/hotplug/firmware/dahdi-fw-oct6114-256.bin +usr/lib/hotplug/firmware/dahdi-fw-tc400m.bin +usr/lib/hotplug/firmware/dahdi-fw-te820.bin +usr/lib/hotplug/firmware/dahdi-fw-vpmoct032.bin #usr/lib/libtonezone.a -usr/lib/libtonezone.so +#usr/lib/libtonezone.so usr/lib/libtonezone.so.1 usr/lib/libtonezone.so.1.0 usr/lib/libtonezone.so.2 usr/lib/libtonezone.so.2.0 -#usr/lib/perl5/site_perl/5.12.3/Dahdi +usr/lib/perl5/site_perl/5.12.3/Dahdi usr/lib/perl5/site_perl/5.12.3/Dahdi.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Chans.pm -#usr/lib/perl5/site_perl/5.12.3/Dahdi/Config -#usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen +usr/lib/perl5/site_perl/5.12.3/Dahdi/Config +usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Chandahdi.pm +usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Freepbxdb.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Modules.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/System.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Unicall.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Users.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Gen/Xpporder.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Config/Params.pm -#usr/lib/perl5/site_perl/5.12.3/Dahdi/Hardware +usr/lib/perl5/site_perl/5.12.3/Dahdi/Hardware usr/lib/perl5/site_perl/5.12.3/Dahdi/Hardware.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Hardware/PCI.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Hardware/USB.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Span.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Utils.pm -#usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp +usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp/Line.pm usr/lib/perl5/site_perl/5.12.3/Dahdi/Xpp/Mpp.pm @@ -70,6 +83,7 @@ usr/sbin/astribank_tool usr/sbin/dahdi_cfg usr/sbin/dahdi_genconf usr/sbin/dahdi_hardware +usr/sbin/dahdi_maint usr/sbin/dahdi_monitor usr/sbin/dahdi_registration usr/sbin/dahdi_scan @@ -83,22 +97,26 @@ usr/sbin/sethdlc usr/sbin/twinstar usr/sbin/xpp_blink usr/sbin/xpp_sync -#usr/share/dahdi +usr/share/dahdi usr/share/dahdi/FPGA_1141.hex usr/share/dahdi/FPGA_1151.hex +usr/share/dahdi/FPGA_1161.201.hex usr/share/dahdi/FPGA_1161.hex usr/share/dahdi/FPGA_FXS.hex usr/share/dahdi/PIC_TYPE_1.hex usr/share/dahdi/PIC_TYPE_2.hex usr/share/dahdi/PIC_TYPE_3.hex usr/share/dahdi/PIC_TYPE_4.hex +usr/share/dahdi/USB_FW.201.hex usr/share/dahdi/USB_FW.hex +usr/share/dahdi/USB_RECOV.hex usr/share/dahdi/XppConfig.pm usr/share/dahdi/astribank_hook usr/share/dahdi/init_card_1_30 usr/share/dahdi/init_card_2_30 usr/share/dahdi/init_card_3_30 usr/share/dahdi/init_card_4_30 +usr/share/dahdi/init_card_5_30 usr/share/dahdi/waitfor_xpds usr/share/dahdi/xpp_fxloader #usr/share/man/man8/astribank_allow.8 @@ -108,6 +126,7 @@ usr/share/dahdi/xpp_fxloader #usr/share/man/man8/dahdi_cfg.8 #usr/share/man/man8/dahdi_genconf.8 #usr/share/man/man8/dahdi_hardware.8 +#usr/share/man/man8/dahdi_maint.8 #usr/share/man/man8/dahdi_monitor.8 #usr/share/man/man8/dahdi_registration.8 #usr/share/man/man8/dahdi_scan.8 @@ -120,8 +139,12 @@ usr/share/dahdi/xpp_fxloader #usr/share/man/man8/xpp_blink.8 #usr/share/man/man8/xpp_sync.8 #var/ipfire/asterisk -#var/ipfire/asterisk/dahdi +var/ipfire/asterisk/dahdi var/ipfire/asterisk/dahdi/genconf_parameters var/ipfire/asterisk/dahdi/init.conf var/ipfire/asterisk/dahdi/modules var/ipfire/asterisk/dahdi/system.conf +var/ipfire/asterisk/hotplug +var/ipfire/asterisk/hotplug/usb +var/ipfire/asterisk/hotplug/usb/xpp_fxloader +var/ipfire/asterisk/hotplug/usb/xpp_fxloader.usermap diff --git a/lfs/dahdi b/lfs/dahdi index 0ae424c428..48840bd7ec 100644 --- a/lfs/dahdi +++ b/lfs/dahdi @@ -26,8 +26,8 @@ include Config VERSUFIX=ipfire$(KCFG) -VER = 2.2.1 -TVER = 2.2.1 +VER = 2.6.1 +TVER = 2.6.1 DL_FILE = dahdi-linux-$(VER).tar.gz DL_FILE1 = dahdi-tools-$(TVER).tar.gz @@ -38,32 +38,29 @@ DIR_APP = $(DIR_SRC)/dahdi-linux-$(VER) DIR_APP1 = $(DIR_SRC)/dahdi-tools-$(TVER) PROG = dahdi -PAK_VER = 2 +PAK_VER = 3 DEPS = "" - ifeq "$(KMOD)" "1" TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) else TARGET = $(DIR_INFO)/$(THISAPP) endif - ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(DL_FILE1) dahdi-linux-2.2.1-firmware.tar.bz2 +objects = $(DL_FILE) $(DL_FILE1) dahdi-linux-2.6.1-firmware.tar.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE1) = $(DL_FROM)/$(DL_FILE1) -dahdi-linux-2.2.1-firmware.tar.bz2 = $(DL_FROM)/dahdi-linux-2.2.1-firmware.tar.bz2 - -$(DL_FILE)_MD5 = 46e4abbe743830045364fc716d293e88 -$(DL_FILE1)_MD5 = 04e7097929851f744f777400125180db -dahdi-linux-2.2.1-firmware.tar.bz2_MD5 = ccc50ded1641cd619e8d3a4615a6ad19 +dahdi-linux-2.6.1-firmware.tar.gz = $(DL_FROM)/dahdi-linux-2.6.1-firmware.tar.gz +$(DL_FILE)_MD5 = 75932fe3d4a6e656165aaaa7a1377305 +$(DL_FILE1)_MD5 = c2e4f476a8e7f96a5cad46dd9b648446 +dahdi-linux-2.6.1-firmware.tar.gz_MD5 = cb804d1b4dd1b644d3c1638daa12dcf5 install : $(TARGET) @@ -97,8 +94,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_SRC) && tar jxf $(DIR_DL)/dahdi-linux-2.2.1-firmware.tar.bz2 - cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER) + cd $(DIR_SRC) && tar axf $(DIR_DL)/dahdi-linux-2.6.1-firmware.tar.gz + cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER)-$(VERSUFIX) ifeq "$(KMOD)" "1" cd $(DIR_APP) && make install-modules KVERS=$(KVER)-$(VERSUFIX) @@ -141,4 +138,3 @@ else echo "dahdi_dummy" >> /etc/dahdi/modules endif @$(POSTBUILD) - diff --git a/make.sh b/make.sh index 97fdff539b..88c28cd950 100755 --- a/make.sh +++ b/make.sh @@ -396,7 +396,7 @@ buildipfire() { # ipfiremake v4l-dvb KCFG="-pae" ipfiremake alsa KCFG="-pae" KMOD=1 # ipfiremake mISDN KCFG="-pae" -# ipfiremake dahdi KCFG="-pae" KMOD=1 + ipfiremake dahdi KCFG="-pae" KMOD=1 ipfiremake cryptodev KCFG="-pae" ipfiremake compat-wireless KCFG="-pae" # ipfiremake r8169 KCFG="-pae" @@ -411,7 +411,7 @@ buildipfire() { # ipfiremake v4l-dvb KCFG="" ipfiremake alsa KCFG="" KMOD=1 # ipfiremake mISDN KCFG="" -# ipfiremake dahdi KCFG="" KMOD=1 + ipfiremake dahdi KCFG="" KMOD=1 ipfiremake cryptodev KCFG="" ipfiremake compat-wireless KCFG="" # ipfiremake r8169 KCFG="" @@ -726,9 +726,9 @@ buildipfire() { ipfiremake nut ipfiremake watchdog ipfiremake libpri -# ipfiremake dahdi # update needed for 3.2.x -# ipfiremake asterisk -# ipfiremake lcr + ipfiremake dahdi + ipfiremake asterisk + ipfiremake lcr ipfiremake usb_modeswitch ipfiremake usb_modeswitch_data ipfiremake zerofree -- 2.39.2