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

[Dave Reisner]

    Date: Tuesday, July 3, 2012 @ 20:45:49
  Author: dreisner
Revision: 162929

upgpkg: fcpci 31107-76

- rebuild for kernel move to /usr

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

---------------+
 PKGBUILD      |   14 +++++++-------
 fcpci.install |    4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-04 00:43:40 UTC (rev 162928)
+++ PKGBUILD	2012-07-04 00:45:49 UTC (rev 162929)
@@ -3,7 +3,7 @@
 
 pkgname=fcpci
 pkgver=31107
-pkgrel=75
+pkgrel=76
 _extramodules=extramodules-3.4-ARCH
 pkgdesc="AVM ISDN driver for FRITZ PCI isdn cards. For stock arch linux kernel"
 arch=(i686 x86_64)
@@ -44,7 +44,7 @@
 options=(!strip)
 
 build() {
-  _kernver="$(cat /lib/modules/${_extramodules}/version)"
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
   cd $srcdir/fritz/src
   [ "$CARCH" = "i686" ] && (patch -Np0 -i ../../atomic.patch)
   [ "$CARCH" = "i686" ] && (patch -Np0 -i ../../kernel-2.6.39-i686.patch)
@@ -77,15 +77,15 @@
     $i.old $i
   done
 
-  make LIBDIR=$pkgdir/var/lib/fritz KDIR=/lib/modules/${_kernver}/build all
+  make LIBDIR=$pkgdir/var/lib/fritz KDIR=/usr/lib/modules/${_kernver}/build all
 }
 
 package() {
-  mkdir -p $pkgdir/lib/modules/${_extramodules}
-  cp $srcdir/fritz/src/fcpci.ko $pkgdir/lib/modules/${_extramodules}/ 
-  rm -r $pkgdir/var/lib/fritz  
+  mkdir -p $pkgdir/usr/lib/modules/${_extramodules}
+  cp $srcdir/fritz/src/fcpci.ko $pkgdir/usr/lib/modules/${_extramodules}/
+  rm -r $pkgdir/var
   # build module dependencies
   sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" $startdir/fcpci.install
   # gzip -9 modules
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
+  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
 }

Modified: fcpci.install
===================================================================
--- fcpci.install	2012-07-04 00:43:40 UTC (rev 162928)
+++ fcpci.install	2012-07-04 00:45:49 UTC (rev 162929)
@@ -6,7 +6,7 @@
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   EXTRAMODULES=extramodules-3.4-ARCH
-  depmod -v $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
+  depmod -v $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
 }
 
 # arg 1:  the new package version
@@ -20,6 +20,6 @@
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   EXTRAMODULES=extramodules-3.4-ARCH
-  depmod -v $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
+  depmod -v $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
 }