virtualbox-libre-4.1.18-2: updating revision due kernel changed modules folder from /lib to /usr/lib

2 files changed, 19 insertions, 9 deletions

diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index e4326a2e1..942aa5d1c 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id$
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 # Changes:
 # * Adapt to linux-libre
@@ -12,7 +12,7 @@
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
 pkgver=4.1.18
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -26,7 +26,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         vboxweb.conf vboxweb.rc)
 
 _extramodules=extramodules-3.4-LIBRE
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
+_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}"
@@ -198,7 +198,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '5f85710e0b8606de967716ded7b2d351'
          '755ab0dd9bcacf2c00d2275b1ca69547'
          'a1ff1d1b4423556887e48a32978226a6'
-         '3c96faa76894c182c1bb56bb30d9a17e'
+         '248078ab922f27424ba9919d4aa90dcc'
          '97e193f050574dd272a38e5ee5ebe62b'
          '3c08ad30b89add47d3f45121200a5360'
          '208cf5f842eb2e3a5b6dcfc59080d26c'
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild
index 4bc8e0c9d..350d0c6ad 100644
--- a/libre/virtualbox-libre/vboxbuild
+++ b/libre/virtualbox-libre/vboxbuild
@@ -1,13 +1,23 @@
 #!/bin/bash
 
-. /etc/rc.conf
-. /etc/rc.d/functions
 . /etc/vbox/vbox.cfg
 
 MODLIST=()
 LOG="/var/log/vbox-install.log"
 >| "$LOG"
 
+stat_busy() {
+  printf '==> %s ... ' "$1"
+}
+
+stat_done() {
+  echo 'done'
+}
+
+stat_fail() {
+  echo 'failed'
+}
+
 if [[ $INSTALL_DIR ]]; then
   VBOXMANAGE=$INSTALL_DIR/VBoxManage
   BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp
@@ -29,7 +39,7 @@ if (( ${#MODLIST[*]} )); then
   modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
 fi
 
-for kdir in /lib/modules/[2-3]*; do
+for kdir in /usr/lib/modules/[2-3]*; do
   if [[ ! -d $kdir/kernel ]]; then
     # found a stale kernel
     mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*)
@@ -51,8 +61,8 @@ if (( ! $# )); then
 fi
 
 for kernver; do
-  export KERN_DIR=/lib/modules/$kernver/build
-  export MODULE_DIR=/lib/modules/$kernver/extramodules
+  export KERN_DIR=/usr/lib/modules/$kernver/build
+  export MODULE_DIR=/usr/lib/modules/$kernver/extramodules
   if [[ ! -d $KERN_DIR ]]; then
     printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
         "$KERN_DIR"