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

[Tom Killian]

    Date: Tuesday, July 24, 2007 @ 05:22:15
  Author: tom
    Path: /home/cvs-extra/extra/network/fcpci-ck

   Added: kernel-2.6.22.patch (1.1)
Modified: PKGBUILD (1.5 -> 1.6) fcpci.install (1.2 -> 1.3)

upgpkg: fcpci-ck 31107-6
update for 2.6.22-ck


---------------------+
 PKGBUILD            |   17 +++++++++++------
 fcpci.install       |    4 ++--
 kernel-2.6.22.patch |   11 +++++++++++
 3 files changed, 24 insertions(+), 8 deletions(-)


Index: extra/network/fcpci-ck/PKGBUILD
diff -u extra/network/fcpci-ck/PKGBUILD:1.5 extra/network/fcpci-ck/PKGBUILD:1.6
--- extra/network/fcpci-ck/PKGBUILD:1.5	Sun May 27 09:31:01 2007
+++ extra/network/fcpci-ck/PKGBUILD	Tue Jul 24 05:22:15 2007
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD,v 1.5 2007/05/27 13:31:01 tom Exp $
+# $Id: PKGBUILD,v 1.6 2007/07/24 09:22:15 tom Exp $
 #Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=fcpci-ck
 pkgver=31107
-pkgrel=5
-_kernver=2.6.21-ck
+pkgrel=6
+_kernver=2.6.22-ck
 pkgdesc="AVM ISDN driver for FRITZ PCI isdn cards. For kernel26ck."
 arch=(i686 x86_64)
+license=('custom:"AVM"' 'LGPL')
 url="http://www.avm.de"
 depends=('capi4k-utils' 'kernel26ck')
 source=(ftp://ftp.avm.de/cardware/fritzcrd.pci/linux/suse.93/fcpci-suse93-3.11-07.tar.gz \
-	kernel-2.6.19.patch atomic.patch kernel-2.6.20.patch)
+	kernel-2.6.19.patch atomic.patch kernel-2.6.20.patch kernel-2.6.22.patch)
 install=fcpci.install
 build() {
   cd $startdir/src/fritz/src
   patch -Np0 -i ../../atomic.patch || return 1
   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 $startdir/src/fritz
   make LIBDIR=$startdir/pkg/var/lib/fritz KDIR=/lib/modules/${_kernver}/build all || return 1
   mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
@@ -25,5 +27,8 @@
   # build module dependencies
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/fcpci.install
 }
-md5sums=('3ee301b5d0e8df9e4b915af58b725556' '5c63dc9df0810bb1ba85f3425abaa0ed'\
-         '258b13bb2ac46960b9c91635f02cd080' '890ec6e1219a3a4bae77f5815c3ed40d')
+md5sums=('3ee301b5d0e8df9e4b915af58b725556'
+         '5c63dc9df0810bb1ba85f3425abaa0ed'
+         '258b13bb2ac46960b9c91635f02cd080'
+         '890ec6e1219a3a4bae77f5815c3ed40d'
+         '4f4f03630ed994b16b4cd167f090a116')
Index: extra/network/fcpci-ck/fcpci.install
diff -u extra/network/fcpci-ck/fcpci.install:1.2 extra/network/fcpci-ck/fcpci.install:1.3
--- extra/network/fcpci-ck/fcpci.install:1.2	Sat Feb 17 08:58:16 2007
+++ extra/network/fcpci-ck/fcpci.install	Tue Jul 24 05:22:15 2007
@@ -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.20-ck
+  KERNEL_VERSION=2.6.22-ck
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
@@ -22,7 +22,7 @@
   sed -i -e 's/fcpci		-	-	-	-	-	-/#fcpci		-	-	-	-	-	-/g' /etc/capi.conf
     # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.20-ck
+  KERNEL_VERSION=2.6.22-ck
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
Index: extra/network/fcpci-ck/kernel-2.6.22.patch
diff -u /dev/null extra/network/fcpci-ck/kernel-2.6.22.patch:1.1
--- /dev/null	Tue Jul 24 05:22:14 2007
+++ extra/network/fcpci-ck/kernel-2.6.22.patch	Tue Jul 24 05:22:15 2007
@@ -0,0 +1,11 @@
+--- main.c~	2005-07-07 00:00:00.000000000 +0200
++++ main.c	2007-06-09 18:41:07.000000000 +0200
+@@ -364,7 +364,7 @@
+ #endif
+ 
+ #if defined (__fcpci__)	
+-	if (0 == (err = pci_module_init (&fcpci_driver))) {
++	if (0 == (err = pci_register_driver (&fcpci_driver))) {
+ 		LOG("PCI driver registered.\n");
+ 		register_capi_driver (&fritz_capi_driver);
+ 		LOG("CAPI driver registered.\n");