1 files changed, 11 insertions, 14 deletions
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 329ee26c4..b78d365db 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,8 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.6
-pkgrel=6
+_extramodules=extramodules-3.8-LIBRE
+pkgrel=7
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -18,7 +19,7 @@ makedepends=('linux-libre-headers'
              'bc')
 
 build() {
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
@@ -32,42 +33,38 @@ build() {
 }
 
 package_virtualbox-libre-host-modules(){
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  _extraver=extramodules-${_kernver%.*}-LIBRE
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
-#  depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
   depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   install=virtualbox-libre-host-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-host-modules.install"
 }
 
 package_virtualbox-libre-guest-modules(){
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  _extraver=extramodules-${_kernver%.*}-LIBRE
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
   pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
   license=('GPL')
-#  depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
   depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-guest-modules=${pkgver}")
   replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   install=virtualbox-libre-guest-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-libre-guest-modules.install"
 }
 
 # vim:set ts=2 sw=2 et: