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

[Tobias Powalowski]

    Date: Monday, May 21, 2012 @ 08:29:36
  Author: tpowa
Revision: 159310

upgpkg: fcpcmcia 31107-69

rebuild for 3.4

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

--------------------+
 PKGBUILD           |   21 +++++++++++++--------
 fcpcmcia.install   |    4 ++--
 kernel-3.4.0.patch |   20 ++++++++++++++++++++
 3 files changed, 35 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-21 11:10:25 UTC (rev 159309)
+++ PKGBUILD	2012-05-21 12:29:36 UTC (rev 159310)
@@ -3,14 +3,14 @@
 
 pkgname=fcpcmcia
 pkgver=31107
-pkgrel=68
-_extramodules=extramodules-3.3-ARCH
+pkgrel=69
+_extramodules=extramodules-3.4-ARCH
 pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For stock arch linux kernel"
 arch=(i686 x86_64)
 license=('custom:"AVM"' 'LPGL')
 url="http://www.avm.de"
-depends=('linux>=3.3' 'linux<3.4')
-makedepends=('linux-headers>=3.3' 'linux-headers<3.4')
+depends=('linux>=3.4' 'linux<3.5')
+makedepends=('linux-headers>=3.4' 'linux-headers<3.5')
 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 
@@ -27,7 +27,8 @@
         kernel-2.6.37.patch
         kernel-2.6.39.patch
         kernel-2.6.39-i686.patch
-        kernel-3.2.0.patch)
+        kernel-3.2.0.patch
+        kernel-3.4.0.patch)
 md5sums=('96fc3e72afdc2087b4dafe41c069ec18'
          'ec21dee3a5a09203dc55b399c29bc58c'
          '258b13bb2ac46960b9c91635f02cd080'
@@ -45,7 +46,8 @@
          '9093b1f75d3b2564eb6054ee7f708bee'
          '3980ae3eaa82d93b81b0ca32bb57a065'
          'e6f6c96df15392bbc92eb75f6611f4a7'
-         '05a5b3a55f6b47be7503b22e3be82b28')
+         '05a5b3a55f6b47be7503b22e3be82b28'
+         '5c2d4accf6647da301eed3867df08add')
 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 
@@ -64,7 +66,8 @@
         kernel-2.6.37.patch
         kernel-2.6.39.patch
         kernel-2.6.39-x86_64.patch
-        kernel-3.2.0.patch)
+        kernel-3.2.0.patch
+        kernel-3.4.0.patch)
 md5sums=('4f461710cf57ebf50b3c4f2842288752'
          'ec21dee3a5a09203dc55b399c29bc58c'
          '258b13bb2ac46960b9c91635f02cd080'
@@ -82,7 +85,8 @@
          '9093b1f75d3b2564eb6054ee7f708bee'
          '3980ae3eaa82d93b81b0ca32bb57a065'
          'b947c47b3f6dd2f143f84312a034bb77'
-         '05a5b3a55f6b47be7503b22e3be82b28')
+         '05a5b3a55f6b47be7503b22e3be82b28'
+         '5c2d4accf6647da301eed3867df08add')
 
 fi
 install=fcpcmcia.install
@@ -109,6 +113,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: fcpcmcia.install
===================================================================
--- fcpcmcia.install	2012-05-21 11:10:25 UTC (rev 159309)
+++ fcpcmcia.install	2012-05-21 12:29:36 UTC (rev 159310)
@@ -9,7 +9,7 @@
   sed -i -e 's/#fcpcmcia	-	-	-	-	-	-/fcpcmcia	-	-	-	-	-	-/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
 }
 
@@ -24,6 +24,6 @@
   sed -i -e 's/fcpcmcia	-	-	-	-	-	-/#fcpcmcia	-	-	-	-	-	-/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 12:29:36 UTC (rev 159310)
@@ -0,0 +1,20 @@
+--- 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>
+--- fcpcmcia_cs.c.old	2012-05-21 09:38:50.941025365 +0000
++++ fcpcmcia_cs.c	2012-05-21 09:39:00.300870334 +0000
+@@ -24,7 +24,6 @@
+ #include <linux/serial.h>
+ #include <linux/major.h>
+ #include <asm/io.h>
+-#include <asm/system.h>
+ 
+ #include <pcmcia/cistpl.h>
+ #include <pcmcia/ciscode.h>