From b210a8c79f12ae7f8c7d0971667f107c221bbd12 Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Tue, 18 Sep 2012 23:07:20 +0200 Subject: system/virtualbox: Updated for version 4.2.0. Signed-off-by: Heinz Wiesinger --- system/virtualbox/README | 7 +++-- system/virtualbox/README.SLACKWARE | 2 +- system/virtualbox/doinst.sh | 1 + system/virtualbox/vboxdrv.sh-setup.diff | 44 +++++++++++++++-------------- system/virtualbox/virtualbox.SlackBuild | 49 +++++++++++++++++++++------------ system/virtualbox/virtualbox.info | 20 +++++++------- 6 files changed, 72 insertions(+), 51 deletions(-) (limited to 'system/virtualbox') diff --git a/system/virtualbox/README b/system/virtualbox/README index 772d5c27c9..283c5faba6 100644 --- a/system/virtualbox/README +++ b/system/virtualbox/README @@ -9,10 +9,13 @@ to disable this by passing HARDENING=no to the script. You have to create a vboxusers group, e.g. "groupadd -g 215 vboxusers" and make your user a member of that group. -To compile virtualbox without the Qt4 GUI pass QT4=no to the script. +To compile a headless virtualbox pass HEADLESS=yes to the script. To enable the webservice pass WEBSERVICE=yes to the script. This will -require the optional dependency gsoap. +require gsoap as optional dependency. + +If you want to build the java bindings, pass JAVA=yes to the script. +This will require jdk as optional dependency. If you want to attach VirtualBox to a VDE network you will need vde2. diff --git a/system/virtualbox/README.SLACKWARE b/system/virtualbox/README.SLACKWARE index 90dc8b7685..9f348881c5 100644 --- a/system/virtualbox/README.SLACKWARE +++ b/system/virtualbox/README.SLACKWARE @@ -5,7 +5,7 @@ You'll need to add the following lines to /etc/rc.d/rc.local: /etc/rc.d/rc.vboxdrv start fi -This will load the support kernel module for VirtualBox. +This will load the support kernel module for VirtualBox. You'll then need to add the following lines to /etc/rc.d/rc.local_shutdown: diff --git a/system/virtualbox/doinst.sh b/system/virtualbox/doinst.sh index 653a8da81e..0a19fc0c8a 100644 --- a/system/virtualbox/doinst.sh +++ b/system/virtualbox/doinst.sh @@ -41,4 +41,5 @@ config etc/vbox/vbox.cfg.new config etc/default/virtualbox.new preserve_perms etc/rc.d/rc.vboxdrv.new preserve_perms etc/rc.d/rc.vboxballoonctrl-service.new +preserve_perms etc/rc.d/rc.vboxautostart-service.new 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 diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild index c13b7dacf9..8391004857 100644 --- a/system/virtualbox/virtualbox.SlackBuild +++ b/system/virtualbox/virtualbox.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=virtualbox SRCNAM=VirtualBox -VERSION=4.1.14 +VERSION=4.2.0 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -46,7 +46,7 @@ OUTPUT=${OUTPUT:-/tmp} JOBS=${JOBS:-3} # Define Variable Names -qtgui="" +gui="" # Check for vboxusers group here if ! grep ^vboxusers: /etc/group 2>&1 > /dev/null; then @@ -103,19 +103,25 @@ chmod -R u+w,go+r-w,a-s . GROUP="vboxusers" MODE="755" -# We don't want a init-script building kernel modules. +# We don't want an init-script building kernel modules. # Use virtualbox-kernel.SlackBuild for this. patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff # Support for the qt4-frontend -if [ "${QT4:-yes}" = "yes" ]; then +if [ "${HEADLESS:-no}" = "no" ]; then mkdir -p $PKG/usr/share/applications - guiapp="VirtualBox" + guiapp="VirtualBox VBoxSDL VBoxBFE" else - qtgui+=" --disable-qt4" + gui+=" --build-headless" guiapp="" fi +if [ "${JAVA:-no}" = "no" ]; then + java="--disable-java" +else + java="" +fi + # Do not require makeself. We don't plan on building an automatic installer # Patch taken from gentoo patch -p1 -i $CWD/virtualbox-4-makeself-check.patch @@ -123,14 +129,14 @@ patch -p1 -i $CWD/virtualbox-4-makeself-check.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --ose \ --disable-kmods \ --disable-pulse \ --enable-vde \ --enable-vnc \ $web_service \ $harden \ - $qtgui + $gui \ + $java . ./env.sh @@ -139,12 +145,17 @@ sed -i "s|LIBDIR|lib$LIBDIRSUFFIX|" ./LocalConfig.kmk kmk -j ${JOBS} LOCALCFG=./LocalConfig.kmk +# build VBoxFUSE +cd src/VBox/ImageMounter/VBoxFUSE + kmk -j ${JOBS} +cd - + mkdir -p $PKG/usr/{lib$LIBDIRSUFFIX,share,include}/virtualbox \ $PKG/usr/{bin,src} \ $PKG/usr/share/{pixmaps,mime/packages} \ $PKG/etc/{default,rc.d,vbox} -for i in vboxdrv vboxballoonctrl-service; do +for i in vboxdrv vboxballoonctrl-service vboxautostart-service; do cp -f src/VBox/Installer/linux/$i.sh.in $PKG/etc/rc.d/rc.$i.new sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.$i.new sed -i "s/%NOLSB%/yes/" $PKG/etc/rc.d/rc.$i.new @@ -161,10 +172,11 @@ cd out/linux.$BUILDDIR/release/bin/ rm -f vboxdrv.ko mv src $PKG/usr/src/virtualbox-kernel-$VERSION - if [ "${QT4:-yes}" = "yes" ]; then + if [ "${HEADLESS:-no}" = "no" ]; then mv virtualbox.desktop $PKG/usr/share/applications/ sed -i "s|\$VBOX_DOC_PATH|/usr/share/virtualbox|" \ $PKG/usr/share/applications/virtualbox.desktop + mv nls* *.tar.bz2 $PKG/usr/share/virtualbox/ fi mv VBox.png $PKG/usr/share/pixmaps/ @@ -185,12 +197,10 @@ cd out/linux.$BUILDDIR/release/bin/ rm -rf sdk/installer mv sdk $PKG/usr/share/virtualbox/ - if [ "${QT4:-yes}" = "yes" ]; then - mv nls* *.tar.bz2 $PKG/usr/share/virtualbox/ - fi install -m $MODE -g $GROUP VBoxSysInfo.sh $PKG/usr/share/virtualbox/ install -m $MODE -g $GROUP VBoxCreateUSBNode.sh $PKG/usr/share/virtualbox/ install -m $MODE -g $GROUP VBoxTunctl $PKG/usr/bin/ + install -m $MODE -g $GROUP VBoxFUSE $PKG/usr/bin/ rm -f VBoxSysInfo.sh VBoxCreateUSBNode.sh VBoxTunctl mv * $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/ chown -R root:$GROUP $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/ @@ -198,13 +208,16 @@ cd out/linux.$BUILDDIR/release/bin/ mv $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox.sh $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/VBox cd $TMP/$SRCNAM-${VERSION} -for i in VBoxManage vboxmanage VBoxSDL vboxsdl VBoxHeadless \ - vboxheadless VBoxVRDP VBoxBalloonCtrl $guiapp $vboxwebsrv; do +for i in VBoxManage vboxmanage VBoxHeadless \ + vboxheadless VBoxVRDP VBoxBalloonCtrl vboxballoonctrl \ + VBoxAutostart vboxautostart $guiapp $vboxwebsrv; do ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/$i done -if [ "$guiapp" = "VirtualBox" ]; then - ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/virtualbox +if [ "${HEADLESS:-no}" = "no" ]; then + for i in virtualbox vboxsdl vboxbfe; do + ln -s /usr/lib$LIBDIRSUFFIX/virtualbox/VBox $PKG/usr/bin/$i + done fi if [ "$vboxwebsrv" = "vboxwebsrv" ]; then @@ -218,7 +231,7 @@ if [ "$vboxwebsrv" = "vboxwebsrv" ]; then fi if [ "$harden" = "--enable-hardening" ]; then - for i in VBoxSDL VBoxHeadless $guiapp VBoxNetDHCP VBoxNetAdpCtl; do + for i in VBoxHeadless $guiapp VBoxNetDHCP VBoxNetAdpCtl; do chmod 4711 $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/$i done fi diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info index 14c7fe2be6..5b54b2bebe 100644 --- a/system/virtualbox/virtualbox.info +++ b/system/virtualbox/virtualbox.info @@ -1,16 +1,16 @@ PRGNAM="virtualbox" -VERSION="4.1.14" +VERSION="4.2.0" HOMEPAGE="http://www.virtualbox.org" -DOWNLOAD="http://download.virtualbox.org/virtualbox/4.1.14/VirtualBox-4.1.14.tar.bz2 \ - http://download.virtualbox.org/virtualbox/4.1.14/VBoxGuestAdditions_4.1.14.iso \ - http://download.virtualbox.org/virtualbox/4.1.14/UserManual.pdf \ - http://download.virtualbox.org/virtualbox/4.1.14/SDKRef.pdf" -MD5SUM="f8baa04e6d589bc6b1fb4e7079fbe414 \ - aa43510d60bdb8b7bf6ae81e2f942ca9 \ - 991b414c9291ed88734d92332dc74fb3 \ - db41373e270b06c00dd3d2c89b95899a" +DOWNLOAD="http://download.virtualbox.org/virtualbox/4.2.0/VirtualBox-4.2.0.tar.bz2 \ + http://download.virtualbox.org/virtualbox/4.2.0/VBoxGuestAdditions_4.2.0.iso \ + http://download.virtualbox.org/virtualbox/4.2.0/UserManual.pdf \ + http://download.virtualbox.org/virtualbox/4.2.0/SDKRef.pdf" +MD5SUM="691b4134983ce7d89b9fb683305cb647 \ + ee74e968bab97466c3b463a0b4d665f5 \ + 261f6bd46bdeb05039396b6dbec76341 \ + 53654a262d301c1cbb9b98be1045e461" DOWNLOAD_x86_64="UNTESTED" MD5SUM_x86_64="" -REQUIRES="acpica jdk virtualbox-kernel" +REQUIRES="acpica virtualbox-kernel" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -- cgit v1.2.3