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

[Tobias Powalowski]

    Date: Tuesday, October 25, 2011 @ 09:24:36
  Author: tpowa
Revision: 141175

upgpkg: fcpci 31107-63

rebuild against 3.1 series

Modified:
  fcpci/trunk/PKGBUILD
  fcpci/trunk/fcpci.install

---------------+
 PKGBUILD      |   13 +++++++------
 fcpci.install |    7 ++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-25 11:30:46 UTC (rev 141174)
+++ PKGBUILD	2011-10-25 13:24:36 UTC (rev 141175)
@@ -3,14 +3,15 @@
 
 pkgname=fcpci
 pkgver=31107
-pkgrel=62
-_kernver=3.0-ARCH
+pkgrel=63
+_extramodules=extramodules-3.1-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
 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' 'linux>=3.0' 'linux<3.1')
-makedepends=('linux>=3.0' 'linux-headers<3.1')
+depends=('capi4k-utils' 'linux>=3.1' 'linux<3.2')
+makedepends=('linux>=3.1' 'linux-headers<3.2')
 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 
@@ -90,8 +91,8 @@
 }
 
 package() {
-  mkdir -p $pkgdir/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
-  cp $srcdir/fritz/src/fcpci.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
+  mkdir -p $pkgdir/lib/modules/${_extramodules}
+  cp $srcdir/fritz/src/fcpci.ko $pkgdir/lib/modules/${_extramodules}/ 
   rm -r $pkgdir/var/lib/fritz  
   # build module dependencies
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/fcpci.install

Modified: fcpci.install
===================================================================
--- fcpci.install	2011-10-25 11:30:46 UTC (rev 141174)
+++ fcpci.install	2011-10-25 13:24:36 UTC (rev 141175)
@@ -2,12 +2,12 @@
 post_install() {
 cat << EOF
 ==> Add 'capiinit' to rc.conf daemons list. 
-==> If you use hotplug daemon, please blacklist hisax modules in /etc/hotplug/blacklist.
+==> Please blacklist hisax modules in /etc/modprobe.d/
 EOF
   sed -i -e 's/#fcpci		-	-	-	-	-	-/fcpci		-	-	-	-	-	-/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
 }
 
@@ -22,6 +22,7 @@
   sed -i -e 's/fcpci		-	-	-	-	-	-/#fcpci		-	-	-	-	-	-/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
 }
+