X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2FmISDN;h=5cd4972ca3c5b576f161405fbc54365f79f5c214;hp=349f260fb9f597640da2d1ed95bb94825f8734d1;hb=ba109afd0d551909be86bb11d797f1db80ce56f6;hpb=799cc0f3a9524abbbd6cca803795206e2112a00e

diff --git a/lfs/mISDN b/lfs/mISDN
index 349f260fb..5cd4972ca 100644
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2012  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,23 +24,19 @@
 
 include Config
 
-ifeq "$(PAE)" "1"
-	VERSUFIX=ipfire-pae
-else
-ifeq "$(XEN)" "1"
-	VERSUFIX=ipfire-xen
-else
-	VERSUFIX=ipfire
-endif
+VERSUFIX=ipfire$(KCFG)
+
+ifeq "$(KCFG)" "-xen"
+	KVER = "2.6.32.61"
 endif
 
-VER        = 20100525
+VER        = 20121008
 
 THISAPP    = mISDN-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -50,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f91aa47ee95833d74c8a81ffc6f6fd3
+$(DL_FILE)_MD5 = 7fee0514fd523176b36fca53b02b45cc
 
 install : $(TARGET)
 
@@ -79,23 +75,45 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_SRC)/mISDN* && cd $(DIR_SRC) && tar Jxf $(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
+ifeq "$(MACHINE_TYPE)" "arm"
+	# Remove unsupported timestampcounter on arm. the result seems to be unused
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|rdtscl(pChan->ulTimestampIn);||g" drivers/isdn/mISDN/octvqe/octvqe_linux.c
+endif
+ifeq "$(NOPCI)" "1"
+	# Disable PCI drivers if kernel has no PCI
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_HFCPCI|#&|g" mISDN.cfg.default
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_HFCMULTI|#&|g" mISDN.cfg.default
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_XHFC|#&|g" mISDN.cfg.default
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_AVMFRITZ|#&|g" mISDN.cfg.default
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_SPEEDFAX|#&|g" mISDN.cfg.default
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_INFINEON|#&|g" mISDN.cfg.default
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_W6692|#&|g" mISDN.cfg.default
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_NETJET|#&|g" mISDN.cfg.default
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_IPAC|#&|g" mISDN.cfg.default
+	cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_ISAR|#&|g" mISDN.cfg.default
+endif
 	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
+			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 ; \
+		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/mISDN.conf ; \
 	done
-	sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN
+	sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN.conf
 endif
 
+	# Remove mISDN modules that was shipped with the kernel
+	rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
+	rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
+
 	@rm -rf $(DIR_SRC)/mISDN*
 	@$(POSTBUILD)