X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2FmISDN;h=8eec207819a077c801b469c78ce83cc2d1837535;hb=bf5a6d9a69ec584faff4fbb9c74359a48f0601d2;hp=b48d83b97c4df7612257bde023ebf2191836bc72;hpb=8bba296515ab256155d6dc649f7a2ad26baa5929;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/mISDN b/lfs/mISDN
index b48d83b97c..8eec207819 100644
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,13 +24,23 @@
 
 include Config
 
-VER        = 1_1_3
+ifeq "$(PAE)" "1"
+	VERSUFIX=ipfire-pae
+else
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+endif
+
+VER        = 20100525
 
-THISAPP    = mISDNuser-$(VER)
+THISAPP    = mISDN-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 546c42271307b0ffe1dd55fd899adda8
+$(DL_FILE)_MD5 = 0f91aa47ee95833d74c8a81ffc6f6fd3
 
 install : $(TARGET)
 
@@ -71,8 +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
-	@rm -rf $(DIR_APP)
+	@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)