[arch-commits] Commit in virtualbox-modules/trunk (PKGBUILD)

[Sébastien Luttringer]

    Date: Friday, April 12, 2013 @ 18:17:34
  Author: seblu
Revision: 88160

upgpkg: virtualbox-modules 4.2.12-1

Modified:
  virtualbox-modules/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-12 15:59:27 UTC (rev 88159)
+++ PKGBUILD	2013-04-12 16:17:34 UTC (rev 88160)
@@ -4,9 +4,8 @@
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.10
-_extramodules=extramodules-3.8-ARCH
-pkgrel=4
+pkgver=4.2.12
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -17,7 +16,7 @@
              'bc')
 
 build() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  _kernver=$(expac -Q '%v' linux-headers)-ARCH
 
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
@@ -31,7 +30,8 @@
 }
 
 package_virtualbox-host-modules(){
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  _extraver=extramodules-${_kernver%.*}-ARCH
 
   pkgdesc='Host kernel modules for VirtualBox'
   depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)")
@@ -39,15 +39,16 @@
   conflicts=('virtualbox-modules')
   install=virtualbox-host-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-host-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install"
 }
 
 package_virtualbox-guest-modules(){
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  _extraver=extramodules-${_kernver%.*}-ARCH
 
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
@@ -56,11 +57,11 @@
   conflicts=('virtualbox-archlinux-modules')
   install=virtualbox-guest-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-guest-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install"
 }
 
 # vim:set ts=2 sw=2 et: