X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fdahdi;h=0ae424c428fdc0e27ba7c80f4ec761e238813e84;hb=9d0acf61e017f010df9f77107da45825a7f3f3dc;hp=c7a65b061c15406579c4484de277e7f4fc937a82;hpb=8489f84507c6240b2b8258cbb1f69acb6acb071f;p=ipfire-2.x.git

diff --git a/lfs/dahdi b/lfs/dahdi
index c7a65b061c..0ae424c428 100644
--- a/lfs/dahdi
+++ b/lfs/dahdi
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,16 +24,12 @@
 
 include Config
 
-ifeq "$(XEN)" "1"
-	VERSUFIX=ipfire-xen
-else
-	VERSUFIX=ipfire
-endif
+VERSUFIX=ipfire$(KCFG)
 
-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)
@@ -42,7 +38,7 @@ DIR_APP    = $(DIR_SRC)/dahdi-linux-$(VER)
 DIR_APP1   = $(DIR_SRC)/dahdi-tools-$(TVER)
 
 PROG       = dahdi
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -58,16 +54,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 +96,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)