X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2FmISDN;h=7ea0c67a1bc5026c198c86ea0d8ea46f241d5ffd;hp=3040648c9325c568e594ae10354d94f11a660984;hb=7273a322385000e403df6a9569f6352247b3ff30;hpb=d1955482de4fd0093363b100b72197a5e366b1c1

diff --git a/lfs/mISDN b/lfs/mISDN
index 3040648c9..7ea0c67a1 100644
--- 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,24 @@
 
 include Config
 
-VER        = f69adb52764c392135800f9a87c9018f9f268139
+ifeq "$(PAE)" "1"
+	VERSUFIX=ipfire-pae
+else
+ifeq "$(XEN)" "1"
+	VERSUFIX=ipfire-xen
+else
+	VERSUFIX=ipfire
+endif
+endif
 
-THISAPP    = mISDNuser.git-$(VER)
+VER        = 20100525
+
+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)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 26cd2bdaa094892c3ee30cd8fdacad8a
+$(DL_FILE)_MD5 = 0f91aa47ee95833d74c8a81ffc6f6fd3
 
 install : $(TARGET)
 
@@ -69,11 +80,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_SRC)/mISDNuser.git && make MISDNDIR=/usr/src/linux
-	cd $(DIR_SRC)/mISDNuser.git && make install MISDNDIR=/usr/src/linux
-	-mkdir -p /usr/lib/mISDN
-	cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN.git-ad5e8abaed89ce6539104b819eef011655cd0b04.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)