summaryrefslogtreecommitdiff
path: root/system/virtualbox/vboxdrv.sh-setup.diff
diff options
context:
space:
mode:
authorHeinz Wiesinger <pprkut@slackbuilds.org>2012-09-18 23:07:20 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-09-18 19:34:05 -0500
commitb210a8c79f12ae7f8c7d0971667f107c221bbd12 (patch)
tree67d848d513199c48c41c3d948c245adb9d5f275b /system/virtualbox/vboxdrv.sh-setup.diff
parenta50651e433985011774b366229a773954f62d9bd (diff)
downloadslackbuilds-b210a8c79f12ae7f8c7d0971667f107c221bbd12.tar.gz
system/virtualbox: Updated for version 4.2.0.
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Diffstat (limited to 'system/virtualbox/vboxdrv.sh-setup.diff')
-rw-r--r--system/virtualbox/vboxdrv.sh-setup.diff44
1 files changed, 24 insertions, 20 deletions
diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff
index de679fe801..58f1963e0d 100644
--- a/system/virtualbox/vboxdrv.sh-setup.diff
+++ b/system/virtualbox/vboxdrv.sh-setup.diff
@@ -1,31 +1,31 @@
---- 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 @@
+--- vboxdrv.sh.in.orig 2012-03-13 15:51:56.000000000 +0100
++++ vboxdrv.sh.in 2012-09-15 13:15:32.215798169 +0200
+@@ -46,17 +46,13 @@
if [ -n "$INSTALL_DIR" ]; then
VBOXMANAGE="$INSTALL_DIR/VBoxManage"
-- DODKMS="$INSTALL_DIR/src/vboxhost/do_dkms"
-- 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"
+- MODULE_SRC="$INSTALL_DIR/src/vboxhost"
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"
+- MODULE_SRC="/usr/share/%PACKAGE%/src/vboxhost"
fi
+-BUILDINTMP="$MODULE_SRC/build_in_tmp"
+-DODKMS="$MODULE_SRC/do_dkms"
# silently exit if the package was uninstalled but not purged,
-@@ -299,58 +289,7 @@
+ # applies to Debian packages only
+-[ -z "$DEBIAN" -o -x $VBOXMANAGE -a -x $BUILDINTMP ] || exit 0
++[ -z "$DEBIAN" -o -x $VBOXMANAGE ] || exit 0
+
+ if [ -n "$NOLSB" ]; then
+ if [ -f /etc/redhat-release ]; then
+@@ -297,62 +293,7 @@
# setup_script
setup()
{
- stop
- begin_msg "Uninstalling old VirtualBox DKMS kernel modules"
-- $DODKMS uninstall > $LOG
+- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $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"
@@ -48,26 +48,30 @@
- succ_msg
- fi
- begin_msg "Trying to register the VirtualBox kernel modules using DKMS"
-- if ! $DODKMS install >> $LOG; then
+- if ! $DODKMS install vboxhost $VERSION >> $LOG; then
- fail_msg "Failed, trying without DKMS"
- begin_msg "Recompiling VirtualBox kernel modules"
-- if ! $BUILDVBOXDRV \
+- if ! $BUILDINTMP \
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
+- --module-source "$MODULE_SRC/vboxdrv" \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
-- if ! $BUILDVBOXNETFLT \
+- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
+- --module-source "$MODULE_SRC/vboxnetflt" \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
-- if ! $BUILDVBOXNETADP \
+- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
+- --module-source "$MODULE_SRC/vboxnetadp" \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
-- if ! $BUILDVBOXPCI \
+- if ! $BUILDINTMP \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
+- --module-source "$MODULE_SRC/vboxpci" \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi