diff options
| -rw-r--r-- | system/virtualbox/10-virtualbox.rules | 5 | ||||
| -rw-r--r-- | system/virtualbox/LocalConfig.kmk | 3 | ||||
| -rw-r--r-- | system/virtualbox/README.SLACKWARE | 2 | ||||
| -rw-r--r-- | system/virtualbox/vboxdrv.sh-setup.diff | 10 | ||||
| -rw-r--r-- | system/virtualbox/virtualbox.SlackBuild | 10 | ||||
| -rw-r--r-- | system/virtualbox/virtualbox.info | 18 |
6 files changed, 27 insertions, 21 deletions
diff --git a/system/virtualbox/10-virtualbox.rules b/system/virtualbox/10-virtualbox.rules new file mode 100644 index 0000000000..f85b183064 --- /dev/null +++ b/system/virtualbox/10-virtualbox.rules @@ -0,0 +1,5 @@ +KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660" +SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" +SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" +SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/system/virtualbox/LocalConfig.kmk b/system/virtualbox/LocalConfig.kmk index acf37c059e..e8b1bc2251 100644 --- a/system/virtualbox/LocalConfig.kmk +++ b/system/virtualbox/LocalConfig.kmk @@ -18,9 +18,6 @@ VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS) -# Build with VNC server support -VBOX_WITH_VNC = 1 - # Disable showing registration window on startup VBOX_WITH_REGISTRATION = diff --git a/system/virtualbox/README.SLACKWARE b/system/virtualbox/README.SLACKWARE index 9068a0bd37..90dc8b7685 100644 --- a/system/virtualbox/README.SLACKWARE +++ b/system/virtualbox/README.SLACKWARE @@ -19,3 +19,5 @@ You'll then need to add the following lines to /etc/rc.d/rc.local_shutdown: Any user accounts that plan to use virtualbox will need to be members of the "vboxusers" group. +In order to use USB devices in VirtualBox Guests you may have to restart +your host system after installing the virtualbox package. diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff index 56f0e61b35..1ebcb32b4c 100644 --- a/system/virtualbox/vboxdrv.sh-setup.diff +++ b/system/virtualbox/vboxdrv.sh-setup.diff @@ -1,6 +1,6 @@ ---- mnt/progs/slack/test/VirtualBox-3.2.10_OSE/src/VBox/Installer/linux/vboxdrv.sh.in 2010-10-08 22:10:25.000000000 +0200 -+++ tmp/vboxdrv.sh.in 2010-10-14 17:43:18.545000084 +0200 -@@ -43,16 +43,8 @@ +--- 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 @@ if [ -n "$INSTALL_DIR" ]; then VBOXMANAGE="$INSTALL_DIR/VBoxManage" @@ -17,7 +17,7 @@ fi # silently exit if the package was uninstalled but not purged, -@@ -284,48 +276,7 @@ +@@ -288,48 +280,7 @@ # setup_script setup() { @@ -56,7 +56,7 @@ - fi - if ! $BUILDVBOXNETADP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --no-print-directory install >> $LOG 2>&1; then +- --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi - fi diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild index 1d09bbdcc8..25e5cf8155 100644 --- a/system/virtualbox/virtualbox.SlackBuild +++ b/system/virtualbox/virtualbox.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=virtualbox SRCNAM=VirtualBox -VERSION=4.0.4 +VERSION=4.0.8 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -102,9 +102,6 @@ chmod -R u+w,go+r-w,a-s . GROUP="vboxusers" MODE="755" -mkdir -p $PKG/lib/udev/rules.d -echo 'KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"' \ - > $PKG/lib/udev/rules.d/60-vboxdrv.rules # We don't want a init-script building kernel modules. # Use virtualbox-kernel.SlackBuild for this. @@ -130,6 +127,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-kmods \ --disable-pulse \ --enable-vde \ + --enable-vnc \ $web_service \ $harden \ $qtgui @@ -249,6 +247,10 @@ export VBOX_SDK_PATH=/usr/share/virtualbox/sdk/ EOF chmod 0755 $PKG/etc/profile.d/* +# setup udev rules for vboxdrv and USB device support +mkdir -p $PKG/lib/udev/rules.d +install -m 644 $CWD/10-virtualbox.rules $PKG/lib/udev/rules.d/ + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -f COPYING COPYING.CDDL $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info index a3124045f1..01066b0a57 100644 --- a/system/virtualbox/virtualbox.info +++ b/system/virtualbox/virtualbox.info @@ -1,14 +1,14 @@ PRGNAM="virtualbox" -VERSION="4.0.4" +VERSION="4.0.8" HOMEPAGE="http://www.virtualbox.org" -DOWNLOAD="http://download.virtualbox.org/virtualbox/4.0.4/VirtualBox-4.0.4.tar.bz2 \ - http://download.virtualbox.org/virtualbox/4.0.4/VBoxGuestAdditions_4.0.4.iso \ - http://download.virtualbox.org/virtualbox/4.0.4/UserManual.pdf \ - http://download.virtualbox.org/virtualbox/4.0.4/SDKRef.pdf" -MD5SUM="b4770ca14d1a8cbad9b3eb0e0028ff4b \ - 88604a0e94bf1b8c0d0f18fe4314cfdf \ - bf8007eea0042f745b3c252bbe7586c2 \ - 3248ffc8e3193cb86474fcb530be4efd" +DOWNLOAD="http://download.virtualbox.org/virtualbox/4.0.8/VirtualBox-4.0.8.tar.bz2 \ + http://download.virtualbox.org/virtualbox/4.0.8/VBoxGuestAdditions_4.0.8.iso \ + http://download.virtualbox.org/virtualbox/4.0.8/UserManual.pdf \ + http://download.virtualbox.org/virtualbox/4.0.8/SDKRef.pdf" +MD5SUM="a3e81289f2357fcf4bbe3e77805f38b6 \ + 598ca9b231c1f1ff7817aa76c80f55d6 \ + 39712ccbc16b04c1cda209ae16446bf2 \ + d332f36212b6534e2ce4381e1aea520f" DOWNLOAD_x86_64="UNTESTED" MD5SUM_x86_64="" MAINTAINER="Heinz Wiesinger" |