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

[Tobias Powalowski]

    Date: Friday, January 7, 2011 @ 15:01:45
  Author: tpowa
Revision: 105324

upgpkg: fcpci 31107-57
bump to .37 series

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

---------------+
 PKGBUILD      |   35 +++++++++++++++++++----------------
 fcpci.install |    4 ++--
 2 files changed, 21 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-07 18:29:10 UTC (rev 105323)
+++ PKGBUILD	2011-01-07 20:01:45 UTC (rev 105324)
@@ -3,14 +3,14 @@
 
 pkgname=fcpci
 pkgver=31107
-pkgrel=56
-_kernver=2.6.36-ARCH
+pkgrel=57
+_kernver=2.6.37-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.36' 'kernel26<2.6.37')
-makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37')
+depends=('capi4k-utils' 'kernel26>=2.6.37' 'kernel26<2.6.38')
+makedepends=('kernel26-headers>=2.6.37' 'kernel26-headers<2.6.38')
 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 
@@ -48,14 +48,14 @@
 install=fcpci.install
 
 build() {
-  cd $startdir/src/fritz/src
-  [ "$CARCH" = "i686" ] && (patch -Np0 -i ../../atomic.patch || return 1)
-  patch -Np0 -i ../../kernel-2.6.19.patch || return 1
-  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
-  patch -Np0 -i ../../kernel-2.6.34.patch || return 1
+  cd $srcdir/fritz/src
+  [ "$CARCH" = "i686" ] && (patch -Np0 -i ../../atomic.patch)
+  patch -Np0 -i ../../kernel-2.6.19.patch
+  patch -Np0 -i ../../kernel-2.6.20.patch
+  patch -Np0 -i ../../kernel-2.6.22.patch
+  patch -Np0 -i ../../kernel-2.6.24.patch
+  patch -Np0 -i ../../kernel-2.6.31.patch
+  patch -Np0 -i ../../kernel-2.6.34.patch
   cd ..
   # fix from Karsten Keil <kkeil at suse.de>
   # in refernece to bug: http://bugs.archlinux.org/task/8511
@@ -75,10 +75,13 @@
     $i.old $i
   done
 
-  make LIBDIR=$startdir/pkg/var/lib/fritz KDIR=/lib/modules/${_kernver}/build all || return 1
-  mkdir -p $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
-  cp $startdir/src/fritz/src/fcpci.ko $startdir/pkg/lib/modules/${_kernver}/kernel/drivers/isdn/hardware/avm/
-  rm -r $startdir/pkg/var/lib/fritz  
+  make LIBDIR=$pkgdir/var/lib/fritz KDIR=/lib/modules/${_kernver}/build all
+}
+
+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/
+  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-01-07 18:29:10 UTC (rev 105323)
+++ fcpci.install	2011-01-07 20:01:45 UTC (rev 105324)
@@ -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.36-ARCH
+  KERNEL_VERSION=2.6.37-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
@@ -22,6 +22,6 @@
   sed -i -e 's/fcpci		-	-	-	-	-	-/#fcpci		-	-	-	-	-	-/g' /etc/capi.conf
     # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.36-ARCH
+  KERNEL_VERSION=2.6.37-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }