kmod: replace module-init-tools by kmod-13.

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

diff --git a/lfs/mISDN b/lfs/mISDN
index e0469c468fff76221f13edf3dd4fdc5112ed96d1..5cd4972ca3c5b576f161405fbc54365f79f5c214 100644 (file)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -27,7 +27,7 @@ include Config
 VERSUFIX=ipfire$(KCFG)
 
 ifeq "$(KCFG)" "-xen"
-       KVER = "2.6.32.60"
+       KVER = "2.6.32.61"
 endif
 
 VER        = 20121008
@@ -81,6 +81,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 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
@@ -93,10 +106,14 @@ endif
 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)