kernel: fix xen kernel build with updated toolchain.

[people/teissler/ipfire-2.x.git] / lfs / dahdi

diff --git a/lfs/dahdi b/lfs/dahdi
index c7a65b061c15406579c4484de277e7f4fc937a82..48840bd7ec51e6da63861f19030e41f23e02b3d9 100644 (file)
--- 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.6.1
+TVER       = 2.6.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,32 +38,29 @@ DIR_APP    = $(DIR_SRC)/dahdi-linux-$(VER)
 DIR_APP1   = $(DIR_SRC)/dahdi-tools-$(TVER)
 
 PROG       = dahdi
-PAK_VER    = 1
+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.0.2-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.0.2-firmware.tar.bz2 = $(DL_FROM)/dahdi-linux-2.2.0.2-firmware.tar.bz2
+dahdi-linux-2.6.1-firmware.tar.gz = $(DL_FROM)/dahdi-linux-2.6.1-firmware.tar.gz
 
-$(DL_FILE)_MD5 = 5cbabd47cf780305e2cba6ccec42c754
-$(DL_FILE1)_MD5 = a018f452f3851a312ff51705ac44de37
-dahdi-linux-2.2.0.2-firmware.tar.bz2_MD5 = 7d7c774d214a528b49c9a08b5350a652
- 
+$(DL_FILE)_MD5 = 75932fe3d4a6e656165aaaa7a1377305
+$(DL_FILE1)_MD5 = c2e4f476a8e7f96a5cad46dd9b648446
+dahdi-linux-2.6.1-firmware.tar.gz_MD5 = cb804d1b4dd1b644d3c1638daa12dcf5
 
 install : $(TARGET)
 
@@ -100,15 +93,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_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)
        @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)
@@ -146,4 +138,3 @@ else
        echo "dahdi_dummy" >> /etc/dahdi/modules
 endif
        @$(POSTBUILD)
-