Merge branch 'master' into perl_5.12.2

[people/pmueller/ipfire-2.x.git] / lfs / mISDN

diff --git a/lfs/mISDN b/lfs/mISDN
index 10f28ebaf59f739be06a25a0c600169fcb3155b4..8eec207819a077c801b469c78ce83cc2d1837535 100644 (file)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  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,13 +24,23 @@
 
 include Config
 
-VER        = git-081106
+ifeq "$(PAE)" "1"
+       VERSUFIX=ipfire-pae
+else
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
+endif
 
-THISAPP    = mISDNuser.git-8e7bf2f11cc108d4b52949c2a26e38df24821b01
+VER        = 20100525
+
+THISAPP    = mISDN-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/mISDNuser.git
-TARGET     = $(DIR_INFO)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4eddac75aac4b997e6f2061e10f20862
+$(DL_FILE)_MD5 = 0f91aa47ee95833d74c8a81ffc6f6fd3
 
 install : $(TARGET)
 
@@ -69,11 +79,24 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make MISDNDIR=/usr/src/linux
-       cd $(DIR_APP) && make install MISDNDIR=/usr/src/linux
-       -mkdir -p /usr/lib/mISDN
-       cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN.git-12dca7cf4cf38590d30cdeaf8ced30aaca6d875f.tar.gz
-       cd $(DIR_SRC)/mISDN.git && cp -v config/*.xsl /usr/lib/mISDN
+       @rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
+       cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
+       cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux
+       cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules
+       cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \
+                       INSTALL_PREFIX=$(DIR_SRC)/mISDN/dest/ \
+                       modules-install
+       mv $(DIR_SRC)/mISDN/dest/lib/modules/*/extra \
+               /lib/modules/$(KVER)-$(VERSUFIX)/mISDN
+
+ifneq "$(XEN)" "1"
+       # Blacklist misdn modules
+       for f in $$(find /lib/modules/$(KVER)-$(VERSUFIX)/mISDN -name *.ko); do \
+               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN ; \
+       done
+       sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN
+endif
+
        @rm -rf $(DIR_SRC)/mISDN*
        @$(POSTBUILD)