From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 14 Feb 2010 10:18:11 +0000 (+0100)
Subject: Updated dahdi (2.2.1).
X-Git-Tag: v2.9-beta1~412^2~70^2~2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=6a34b2882ed3a6532cf794ffcccc86874f4d2643

Updated dahdi (2.2.1).
---

diff --git a/config/rootfiles/packages/dahdi b/config/rootfiles/packages/dahdi
index 4f40b71db4..896a8a1435 100644
--- a/config/rootfiles/packages/dahdi
+++ b/config/rootfiles/packages/dahdi
@@ -65,6 +65,7 @@ usr/lib/perl5/site_perl/5.8.8/Dahdi/Xpp/Xbus.pm
 usr/lib/perl5/site_perl/5.8.8/Dahdi/Xpp/Xpd.pm
 usr/sbin/astribank_allow
 usr/sbin/astribank_hexload
+usr/sbin/astribank_is_starting
 usr/sbin/astribank_tool
 usr/sbin/dahdi_cfg
 usr/sbin/dahdi_genconf
@@ -79,6 +80,7 @@ usr/sbin/fpga_load
 usr/sbin/fxotune
 usr/sbin/lsdahdi
 usr/sbin/sethdlc
+usr/sbin/twinstar
 usr/sbin/xpp_blink
 usr/sbin/xpp_sync
 #usr/share/dahdi
@@ -101,6 +103,7 @@ usr/share/dahdi/waitfor_xpds
 usr/share/dahdi/xpp_fxloader
 #usr/share/man/man8/astribank_allow.8
 #usr/share/man/man8/astribank_hexload.8
+#usr/share/man/man8/astribank_is_starting.8
 #usr/share/man/man8/astribank_tool.8
 #usr/share/man/man8/dahdi_cfg.8
 #usr/share/man/man8/dahdi_genconf.8
@@ -113,6 +116,7 @@ usr/share/dahdi/xpp_fxloader
 #usr/share/man/man8/fpga_load.8
 #usr/share/man/man8/fxotune.8
 #usr/share/man/man8/lsdahdi.8
+#usr/share/man/man8/twinstar.8
 #usr/share/man/man8/xpp_blink.8
 #usr/share/man/man8/xpp_sync.8
 #var/ipfire/asterisk
diff --git a/lfs/dahdi b/lfs/dahdi
index c7a65b061c..e4062843c3 100644
--- a/lfs/dahdi
+++ b/lfs/dahdi
@@ -30,10 +30,10 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 2.2.0.2
-TVER       = 2.2.0
+VER        = 2.2.1
+TVER       = 2.2.1
 
-DL_FILE    = dahdi-linux-$(VER)-with-vpmadt032-1.17.0.tar.gz
+DL_FILE    = dahdi-linux-$(VER).tar.gz
 DL_FILE1   = dahdi-tools-$(TVER).tar.gz
 
 THISAPP    = dahdi-$(VER)
@@ -58,16 +58,16 @@ endif
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(DL_FILE1) dahdi-linux-2.2.0.2-firmware.tar.bz2
+objects = $(DL_FILE) $(DL_FILE1) dahdi-linux-2.2.1-firmware.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 $(DL_FILE1) = $(DL_FROM)/$(DL_FILE1)
-dahdi-linux-2.2.0.2-firmware.tar.bz2 = $(DL_FROM)/dahdi-linux-2.2.0.2-firmware.tar.bz2
+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
 
-$(DL_FILE)_MD5 = 5cbabd47cf780305e2cba6ccec42c754
-$(DL_FILE1)_MD5 = a018f452f3851a312ff51705ac44de37
-dahdi-linux-2.2.0.2-firmware.tar.bz2_MD5 = 7d7c774d214a528b49c9a08b5350a652
- 
 
 install : $(TARGET)
 
@@ -100,15 +100,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 
-ifeq "$(KMOD)" "1"
 	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)
+
+ifeq "$(KMOD)" "1"
 	cd $(DIR_APP) && make install-modules KVERS=$(KVER)-$(VERSUFIX)
 	@rm -rf $(DIR_APP)
 else
-	rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_SRC) && tar jxf $(DIR_DL)/dahdi-linux-2.2.0.2-firmware.tar.bz2
-	cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER)
 	cd $(DIR_APP) && make install-devices install-include \
 		install-firmware install-xpp-firm KVERS=$(KVER)-$(VERSUFIX)
 	@rm -rf $(DIR_APP)