X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2FmISDN;h=01bd77d7d433f95aedbe4020796b278a4f7794dd;hp=b689a365b7dd65c6c24828df6700f4ac679f02f2;hb=29e453bcce26da749901ffefe28b9f81348f0d26;hpb=e803f8dd2ef7639eb57600302229cf1c01ade4e7

diff --git a/lfs/mISDN b/lfs/mISDN
index b689a365b7..01bd77d7d4 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        #
@@ -30,9 +30,9 @@ else
 	VERSUFIX=ipfire
 endif
 
-VER        = 20090906
+VER        = 20100525
 
-THISAPP    = mISDN_$(VER)
+THISAPP    = mISDN-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c5a9daab7fa18734127d481c8cfdac96
+$(DL_FILE)_MD5 = 0f91aa47ee95833d74c8a81ffc6f6fd3
 
 install : $(TARGET)
 
@@ -76,15 +76,23 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@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-enable_disabled_cards.patch
-	cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb_bchannels.patch
 	cd $(DIR_SRC)/mISDN && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
-	cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) force
-	cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) $(MAKETUNING)
+	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)