[arch-commits] CVS update of extra/network/fcpcmcia (3 files)

Fri Jan 25 17:43:01 UTC 2008

Date: Friday, January 25, 2008 @ 12:43:01
  Author: tpowa
    Path: /home/cvs-extra/extra/network/fcpcmcia

   Added: kernel-2.6.24.patch (1.1)
Modified: PKGBUILD (1.34 -> 1.35) fcpcmcia.install (1.12 -> 1.13)

upgpkg: update to new .24 kernel series


---------------------+
 PKGBUILD            |   50 +++++++++++---------------------------------------
 fcpcmcia.install    |    4 ++--
 kernel-2.6.24.patch |   14 ++++++++++++++
 3 files changed, 27 insertions(+), 41 deletions(-)


Index: extra/network/fcpcmcia/PKGBUILD
diff -u extra/network/fcpcmcia/PKGBUILD:1.34 extra/network/fcpcmcia/PKGBUILD:1.35

--- extra/network/fcpcmcia/PKGBUILD:1.34	Mon Nov 26 11:23:25 2007
+++ extra/network/fcpcmcia/PKGBUILD	Fri Jan 25 12:43:00 2008
@@ -1,36 +1,22 @@
-# $Id: PKGBUILD,v 1.34 2007/11/26 16:23:25 tpowa Exp $
+# $Id: PKGBUILD,v 1.35 2008/01/25 17:43:00 tpowa Exp $
 #Maintainer: Tobias Powalowski <t.powa at gmx.de>
 
 
 
 pkgname=fcpcmcia
 pkgver=31107
-pkgrel=36
-_kernver=2.6.23-ARCH
+pkgrel=37
+_kernver=2.6.24-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.23.8-2')
+depends=('capi4k-utils' 'kernel26>=2.6.24-1' 'kernel26<=2.6.25-0')
 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 kernel-2.6.20.patch kernel-2.6.22.patch)
- md5sums=('96fc3e72afdc2087b4dafe41c069ec18'
-         'ec21dee3a5a09203dc55b399c29bc58c'
-         '258b13bb2ac46960b9c91635f02cd080'
-         '5c63dc9df0810bb1ba85f3425abaa0ed'
-         '890ec6e1219a3a4bae77f5815c3ed40d'
-         '4f4f03630ed994b16b4cd167f090a116'
-         '4be09efb2e81482fdc1d043ad164b2e3')
+	pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch string.h)
 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 atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch)
-md5sums=('4f461710cf57ebf50b3c4f2842288752'
-         'ec21dee3a5a09203dc55b399c29bc58c'
-         '258b13bb2ac46960b9c91635f02cd080'
-         '5c63dc9df0810bb1ba85f3425abaa0ed'
-         '890ec6e1219a3a4bae77f5815c3ed40d'
-         '4f4f03630ed994b16b4cd167f090a116'
-         'ff330f2d76e82b6e257d9cd76fd4808d')
+	pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch string64.h)
 fi
 install=(fcpcmcia.install)
 options=(!makeflags)
@@ -41,24 +27,11 @@
   patch -Np0 -i ../../kernel-2.6.19.patch || return 1
   patch -Np0 -i ../../kernel-2.6.20.patch || return 1
   patch -Np0 -i ../../kernel-2.6.22.patch || return 1
-  cd ..
-  # fix from Karsten Keil <kkeil at suse.de>
-  # in refernece to bug: http://bugs.archlinux.org/task/8511
-  OBJ=$(find . -name '*lib.o')
-  for i in $OBJ; do
-    mv $i $i.old
-    objcopy -L memcmp \
-            -L memcpy \
-            -L memmove \
-            -L memset \
-            -L strcat \
-            -L strcmp \
-            -L strcpy \
-            -L strlen \
-            -L strncmp \
-            -L strncpy \
-    $i.old $i
-  done
+  patch -Np0 -i ../../kernel-2.6.24.patch || return 1
+  [ "$CARCH" = "i686" ] && cp $startdir/src/string.h .
+  [ "$CARCH" = "x86_64" ] && cp $startdir/src/string64.h string.h
+  sed -i 's#<linux/string.h>#"string.h"#' driver.c main.c tools.c fcpcmcia_cs.c
+  sed -i 's#tools.h#tools.h string.h#' Makefile
   cd $startdir/src/fritz
   make KDIR=/lib/modules/${_kernver}/build LIBDIR=$startdir/pkg/var/lib/fritz all || return 1
   mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
@@ -67,4 +40,3 @@
   rm -r $startdir/pkg/var/lib/fritz
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/fcpcmcia.install
 }
-
Index: extra/network/fcpcmcia/fcpcmcia.install
diff -u extra/network/fcpcmcia/fcpcmcia.install:1.12 extra/network/fcpcmcia/fcpcmcia.install:1.13
--- extra/network/fcpcmcia/fcpcmcia.install:1.12	Wed Oct 10 16:55:13 2007
+++ extra/network/fcpcmcia/fcpcmcia.install	Fri Jan 25 12:43:01 2008
@@ -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.23-ARCH
+  KERNEL_VERSION=2.6.24-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
@@ -24,7 +24,7 @@
   sed -i -e 's/fcpcmcia	-	-	-	-	-	-/#fcpcmcia	-	-	-	-	-	-/g' /etc/capi.conf
     # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.23-ARCH
+  KERNEL_VERSION=2.6.24-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
Index: extra/network/fcpcmcia/kernel-2.6.24.patch
diff -u /dev/null extra/network/fcpcmcia/kernel-2.6.24.patch:1.1
--- /dev/null	Fri Jan 25 12:43:01 2008
+++ extra/network/fcpcmcia/kernel-2.6.24.patch	Fri Jan 25 12:43:01 2008
@@ -0,0 +1,14 @@
+--- driver.c~	2007-10-30 13:13:47.000000000 +0100
++++ driver.c	2007-10-30 13:16:52.000000000 +0100
+@@ -374,9 +374,9 @@
+ 			card->irq, 
+ 			&irq_handler, 
+ #if defined (__fcpci__) || defined (__fcpcmcia__)
+-			SA_INTERRUPT | SA_SHIRQ, 
++			IRQF_DISABLED | IRQF_SHARED, 
+ #else
+-			SA_INTERRUPT, 
++			IRQF_DISABLED, 
+ #endif
+ 			TARGET, 
+ 			card


