summaryrefslogtreecommitdiffstats
path: root/system/virtualbox/vboxdrv.sh-setup.diff
diff options
context:
space:
mode:
author Heinz Wiesinger2011-10-31 03:36:44 +0100
committer Niels Horn2011-11-05 00:59:29 +0100
commit029b68989a5ce7d402177631e5375a274fb06fc9 (patch)
treee97b01744c9f193e7d99906b0a1854dd2df3b1ed /system/virtualbox/vboxdrv.sh-setup.diff
parentf285e922d881e386d894e4945b5987e8738f0930 (diff)
downloadslackbuilds-029b68989a5ce7d402177631e5375a274fb06fc9.tar.gz
system/virtualbox: Updated for version 4.1.4.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system/virtualbox/vboxdrv.sh-setup.diff')
-rw-r--r--system/virtualbox/vboxdrv.sh-setup.diff20
1 files changed, 16 insertions, 4 deletions
diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff
index 1ebcb32b4c..de679fe801 100644
--- a/system/virtualbox/vboxdrv.sh-setup.diff
+++ b/system/virtualbox/vboxdrv.sh-setup.diff
@@ -1,6 +1,6 @@
---- vboxdrv.sh.in.orig 2011-05-16 18:33:43.000000000 +0200
-+++ vboxdrv.sh.in 2011-06-12 10:10:38.074000027 +0200
-@@ -42,16 +42,8 @@
+--- vboxdrv.sh.in.orig 2011-08-15 14:28:34.000000000 +0200
++++ vboxdrv.sh.in 2011-09-13 15:22:47.192000014 +0200
+@@ -42,18 +42,8 @@
if [ -n "$INSTALL_DIR" ]; then
VBOXMANAGE="$INSTALL_DIR/VBoxManage"
@@ -8,16 +8,18 @@
- BUILDVBOXDRV="$INSTALL_DIR/src/vboxhost/vboxdrv/build_in_tmp"
- BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxhost/vboxnetflt/build_in_tmp"
- BUILDVBOXNETADP="$INSTALL_DIR/src/vboxhost/vboxnetadp/build_in_tmp"
+- BUILDVBOXPCI="$INSTALL_DIR/src/vboxhost/vboxpci/build_in_tmp"
else
VBOXMANAGE="/usr/lib/%PACKAGE%/VBoxManage"
- DODKMS="/usr/share/%PACKAGE%/src/vboxhost/do_dkms"
- BUILDVBOXDRV="/usr/share/%PACKAGE%/src/vboxhost/vboxdrv/build_in_tmp"
- BUILDVBOXNETFLT="/usr/share/%PACKAGE%/src/vboxhost/vboxnetflt/build_in_tmp"
- BUILDVBOXNETADP="/usr/share/%PACKAGE%/src/vboxhost/vboxnetadp/build_in_tmp"
+- BUILDVBOXPCI="/usr/share/%PACKAGE%/src/vboxhost/vboxpci/build_in_tmp"
fi
# silently exit if the package was uninstalled but not purged,
-@@ -288,48 +280,7 @@
+@@ -299,58 +289,7 @@
# setup_script
setup()
{
@@ -25,6 +27,11 @@
- begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
- $DODKMS uninstall > $LOG
- succ_msg
+- if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then
+- begin_msg "Removing old VirtualBox pci kernel module"
+- find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null
+- succ_msg
+- fi
- if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
- begin_msg "Removing old VirtualBox netadp kernel module"
- find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
@@ -59,6 +66,11 @@
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
+- if ! $BUILDVBOXPCI \
+- --use-module-symvers /tmp/vboxdrv-Module.symvers \
+- --no-print-directory install >> $LOG 2>&1; then
+- failure "Look at $LOG to find out what went wrong"
+- fi
- fi
- rm -f /etc/vbox/module_not_compiled
- succ_msg