Date: Friday, May 20, 2011 @ 06:50:58
Author: tpowa
Revision: 124374
upgpkg: fcpci 31107-60
rebuild against .39
Added:
fcpci/trunk/kernel-2.6.39-i686.patch
fcpci/trunk/kernel-2.6.39-x86_64.patch
fcpci/trunk/kernel-2.6.39.patch
Modified:
fcpci/trunk/PKGBUILD
fcpci/trunk/fcpci.install
----------------------------+
PKGBUILD | 28 +++++++++++++++++++---------
fcpci.install | 4 ++--
kernel-2.6.39-i686.patch | 11 +++++++++++
kernel-2.6.39-x86_64.patch | 11 +++++++++++
kernel-2.6.39.patch | 22 ++++++++++++++++++++++
5 files changed, 65 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-20 10:47:04 UTC (rev 124373)
+++ PKGBUILD 2011-05-20 10:50:58 UTC (rev 124374)
@@ -3,14 +3,14 @@
pkgname=fcpci
pkgver=31107
-pkgrel=59
-_kernver=2.6.38-ARCH
+pkgrel=60
+_kernver=2.6.39-ARCH
pkgdesc="AVM ISDN driver for FRITZ PCI isdn cards. For stock arch 2.6 kernel."
arch=(i686 x86_64)
license=('custom:"AVM"' 'LGPL')
url="http://www.avm.de";
-depends=('capi4k-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39')
-makedepends=('kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39')
+depends=('capi4k-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40')
+makedepends=('kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40')
if [ "$CARCH" = "i686" ]; then
source=(ftp://ftp.avm.de/cardware/fritzcrd.pci/linux/suse.93/fcpci-suse93-3.11-07.tar.gz
kernel-2.6.19.patch
@@ -18,7 +18,9 @@
kernel-2.6.22.patch
kernel-2.6.24.patch
kernel-2.6.31.patch
- kernel-2.6.34.patch)
+ kernel-2.6.34.patch
+ kernel-2.6.39.patch
+ kernel-2.6.39-i686.patch)
md5sums=('3ee301b5d0e8df9e4b915af58b725556'
'5c63dc9df0810bb1ba85f3425abaa0ed'
'258b13bb2ac46960b9c91635f02cd080'
@@ -26,8 +28,9 @@
'4f4f03630ed994b16b4cd167f090a116'
'21bfa466b1fb94663ed1f265948dba5e'
'34f5b78b219de8ce12793b16e0171e87'
- '224a7679645a51929f8d5e1f210d7a9e')
-
+ '224a7679645a51929f8d5e1f210d7a9e'
+ '3980ae3eaa82d93b81b0ca32bb57a065'
+ 'e6f6c96df15392bbc92eb75f6611f4a7')
fi
if [ "$CARCH" = "x86_64" ]; then
source=(ftp://ftp.avm.de/cardware/fritzcrd.pci/linux_64bit/suse.10.0/fcpci-suse10.0-64bit-3.11-07.tar.gz
@@ -35,7 +38,9 @@
atomic.patch kernel-2.6.20.patch kernel-2.6.22.patch
kernel-2.6.24.patch
kernel-2.6.31.patch
- kernel-2.6.34.patch)
+ kernel-2.6.34.patch
+ kernel-2.6.39.patch
+ kernel-2.6.39-x86_64.patch)
md5sums=('c5595478515d19436ab20b42e1549de0'
'5c63dc9df0810bb1ba85f3425abaa0ed'
'258b13bb2ac46960b9c91635f02cd080'
@@ -43,7 +48,9 @@
'4f4f03630ed994b16b4cd167f090a116'
'21bfa466b1fb94663ed1f265948dba5e'
'34f5b78b219de8ce12793b16e0171e87'
- '224a7679645a51929f8d5e1f210d7a9e')
+ '224a7679645a51929f8d5e1f210d7a9e'
+ '3980ae3eaa82d93b81b0ca32bb57a065'
+ 'b947c47b3f6dd2f143f84312a034bb77')
fi
install=fcpci.install
options=(!strip)
@@ -51,12 +58,15 @@
build() {
cd $srcdir/fritz/src
[ "$CARCH" = "i686" ] && (patch -Np0 -i ../../atomic.patch)
+ [ "$CARCH" = "i686" ] && (patch -Np0 -i ../../kernel-2.6.39-i686.patch)
patch -Np0 -i ../../kernel-2.6.19.patch
patch -Np0 -i ../../kernel-2.6.20.patch
patch -Np0 -i ../../kernel-2.6.22.patch
patch -Np0 -i ../../kernel-2.6.24.patch
patch -Np0 -i ../../kernel-2.6.31.patch
patch -Np0 -i ../../kernel-2.6.34.patch
+ [ "$CARCH" = "x86_64" ] && patch -Np0 -i ../../kernel-2.6.39-x86_64.patch
+ patch -Np0 -i ../../kernel-2.6.39.patch
cd ..
# fix from Karsten Keil <[email protected]>
# in refernece to bug: http://bugs.archlinux.org/task/8511
Modified: fcpci.install
===================================================================
--- fcpci.install 2011-05-20 10:47:04 UTC (rev 124373)
+++ fcpci.install 2011-05-20 10:50:58 UTC (rev 124374)
@@ -7,7 +7,7 @@
sed -i -e 's/#fcpci - - - - - -/fcpci
- - - - - -/g' /etc/capi.conf
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.38-ARCH
+ KERNEL_VERSION=2.6.39-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
@@ -22,6 +22,6 @@
sed -i -e 's/fcpci - - - - -
-/#fcpci - - - - - -/g'
/etc/capi.conf
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- KERNEL_VERSION=2.6.38-ARCH
+ KERNEL_VERSION=2.6.39-ARCH
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
Added: kernel-2.6.39-i686.patch
===================================================================
--- kernel-2.6.39-i686.patch (rev 0)
+++ kernel-2.6.39-i686.patch 2011-05-20 10:50:58 UTC (rev 124374)
@@ -0,0 +1,11 @@
+--- driver.old 2011-05-20 11:27:00.679423557 +0200
++++ driver.c 2011-05-20 11:31:32.802934200 +0200
+@@ -101,7 +101,7 @@
+ static unsigned long crit_flags;
+ static atomic_t scheduler_enabled = ATOMIC_INIT
(0);
+ static atomic_t scheduler_id = ATOMIC_INIT
(-1);
+-static spinlock_t sched_lock = SPIN_LOCK_UNLOCKED;
++static DEFINE_SPINLOCK(sched_lock);
+ #if !defined (__fcclassic__)
+ static int card_id = 0;
+ #endif
Added: kernel-2.6.39-x86_64.patch
===================================================================
--- kernel-2.6.39-x86_64.patch (rev 0)
+++ kernel-2.6.39-x86_64.patch 2011-05-20 10:50:58 UTC (rev 124374)
@@ -0,0 +1,11 @@
+--- driver.c.orig 2011-05-20 11:59:24.000000000 +0200
++++ driver.c 2011-05-20 12:03:07.439120213 +0200
+@@ -101,7 +101,7 @@
+ static unsigned long crit_flags;
+ static atomic_t scheduler_enabled = ATOMIC_INIT
(0);
+ static atomic_t scheduler_id = ATOMIC_INIT
(-1);
+-static spinlock_t stack_lock = SPIN_LOCK_UNLOCKED;
++static DEFINE_SPINLOCK(stack_lock);
+ #if !defined (__fcclassic__)
+ static int card_id = 0;
+ #endif
Added: kernel-2.6.39.patch
===================================================================
--- kernel-2.6.39.patch (rev 0)
+++ kernel-2.6.39.patch 2011-05-20 10:50:58 UTC (rev 124374)
@@ -0,0 +1,22 @@
+--- tools.old 2011-05-20 11:35:02.621304102 +0200
++++ tools.c 2011-05-20 11:36:23.022819535 +0200
+@@ -110,7 +110,7 @@
+ #define FENCE2_OK(h,m) (*(unsigned *)(((char *)
m)+(h)->size)==FENCE_TAG)
+
+ static unsigned alloc_count = 0;
+-static spinlock_t track_lock = SPIN_LOCK_UNLOCKED;
++static DEFINE_SPINLOCK(track_lock);
+
+ #if !defined (NDEBUG) && defined (LOG_TIMER)
+ static struct timeval zero_time;
+--- tools.old 2011-05-20 11:46:38.706462621 +0200
++++ tools.c 2011-05-20 11:46:27.123401621 +0200
+@@ -529,7 +529,7 @@
+ ERROR("Could not allocate lock structure!!!\n");
+ return 0;
+ }
+- tmp->lock = SPIN_LOCK_UNLOCKED;
++ spin_lock_init(&tmp->lock);
+ *plock = tmp;
+ return 1;
+ } /* lock_init */
