- updated to 2.6.1

- removed obsolete linux-2.6.37,kernel-3.4 patches

diff --git a/dahdi-2.4.0-linux-2.6.37.patch b/dahdi-2.4.0-linux-2.6.37.patch
deleted file mode 100644 (file)
index 65dbc25..0000000
--- a/dahdi-2.4.0-linux-2.6.37.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -Naurp dahdi-linux-2.4.0.orig/drivers/dahdi/voicebus/voicebus.c dahdi-linux-2.4.0/drivers/dahdi/voicebus/voicebus.c
---- dahdi-linux-2.4.0.orig/drivers/dahdi/voicebus/voicebus.c   2010-08-17 13:53:18.000000000 +0200
-+++ dahdi-linux-2.4.0/drivers/dahdi/voicebus/voicebus.c        2010-11-01 22:01:57.382883648 +0100
-@@ -1120,7 +1120,7 @@ static void vb_stop_txrx_processors(stru
-  */
- void voicebus_stop(struct voicebus *vb)
- {
--      static DECLARE_MUTEX(stop);
-+      static DEFINE_SEMAPHORE(stop);
- 
-       down(&stop);
- 
-diff -Naurp dahdi-linux-2.4.0.orig/drivers/dahdi/wctc4xxp/base.c dahdi-linux-2.4.0/drivers/dahdi/wctc4xxp/base.c
---- dahdi-linux-2.4.0.orig/drivers/dahdi/wctc4xxp/base.c       2010-07-28 17:32:03.000000000 +0200
-+++ dahdi-linux-2.4.0/drivers/dahdi/wctc4xxp/base.c    2010-11-01 22:01:57.366885577 +0100
-@@ -3443,7 +3443,7 @@ wctc4xxp_init_one(struct pci_dev *pdev, 
-               return -EIO;
-       }
- 
--      init_MUTEX(&wc->chansem);
-+      sema_init(&wc->chansem, 1);
-       spin_lock_init(&wc->reglock);
-       spin_lock_init(&wc->cmd_list_lock);
-       spin_lock_init(&wc->rx_list_lock);
-diff -Naurp dahdi-linux-2.4.0.orig/drivers/dahdi/wctdm24xxp/base.c dahdi-linux-2.4.0/drivers/dahdi/wctdm24xxp/base.c
---- dahdi-linux-2.4.0.orig/drivers/dahdi/wctdm24xxp/base.c     2010-08-19 20:03:25.000000000 +0200
-+++ dahdi-linux-2.4.0/drivers/dahdi/wctdm24xxp/base.c  2010-11-01 22:01:57.395882083 +0100
-@@ -207,7 +207,7 @@ static inline bool is_hx8(const struct w
- }
- 
- struct wctdm *ifaces[WC_MAX_IFACES];
--DECLARE_MUTEX(ifacelock);
-+DEFINE_SEMAPHORE(ifacelock);
- 
- static void wctdm_release(struct wctdm *wc);
- 
-@@ -4917,7 +4917,7 @@ __wctdm_init_one(struct pci_dev *pdev, c
- 
-       /* This is to insure that the analog span is given lowest priority */
-       wc->oldsync = -1;
--      init_MUTEX(&wc->syncsem);
-+      sema_init(&wc->syncsem, 1);
-       INIT_LIST_HEAD(&wc->frame_list);
-       spin_lock_init(&wc->frame_list_lock);
- 
-diff -Naurp dahdi-linux-2.4.0.orig/drivers/dahdi/wctdm24xxp/xhfc.c dahdi-linux-2.4.0/drivers/dahdi/wctdm24xxp/xhfc.c
---- dahdi-linux-2.4.0.orig/drivers/dahdi/wctdm24xxp/xhfc.c     2010-08-13 20:36:15.000000000 +0200
-+++ dahdi-linux-2.4.0/drivers/dahdi/wctdm24xxp/xhfc.c  2010-11-01 22:01:57.396881962 +0100
-@@ -2576,8 +2576,8 @@ static int b400m_probe(struct wctdm *wc,
-       }
- 
-       spin_lock_init(&b4->reglock);
--      init_MUTEX(&b4->regsem);
--      init_MUTEX(&b4->fifosem);
-+      sema_init(&b4->regsem, 1);
-+      sema_init(&b4->fifosem, 1);
- 
-       for (x = 0; x < 4; x++) {
-               fasthdlc_init(&b4->spans[x].rxhdlc, FASTHDLC_MODE_16);
-diff -Naurp dahdi-linux-2.4.0.orig/drivers/dahdi/xpp/xbus-core.c dahdi-linux-2.4.0/drivers/dahdi/xpp/xbus-core.c
---- dahdi-linux-2.4.0.orig/drivers/dahdi/xpp/xbus-core.c       2010-07-13 21:38:13.000000000 +0200
-+++ dahdi-linux-2.4.0/drivers/dahdi/xpp/xbus-core.c    2010-11-01 22:01:57.243900400 +0100
-@@ -1165,7 +1165,7 @@ static void worker_init(xbus_t *xbus)
-       INIT_LIST_HEAD(&worker->card_list);
-       init_waitqueue_head(&worker->wait_for_xpd_initialization);
-       worker->wq = NULL;
--      init_MUTEX(&xbus->worker.running_initialization);
-+      sema_init(&xbus->worker.running_initialization, 1);
- }
- 
- /*
-diff -Naurp dahdi-linux-2.4.0.orig/drivers/dahdi/xpp/xpp_usb.c dahdi-linux-2.4.0/drivers/dahdi/xpp/xpp_usb.c
---- dahdi-linux-2.4.0.orig/drivers/dahdi/xpp/xpp_usb.c 2010-07-13 10:33:00.000000000 +0200
-+++ dahdi-linux-2.4.0/drivers/dahdi/xpp/xpp_usb.c      2010-11-01 22:01:57.257898713 +0100
-@@ -248,7 +248,7 @@ static unsigned bus_count = 0;
- 
- 
- /* prevent races between open() and disconnect() */
--static DECLARE_MUTEX (disconnect_sem);
-+static DEFINE_SEMAPHORE(disconnect_sem);
- 
- /*
-  * AsteriskNow kernel has backported the "lean" callback from 2.6.20
-@@ -690,7 +690,7 @@ static int xusb_probe(struct usb_interfa
-               retval = -ENOMEM;
-               goto probe_failed;
-       }
--      init_MUTEX (&xusb->sem);
-+      sema_init (&xusb->sem, 1);
-       atomic_set(&xusb->pending_writes, 0);
-       atomic_set(&xusb->pending_reads, 0);
-       atomic_set(&xusb->pcm_tx_drops, 0);

diff --git a/dahdi-linux-kernel-3.4.patch b/dahdi-linux-kernel-3.4.patch
deleted file mode 100644 (file)
index dec3ef5..0000000
--- a/dahdi-linux-kernel-3.4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- dahdi-linux-2.6.0/drivers/dahdi/wcb4xxp/base.c.orig        2012-07-01 14:54:16.403757879 +0200
-+++ dahdi-linux-2.6.0/drivers/dahdi/wcb4xxp/base.c     2012-07-01 14:57:24.020417929 +0200
-@@ -22,6 +22,7 @@
- 
- #include <linux/init.h>
- 
-+#include <linux/version.h>
- #include <linux/kernel.h>     /* printk() */
- #include <linux/errno.h>      /* error codes */
- #include <linux/module.h>
-@@ -35,7 +36,11 @@
- #include <linux/spinlock.h>
- #include <linux/device.h>     /* dev_err() */
- #include <linux/interrupt.h>
--#include <asm/system.h>               /* cli(), *_flags */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
-+#include <asm/system.h>               /* *mb(), barrier() */
-+#else
-+#include <asm/barrier.h>      /* *mb(), barrier() */
-+#endif
- #include <asm/uaccess.h>      /* copy_*_user */
- #include <linux/workqueue.h>  /* work_struct */
- #include <linux/timer.h>      /* timer_struct */

diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index c899855833c0959f2bf190501bd7d55b782d14d2..1f5c4c289a99cc123ec07a944fcd9614f968df40 100644 (file)
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -32,18 +32,18 @@
 %undefine      with_dist_kernel
 %endif
 
-%define                rel     46
+%define                rel     1
 %define                pname   dahdi-linux
 %define                FIRMWARE_URL http://downloads.digium.com/pub/telephony/firmware/releases
 Summary:       DAHDI telephony device support
 Summary(pl.UTF-8):     Obsługa urządzeń telefonicznych DAHDI
 Name:          %{pname}%{_alt_kernel}
-Version:       2.6.0
+Version:       2.6.1
 Release:       %{rel}
 License:       GPL
 Group:         Base/Kernel
 Source0:       http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-%{version}.tar.gz
-# Source0-md5: ea35ad29dafe5490028ff642c35ef9a2
+# Source0-md5: 75932fe3d4a6e656165aaaa7a1377305
 Source3:       %{FIRMWARE_URL}/dahdi-fw-oct6114-064-1.05.01.tar.gz
 # Source3-md5: 88db9b7a07d8392736171b1b3e6bcc66
 Source4:       %{FIRMWARE_URL}/dahdi-fw-oct6114-128-1.05.01.tar.gz
@@ -56,8 +56,6 @@ Source7:      %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
 # Source7-md5: a7f3886942bb3e9fed349a41b3390c9f
 Patch0:                %{pname}-build.patch
 # http://oss.axsentis.de/people/stkn/openzap/dahdi-2.4.0-linux-2.6.37.patch
-Patch1:                dahdi-2.4.0-linux-2.6.37.patch
-Patch2:                dahdi-linux-kernel-3.4.patch
 URL:           http://www.asterisk.org/
 %if %{with dist_kernel}
 BuildRequires: kernel%{_alt_kernel}-module-build
@@ -91,15 +89,15 @@ Sterownik do urządzeń telefonicznych DAHDI.
 
 %package devel
 Summary:       Header files for dahdi interface
+Summary(pl.UTF-8):     Pliki nagłówkowe interfejsu dahdi
 Group:         Development/Libraries
-# if base package contains shared library for which these headers are
-#Requires:     %{name} = %{version}-%{release}
-# if -libs package contains shared library for which these headers are
-#Requires:     %{name}-libs = %{version}-%{release}
 
 %description devel
 Header files for dahdi interface.
 
+%description devel -l pl.UTF-8
+Pliki nagłówkowe interfejsu dahdi.
+
 %package udev
 Summary:       udev rules for DAHDI kernel modules
 Summary(pl.UTF-8):     Reguły udev dla modułów jądra Linuksa dla DAHDI
@@ -135,8 +133,6 @@ Sterownik dla jądra Linuksa do urządzeń telefonicznych DAHDI.
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
-#%patch1 -p1
-%patch2 -p1
 
 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
        ln -s $a drivers/dahdi/firmware
@@ -186,10 +182,8 @@ cd ../..
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT/etc/udev/rules.d
 
-%{make} \
-       DESTDIR=$RPM_BUILD_ROOT \
-       install-devices \
-       install-include
+%{__make} install-devices install-include \
+       DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 %clean