diff options
Diffstat (limited to 'system/virtualbox-ose-addons/rc.vboxadd.diff')
| -rw-r--r-- | system/virtualbox-ose-addons/rc.vboxadd.diff | 70 |
1 files changed, 38 insertions, 32 deletions
diff --git a/system/virtualbox-ose-addons/rc.vboxadd.diff b/system/virtualbox-ose-addons/rc.vboxadd.diff index 189123c454..0357890d70 100644 --- a/system/virtualbox-ose-addons/rc.vboxadd.diff +++ b/system/virtualbox-ose-addons/rc.vboxadd.diff @@ -1,10 +1,13 @@ ---- tmp/vboxadd.sh 2010-06-25 16:24:10.000000000 +0200 -+++ mnt/progs/slack/test/VirtualBox-3.2.6_OSE/src/VBox/Additions/linux/installer/vboxadd.sh 2010-07-07 15:59:28.710046357 +0200 -@@ -307,152 +307,13 @@ +--- vboxadd.sh 2010-10-08 22:09:05.000000000 +0200 ++++ vboxadd.sh 2010-10-30 16:14:18.420000058 +0200 +@@ -308,158 +308,13 @@ # setup_script setup() { - # don't stop the old modules here -- they might be in use +- begin "Uninstalling old VirtualBox DKMS kernel modules" +- $DODKMS uninstall > $LOG +- succ_msg - if find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|grep -q vboxvideo; then - begin "Removing old VirtualBox vboxvideo kernel module" - find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|xargs rm -f 2>/dev/null @@ -21,8 +24,9 @@ - succ_msg - fi - begin "Building the VirtualBox Guest Additions kernel modules" +- - if ! sh /usr/share/$PACKAGE/test/build_in_tmp \ -- --no-dkms --no-print-directory > $LOG 2>&1; then +- --no-print-directory >> $LOG 2>&1; then - fail_msg - printf "Your system does not seem to be set up to build kernel modules.\nLook at $LOG to find out what went wrong. Once you have corrected it, you can\nrun\n\n /etc/init.d/vboxadd setup\n\nto build them." - BUILDVBOXGUEST="" @@ -30,40 +34,42 @@ - BUILDVBOXVIDEO="" - else - if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \ -- --no-dkms --no-print-directory >> $LOG 2>&1; then +- --no-print-directory >> $LOG 2>&1; then - printf "\nYour guest system does not seem to have sufficient OpenGL support to enable\naccelerated 3D effects (this requires Linux 2.6.27 or later in the guest\nsystem). This Guest Additions feature will be disabled.\n\n" - BUILDVBOXVIDEO="" - fi - fi - echo -- if [ -n "$BUILDVBOXGUEST" ]; then -- begin "Building the main Guest Additions module" -- if ! $BUILDVBOXGUEST \ -- --save-module-symvers /tmp/vboxguest-Module.symvers \ -- --no-print-directory install >> $LOG 2>&1; then -- fail "Look at $LOG to find out what went wrong" +- if ! $DODKMS install >> $LOG 2>&1; then +- if [ -n "$BUILDVBOXGUEST" ]; then +- begin "Building the main Guest Additions module" +- if ! $BUILDVBOXGUEST \ +- --save-module-symvers /tmp/vboxguest-Module.symvers \ +- --no-print-directory install >> $LOG 2>&1; then +- fail "Look at $LOG to find out what went wrong" +- fi +- succ_msg - fi -- succ_msg -- fi -- if [ -n "$BUILDVBOXSF" ]; then -- begin "Building the shared folder support module" -- if ! $BUILDVBOXSF \ -- --use-module-symvers /tmp/vboxguest-Module.symvers \ -- --no-print-directory install >> $LOG 2>&1; then -- fail "Look at $LOG to find out what went wrong" +- if [ -n "$BUILDVBOXSF" ]; then +- begin "Building the shared folder support module" +- if ! $BUILDVBOXSF \ +- --use-module-symvers /tmp/vboxguest-Module.symvers \ +- --no-print-directory install >> $LOG 2>&1; then +- fail "Look at $LOG to find out what went wrong" +- fi +- succ_msg - fi -- succ_msg -- fi -- if [ -n "$BUILDVBOXVIDEO" ]; then -- begin "Building the OpenGL support module" -- if ! $BUILDVBOXVIDEO \ -- --use-module-symvers /tmp/vboxguest-Module.symvers \ -- --no-print-directory install >> $LOG 2>&1; then -- fail "Look at $LOG to find out what went wrong" +- if [ -n "$BUILDVBOXVIDEO" ]; then +- begin "Building the OpenGL support module" +- if ! $BUILDVBOXVIDEO \ +- --use-module-symvers /tmp/vboxguest-Module.symvers \ +- --no-print-directory install >> $LOG 2>&1; then +- fail "Look at $LOG to find out what went wrong" +- fi +- succ_msg - fi -- succ_msg +- depmod - fi -- depmod - - begin "Doing non-kernel setup of the Guest Additions" - echo "Creating user for the Guest Additions." >> $LOG @@ -113,9 +119,9 @@ - start - fi - fi -+ echo "Not implemented! Please use the virtualbox-kernel-addons.SlackBuild available at SlackBuilds.org instead." ++ echo "Not implemented! Please use the virtualbox-{ose,kernel}-addons.SlackBuild available at SlackBuilds.org instead." } - + # cleanup_script cleanup() { @@ -153,5 +159,5 @@ - rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null + echo "Not implemented! Please use removepkg or pkgtool to remove virtualbox-{ose,kernel}-addons instead." } - + dmnstatus() |