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

[Tobias Powalowski]

    Date: Monday, May 21, 2012 @ 07:00:09
  Author: tpowa
Revision: 159306

upgpkg: fcpci 31107-74

rebuild for 3.4

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

--------------------+
 PKGBUILD           |   15 +++++++++------
 fcpci.install      |    4 ++--
 kernel-3.4.0.patch |   10 ++++++++++
 3 files changed, 21 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-21 10:57:14 UTC (rev 159305)
+++ PKGBUILD	2012-05-21 11:00:09 UTC (rev 159306)
@@ -3,14 +3,14 @@
 
 pkgname=fcpci
 pkgver=31107
-pkgrel=73
-_extramodules=extramodules-3.3-ARCH
+pkgrel=74
+_extramodules=extramodules-3.4-ARCH
 pkgdesc="AVM ISDN driver for FRITZ PCI isdn cards. For stock arch linux kernel"
 arch=(i686 x86_64)
 license=('custom:"AVM"' 'LGPL')
 url='http://www.avm.de/en/index.php3'
-depends=('linux>=3.3' 'linux<3.4')
-makedepends=('linux>=3.3' 'linux-headers<3.4')
+depends=('linux>=3.4' 'linux<3.5')
+makedepends=('linux>=3.4' 'linux-headers<3.5')
 source=(http://download.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 
@@ -21,7 +21,8 @@
         kernel-2.6.39.patch
         kernel-2.6.39-i686.patch
         kernel-2.6.39-x86_64.patch
-        kernel-3.2.0.patch)
+        kernel-3.2.0.patch
+        kernel-3.4.0.patch)
 md5sums=('3ee301b5d0e8df9e4b915af58b725556'
          '5c63dc9df0810bb1ba85f3425abaa0ed'
          '258b13bb2ac46960b9c91635f02cd080'
@@ -33,7 +34,8 @@
          '3980ae3eaa82d93b81b0ca32bb57a065'
          'e6f6c96df15392bbc92eb75f6611f4a7'
          'b947c47b3f6dd2f143f84312a034bb77'
-         '05a5b3a55f6b47be7503b22e3be82b28')
+         '05a5b3a55f6b47be7503b22e3be82b28'
+         '88cdbf6b0c736a25899c695b00406749')
 if [ "$CARCH" = "x86_64" ]; then
   source[0]="http://download.avm.de/cardware/fritzcrd.pci/linux_64bit/suse.10.0/fcpci-suse10.0-64bit-3.11-07.tar.gz"
   md5sums[0]='c5595478515d19436ab20b42e1549de0'
@@ -55,6 +57,7 @@
   [ "$CARCH" = "x86_64" ] &&  patch -Np0 -i ../../kernel-2.6.39-x86_64.patch
   patch -Np0 -i ../../kernel-2.6.39.patch
   patch -Np0 -i ../../kernel-3.2.0.patch
+  patch -Np0 -i ../../kernel-3.4.0.patch
   cd ..
   # fix from Karsten Keil <kkeil at suse.de>
   # in refernece to bug: http://bugs.archlinux.org/task/8511

Modified: fcpci.install
===================================================================
--- fcpci.install	2012-05-21 10:57:14 UTC (rev 159305)
+++ fcpci.install	2012-05-21 11:00:09 UTC (rev 159306)
@@ -7,7 +7,7 @@
   sed -i -e 's/#fcpci		-	-	-	-	-	-/fcpci		-	-	-	-	-	-/g' /etc/capi.conf
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  EXTRAMODULES=extramodules-3.3-ARCH
+  EXTRAMODULES=extramodules-3.4-ARCH
   depmod -v $(cat /lib/modules/$EXTRAMODULES/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 ..."
-  EXTRAMODULES=extramodules-3.3-ARCH
+  EXTRAMODULES=extramodules-3.4-ARCH
   depmod -v $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
 }
 

Added: kernel-3.4.0.patch
===================================================================
--- kernel-3.4.0.patch	                        (rev 0)
+++ kernel-3.4.0.patch	2012-05-21 11:00:09 UTC (rev 159306)
@@ -0,0 +1,10 @@
+--- driver.c.old	2012-05-21 09:23:33.979381345 +0000
++++ driver.c	2012-05-21 09:23:44.479210439 +0000
+@@ -23,7 +23,6 @@
+ #include <asm/io.h>
+ #include <asm/irq.h>
+ #include <asm/atomic.h>
+-#include <asm/system.h>
+ #include <linux/version.h>
+ #include <linux/ioport.h>
+ #include <linux/sched.h>