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

[Dave Reisner]

    Date: Tuesday, July 3, 2012 @ 20:47:39
  Author: dreisner
Revision: 162931

upgpkg: fcpcmcia 31107-71

- rebuild for kernel move to /usr

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2012-07-04 00:46:28 UTC (rev 162930)
+++ PKGBUILD    2012-07-04 00:47:39 UTC (rev 162931)
@@ -3,7 +3,7 @@
 
 pkgname=fcpcmcia
 pkgver=31107
-pkgrel=70
+pkgrel=71
 _extramodules=extramodules-3.4-ARCH
 pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For stock arch linux 
kernel"
 arch=(i686 x86_64)
@@ -93,7 +93,7 @@
 options=(!makeflags !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)
@@ -133,15 +133,15 @@
     $i.old $i
   done
   cd $srcdir/fritz
-  make KDIR=/lib/modules/${_kernver}/build LIBDIR=$pkgdir/var/lib/fritz all
+  make KDIR=/usr/lib/modules/${_kernver}/build LIBDIR=$pkgdir/var/lib/fritz all
 }
 
 package() {
-  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
+  mkdir -p $pkgdir/usr/lib/modules/${_extramodules}
+  cp $srcdir/fritz/src/fcpcmcia.ko $pkgdir/usr/lib/modules/${_extramodules}/
+  cp $srcdir/fritz/src/fcpcmcia_cs.ko $pkgdir/usr/lib/modules/${_extramodules}/
+  rm -r $pkgdir/var
   sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" 
$startdir/fcpcmcia.install
   # gzip -9 modules
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
+  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
 }

Modified: fcpcmcia.install
===================================================================
--- fcpcmcia.install    2012-07-04 00:46:28 UTC (rev 162930)
+++ fcpcmcia.install    2012-07-04 00:47:39 UTC (rev 162931)
@@ -8,7 +8,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
@@ -22,5 +22,5 @@
   # 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
 }