1 files changed, 19 insertions, 17 deletions
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 1ecee7b2c..067a95fdd 100755..100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,19 +6,20 @@
 
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.4
-pkgrel=2
+pkgver=4.2.6
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
 makedepends=('linux-libre-headers'
-             "virtualbox-libre-host-source>=$pkgver"
-             "virtualbox-libre-guest-source>=$pkgver"
-             'expac')
+             "virtualbox-libre-host-dkms>=$pkgver"
+             "virtualbox-libre-guest-dkms>=$pkgver"
+             'expac'
+             'bc')
 
 build() {
-  # current kernel libre version
   _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -31,16 +32,17 @@ build() {
 }
 
 package_virtualbox-libre-host-modules(){
-  pkgdesc='Host kernel libre modules for VirtualBox'
-  depends=('linux-libre>=3.6' 'linux-libre<3.7')
+  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+  _extraver=extramodules-${_kernver%.*}-LIBRE
+
+  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
 
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  _extraver=extramodules-${_kernver%.*}-LIBRE
-
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
@@ -49,17 +51,18 @@ package_virtualbox-libre-host-modules(){
 }
 
 package_virtualbox-libre-guest-modules(){
-  pkgdesc='Guest kernel libre modules for VirtualBox'
+  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+  _extraver=extramodules-${_kernver%.*}-LIBRE
+
+  pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
   license=('GPL')
-  depends=('linux-libre>=3.6' 'linux-libre<3.7')
+#  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
 
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  _extraver=extramodules-${_kernver%.*}-LIBRE
-
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
@@ -67,5 +70,4 @@ package_virtualbox-libre-guest-modules(){
   sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install"
 }
 
-
 # vim:set ts=2 sw=2 et: