Date: Friday, May 20, 2011 @ 06:55:01
Author: tpowa
Revision: 124377
upgpkg: fcpcmcia 31107-58
rebuild against .39
Added:
fcpcmcia/trunk/kernel-2.6.39-i686.patch
fcpcmcia/trunk/kernel-2.6.39-x86_64.patch
fcpcmcia/trunk/kernel-2.6.39.patch
Modified:
fcpcmcia/trunk/PKGBUILD
fcpcmcia/trunk/fcpcmcia.install
----------------------------+
PKGBUILD | 28 ++++++++++++++++++++--------
fcpcmcia.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, 66 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-05-20 10:51:27 UTC (rev 124376)
+++ PKGBUILD 2011-05-20 10:55:01 UTC (rev 124377)
@@ -3,14 +3,14 @@
pkgname=fcpcmcia
pkgver=31107
-pkgrel=57
-_kernver=2.6.38-ARCH
+pkgrel=58
+_kernver=2.6.39-ARCH
pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For stock arch 2.6
kernel"
arch=(i686 x86_64)
license=('custom:"AVM"' 'LPGL')
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.pcm/linux/suse.93/fcpcmcia-suse93-3.11-07.tar.gz
pcmcia-2.6.17.patch
atomic.patch kernel-2.6.19.patch
@@ -24,7 +24,9 @@
kernel-2.6.34.patch
kernel-2.6.35.patch
kernel-2.6.36.patch
- kernel-2.6.37.patch)
+ kernel-2.6.37.patch
+ kernel-2.6.39.patch
+ kernel-2.6.39-i686.patch)
md5sums=('96fc3e72afdc2087b4dafe41c069ec18'
'ec21dee3a5a09203dc55b399c29bc58c'
'258b13bb2ac46960b9c91635f02cd080'
@@ -39,7 +41,9 @@
'224a7679645a51929f8d5e1f210d7a9e'
'3a8dcddd077fc301a23a038d5f0aa11f'
'21ccb623540d866091eb918a3d5b2358'
- '9093b1f75d3b2564eb6054ee7f708bee')
+ '9093b1f75d3b2564eb6054ee7f708bee'
+ '3980ae3eaa82d93b81b0ca32bb57a065'
+ 'e6f6c96df15392bbc92eb75f6611f4a7')
fi
if [ "$CARCH" = "x86_64" ]; then
source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.10.0/fcpcmcia-suse10.0-64bit-3.11-07.tar.gz
pcmcia-2.6.17.patch
@@ -55,7 +59,9 @@
kernel-2.6.34.patch
kernel-2.6.35.patch
kernel-2.6.36.patch
- kernel-2.6.37.patch)
+ kernel-2.6.37.patch
+ kernel-2.6.39.patch
+ kernel-2.6.39-x86_64.patch)
md5sums=('4f461710cf57ebf50b3c4f2842288752'
'ec21dee3a5a09203dc55b399c29bc58c'
'258b13bb2ac46960b9c91635f02cd080'
@@ -70,7 +76,10 @@
'224a7679645a51929f8d5e1f210d7a9e'
'3a8dcddd077fc301a23a038d5f0aa11f'
'21ccb623540d866091eb918a3d5b2358'
- '9093b1f75d3b2564eb6054ee7f708bee')
+ '9093b1f75d3b2564eb6054ee7f708bee'
+ '3980ae3eaa82d93b81b0ca32bb57a065'
+ 'b947c47b3f6dd2f143f84312a034bb77')
+
fi
install=(fcpcmcia.install)
options=(!makeflags !strip)
@@ -78,6 +87,7 @@
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 ../../pcmcia-2.6.17.patch
patch -Np0 -i ../../kernel-2.6.19.patch
patch -Np0 -i ../../kernel-2.6.20.patch
@@ -91,6 +101,8 @@
patch -Np0 -i ../../kernel-2.6.35.patch
patch -Np0 -i ../../kernel-2.6.36.patch
patch -Np0 -i ../../kernel-2.6.37.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 <kk...@suse.de>
# in refernece to bug: http://bugs.archlinux.org/task/8511
Modified: fcpcmcia.install
===================================================================
--- fcpcmcia.install 2011-05-20 10:51:27 UTC (rev 124376)
+++ fcpcmcia.install 2011-05-20 10:55:01 UTC (rev 124377)
@@ -9,7 +9,7 @@
sed -i -e 's/#fcpcmcia - - - - -
-/fcpcmcia - - - - - -/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
}
@@ -24,6 +24,6 @@
sed -i -e 's/fcpcmcia - - - - -
-/#fcpcmcia - - - - - -/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:55:01 UTC (rev 124377)
@@ -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:55:01 UTC (rev 124377)
@@ -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:55:01 UTC (rev 124377)
@@ -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 */
