[arch-commits] Commit in fcpci/trunk (PKGBUILD fcpci.install kernel-2.6.31.patch)

Tobias Powalowski tpowa at archlinux.org
Thu Sep 10 14:25:27 UTC 2009


    Date: Thursday, September 10, 2009 @ 10:25:26
  Author: tpowa
Revision: 51672

upgpkg: fcpci 31107-49
    bump to new major kernel release

Added:
  fcpci/trunk/kernel-2.6.31.patch
Modified:
  fcpci/trunk/PKGBUILD
  fcpci/trunk/fcpci.install

---------------------+
 PKGBUILD            |   26 +++++++++++++++++++-------
 fcpci.install       |    4 ++--
 kernel-2.6.31.patch |   11 +++++++++++
 3 files changed, 32 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-10 14:11:11 UTC (rev 51671)
+++ PKGBUILD	2009-09-10 14:25:26 UTC (rev 51672)
@@ -3,32 +3,36 @@
 
 pkgname=fcpci
 pkgver=31107
-pkgrel=48
-_kernver=2.6.30-ARCH
+pkgrel=49
+_kernver=2.6.31-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.30' 'kernel26<2.6.31')
+depends=('capi4k-utils' 'kernel26>=2.6.31' 'kernel26<2.6.32')
 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 atomic.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch)
+	kernel-2.6.19.patch atomic.patch kernel-2.6.20.patch kernel-2.6.22.patch \
+        kernel-2.6.24.patch kernel-2.6.31.patch)
   md5sums=('3ee301b5d0e8df9e4b915af58b725556'
          '5c63dc9df0810bb1ba85f3425abaa0ed'
          '258b13bb2ac46960b9c91635f02cd080'
          '890ec6e1219a3a4bae77f5815c3ed40d'
          '4f4f03630ed994b16b4cd167f090a116'
- 	 '21bfa466b1fb94663ed1f265948dba5e')
+         '21bfa466b1fb94663ed1f265948dba5e'
+         '34f5b78b219de8ce12793b16e0171e87')
 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 \
-	kernel-2.6.19.patch atomic.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch)
+	kernel-2.6.19.patch atomic.patch kernel-2.6.20.patch kernel-2.6.22.patch \
+        kernel-2.6.24.patch kernel-2.6.31.patch)
   md5sums=('c5595478515d19436ab20b42e1549de0'
          '5c63dc9df0810bb1ba85f3425abaa0ed'
          '258b13bb2ac46960b9c91635f02cd080'
          '890ec6e1219a3a4bae77f5815c3ed40d'
          '4f4f03630ed994b16b4cd167f090a116'
- 	 '21bfa466b1fb94663ed1f265948dba5e')
+         '21bfa466b1fb94663ed1f265948dba5e'
+         '34f5b78b219de8ce12793b16e0171e87')
 fi
 install=fcpci.install
 
@@ -39,6 +43,7 @@
   patch -Np0 -i ../../kernel-2.6.20.patch || return 1
   patch -Np0 -i ../../kernel-2.6.22.patch || return 1
   patch -Np0 -i ../../kernel-2.6.24.patch || return 1
+  patch -Np0 -i ../../kernel-2.6.31.patch || return 1
   cd ..
   # fix from Karsten Keil <kkeil at suse.de>
   # in refernece to bug: http://bugs.archlinux.org/task/8511
@@ -65,3 +70,10 @@
   # build module dependencies
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/fcpci.install
 }
+md5sums=('c5595478515d19436ab20b42e1549de0'
+         '5c63dc9df0810bb1ba85f3425abaa0ed'
+         '258b13bb2ac46960b9c91635f02cd080'
+         '890ec6e1219a3a4bae77f5815c3ed40d'
+         '4f4f03630ed994b16b4cd167f090a116'
+         '21bfa466b1fb94663ed1f265948dba5e'
+         '34f5b78b219de8ce12793b16e0171e87')

Modified: fcpci.install
===================================================================
--- fcpci.install	2009-09-10 14:11:11 UTC (rev 51671)
+++ fcpci.install	2009-09-10 14:25:26 UTC (rev 51672)
@@ -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.30-ARCH
+  KERNEL_VERSION=2.6.31-ARCH
   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.30-ARCH
+  KERNEL_VERSION=2.6.31-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 

Added: kernel-2.6.31.patch
===================================================================
--- kernel-2.6.31.patch	                        (rev 0)
+++ kernel-2.6.31.patch	2009-09-10 14:25:26 UTC (rev 51672)
@@ -0,0 +1,11 @@
+--- driver.c~	2009-09-10 16:21:39.000000000 +0200
++++ driver.c	2009-09-10 16:21:39.000000000 +0200
+@@ -569,7 +569,7 @@
+ 		}
+ 	}
+ 	stop (card);
+-	capi_ctr_reseted (ctrl);
++	capi_ctr_down (ctrl);
+ #if defined (__fcpnp__)
+ 	pnp_disable_dev (card->dev);
+ #endif




More information about the arch-commits mailing list