mISDN: update to 20121008 and enable build on intel.

diff --git a/lfs/mISDN b/lfs/mISDN
index c73f5196b12358a60b11c7acae2060084a24b5b8..a54fb437e0e45a4aca69876373dcd8edb9843bfd 100644 (file)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  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        #
@@ -26,13 +26,17 @@ include Config
 
 VERSUFIX=ipfire$(KCFG)
 
-VER        = 20100525
+ifeq "$(KCFG)" "-xen"
+       KVER = "2.6.32.59"
+endif
+
+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
@@ -42,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f91aa47ee95833d74c8a81ffc6f6fd3
+$(DL_FILE)_MD5 = 7fee0514fd523176b36fca53b02b45cc
 
 install : $(TARGET)
 
@@ -71,7 +75,7 @@ $(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"
@@ -82,7 +86,7 @@ endif
        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
 

diff --git a/make.sh b/make.sh
index b0f8b31b26cdd2565901c86f273f3189057fdacb..011d75effa4932b4f2fd7f049160e9e509c10414 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -380,7 +380,7 @@ buildipfire() {
   if [ "${MACHINE_TYPE}" != "arm" ]; then
     ipfiremake linux2                  KCFG="-xen"
     ipfiremake v4l-dvb                 KCFG="-xen"
-#    ipfiremake mISDN                  KCFG="-xen"
+    ipfiremake mISDN                   KCFG="-xen"
     ipfiremake cryptodev               KCFG="-xen"
     ipfiremake compat-wireless         KCFG="-xen"
 #    ipfiremake r8169                  KCFG="-xen"
@@ -394,7 +394,7 @@ buildipfire() {
 #    ipfiremake kvm-kmod                       KCFG="-pae"
     ipfiremake v4l-dvb                 KCFG="-pae"
     ipfiremake alsa                    KCFG="-pae" KMOD=1
-#    ipfiremake mISDN                  KCFG="-pae"
+    ipfiremake mISDN                   KCFG="-pae"
     ipfiremake cryptodev               KCFG="-pae"
     ipfiremake compat-wireless         KCFG="-pae"
 #    ipfiremake r8169                  KCFG="-pae"
@@ -408,7 +408,7 @@ buildipfire() {
 #    ipfiremake kvm-kmod                       KCFG=""
     ipfiremake v4l-dvb                 KCFG=""
     ipfiremake alsa                    KCFG="" KMOD=1
-#    ipfiremake mISDN                  KCFG=""
+    ipfiremake mISDN                   KCFG=""
     ipfiremake cryptodev               KCFG=""
     ipfiremake compat-wireless         KCFG=""
 #    ipfiremake r8169                  KCFG=""

diff --git a/src/patches/mISDN_hfc-s_add_id.patch b/src/patches/mISDN_hfc-s_add_id.patch
index d544b1fcf7014a10453e9f93fac30085ec50474a..724b1f2c0dff5082e9819bc37535959f0d294d8b 100644 (file)
--- a/src/patches/mISDN_hfc-s_add_id.patch
+++ b/src/patches/mISDN_hfc-s_add_id.patch
@@ -1,7 +1,16 @@
 diff -Naur mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c mISDN/drivers/isdn/hardware/mISDN/hfcpci.c
---- mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c     2010-05-25 10:41:29.000000000 +0200
-+++ mISDN/drivers/isdn/hardware/mISDN/hfcpci.c 2010-10-31 11:19:05.000000000 +0100
-@@ -88,6 +88,7 @@
+--- mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c     2012-10-08 14:48:40.000000000 +0200
++++ mISDN/drivers/isdn/hardware/mISDN/hfcpci.c 2012-10-08 17:09:29.527792226 +0200
+@@ -53,6 +53,8 @@
+ 
+ #include "hfc_pci.h"
+ 
++#define       PCI_VENDOR_ID_0x1AE7    0x1AE7
++
+ static const char *hfcpci_revision = "2.0";
+ 
+ static int HFC_cnt;
+@@ -90,6 +92,7 @@
        HFC_DIGI_DF_M_A,
        HFC_ABOCOM_2BD1,
        HFC_SITECOM_DC105V2,
@@ -9,20 +18,20 @@ diff -Naur mISDN.org/drivers/isdn/hardware/mISDN/hfcpci.c mISDN/drivers/isdn/har
  };
  
  struct hfcPCI_hw {
-@@ -2182,6 +2183,7 @@
+@@ -2161,6 +2164,7 @@
        {HFC_DIGI_DF_M_A, 0,
-           "Digi International DataFire Micro V (North America)"},
+        "Digi International DataFire Micro V (North America)"},
        {HFC_SITECOM_DC105V2, 0, "Sitecom Connectivity DC-105 ISDN TA"},
 +      {HFC_NONAME_1AE7_0520, 0, "NoName HFC-S (1AE7:0520) ISDN TA"},
        {},
  };
  
-@@ -2233,6 +2235,8 @@
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},
-       {PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,
-               PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},
-+      {0x1ae7, 0x0520,
-+              PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[23]},
+@@ -2212,6 +2216,8 @@
+         (unsigned long) &hfc_map[21] },
+       { PCI_VDEVICE(SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2),
+         (unsigned long) &hfc_map[22] },
++      { PCI_VDEVICE(0x1AE7, 0x0520),
++        (unsigned long) &hfc_map[23] },
        {},
  };