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

[Tobias Powalowski]

    Date: Tuesday, October 25, 2011 @ 09:30:45
  Author: tpowa
Revision: 141177

upgpkg: fcpcmcia 31107-60

rebuild against 3.1 series

Modified:
  fcpcmcia/trunk/PKGBUILD
  fcpcmcia/trunk/fcpcmcia.install

------------------+
 PKGBUILD         |   17 +++++++++--------
 fcpcmcia.install |    4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-25 13:26:16 UTC (rev 141176)
+++ PKGBUILD	2011-10-25 13:30:45 UTC (rev 141177)
@@ -3,14 +3,15 @@
 
 pkgname=fcpcmcia
 pkgver=31107
-pkgrel=59
-_kernver=3.0-ARCH
+pkgrel=60
+_extramodules=extramodules-3.1-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
 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' 'linux>=3.0' 'linux<3.1')
-makedepends=('linux-headers>=3.0' 'linux-headers<3.1')
+depends=('capi4k-utils' 'linux>=3.1' 'linux<3.2')
+makedepends=('linux-headers>=3.1' 'linux-headers<3.2')
 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 
@@ -81,7 +82,7 @@
          'b947c47b3f6dd2f143f84312a034bb77')
 
 fi
-install=(fcpcmcia.install)
+install=fcpcmcia.install
 options=(!makeflags !strip)
 
 build() {
@@ -126,9 +127,9 @@
 }
 
 package() {
-  mkdir -p $pkgdir/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
-  cp $srcdir/fritz/src/fcpcmcia.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
-  cp $srcdir/fritz/src/fcpcmcia_cs.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
+  mkdir -p $pkgdir/lib/modules/${_extramodules}
+  cp $srcdir/fritz/src/fcpcmcia.ko $pkgdir/lib/modules/${_extramodules}/
+  cp $srcdir/fritz/src/fcpcmcia_cs.ko $pkgdir/lib/modules/${_extramodules}/
   rm -r $pkgdir/var/lib/fritz
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/fcpcmcia.install
   # gzip -9 modules

Modified: fcpcmcia.install
===================================================================
--- fcpcmcia.install	2011-10-25 13:26:16 UTC (rev 141176)
+++ fcpcmcia.install	2011-10-25 13:30:45 UTC (rev 141177)
@@ -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=3.0-ARCH
+  KERNEL_VERSION=3.1.0-1-ARCH
   depmod -v $KERNEL_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 ..."
-  KERNEL_VERSION=3.0-ARCH
+  KERNEL_VERSION=3.1.0-1-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }