[gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox/files: virtualbox-wrapper virtualbox-1.5.2-remove-splitted-stuff.patch virtualbox-interfaces virtualbox-1.5.2-remove-alsa.patch virtualbox-config digest-virtualbox-1.5.2 digest-virtualbox-1.5.0-r1 virtualbox-1.5.0-remove-alsa.patch virtualbox-1.5.0-remove-splitted-stuff.patch

[Markus Ullmann (jokey)]

jokey       07/10/22 22:19:39

  Modified:             virtualbox-wrapper
  Added:                virtualbox-1.5.2-remove-splitted-stuff.patch
                        virtualbox-interfaces
                        virtualbox-1.5.2-remove-alsa.patch
                        virtualbox-config digest-virtualbox-1.5.2
  Removed:              digest-virtualbox-1.5.0-r1
                        virtualbox-1.5.0-remove-alsa.patch
                        virtualbox-1.5.0-remove-splitted-stuff.patch
  Log:
  Version bump wrt bug #196424 thanks to Alessio for the ebuilds
  (Portage version: 2.1.3.15)

Revision  Changes    Path
1.2                  app-emulation/virtualbox/files/virtualbox-wrapper

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-wrapper?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-wrapper?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-wrapper?r1=1.1&r2=1.2

Index: virtualbox-wrapper
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/files/virtualbox-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virtualbox-wrapper	16 Mar 2007 22:15:52 -0000	1.1
+++ virtualbox-wrapper	22 Oct 2007 22:19:38 -0000	1.2
@@ -1,66 +1,113 @@
 #!/bin/sh
+#
+# innotek VirtualBox
+#
+#  Copyright (C) 2006-2007 innotek GmbH
+# 
+#  This file is part of VirtualBox Open Source Edition (OSE), as
+#  available from http://www.virtualbox.org. This file is free software;
+#  you can redistribute it and/or modify it under the terms of the GNU
+#  General Public License as published by the Free Software Foundation,
+#  in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
+#  distribution. VirtualBox OSE is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY of any kind.
+
+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+CONFIG="/etc/vbox/vbox.cfg"
+
+if [ ! -r "$CONFIG" ]; then
+    echo "Could not find VirtualBox installation. Please reinstall."
+    exit 1
+fi
+	
+. "$CONFIG"
 
-INSTALL_DIR=/opt/VirtualBox
-USER=$( whoami )
-
-SERVER_PID=$( ps -U $USER | grep VBoxSVC | awk '{ print $1 }' )
+# Note: This script must not fail if the module was not successfully installed
+#       because the user might not want to run a VM but only change VM params!
 
-if [ "$1" = shutdown ]; then
-    if [ "$SERVER_PID" != "" ]; then
-        kill -TERM $SERVER_PID
-        sleep 2
-    fi
-    exit 0
-fi
+if [ "$1" = "shutdown" ]; then
+    SHUTDOWN="true"
+elif [ ! -e /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
+	cat << EOF
+WARNING: There is no module available for the currente kernel (`uname -r`).
+         Please recompile the kernel module and install it by
+	
+	 sudo emerge -1 virtualbox-modules
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+elif ! lsmod|grep -q vboxdrv; then
+    cat << EOF
+WARNING: The vboxdrv kernel module is not loaded.
+         Please load the kernel by
+
+           sudo modprobe vboxdrv
+
+         You will not be able to start VMs until this problem is fixed.
+EOF
+elif [ ! -c /dev/vboxdrv ]; then
+    cat << EOF
+WARNING: The character device /dev/vboxdrv does not exist. Try
 
-[ "$VBOX_USER_HOME" = "" ] && VBOX_USER_HOME="$HOME/.VirtualBox"
+           sudo /etc/init.d/virtualbox restart
 
-mkdir -p "$VBOX_USER_HOME"
-LOG="$VBOX_USER_HOME/VBoxSVC.log"
+         and if that is not successful, try to re-install the package.
 
-if [[ -e /proc/modules && ! -e /dev/vboxdrv ]] ; then
-	echo "Error: vboxdrv kernel module is not loaded..."
-	echo "Please load the module before starting VirtualBox."
-	exit 1
+	 You will not be able to start VMs until this problem is fixed.
+EOF
 elif [ ! -w /dev/vboxdrv ]; then
-	if [ "`id | grep vboxusers`" = "" ]; then
-		echo "Error: You are not a member of the \"vboxusers\" group..."
-		echo "Please add yourself to this group before starting VirtualBox."
-	else
-		echo "Error: /dev/vboxdrv is not writable for some reason..." 
-		echo "If you recently added the current user to the vboxusers group,"
-		echo "then you have to logout and re-login to take the change effect."
-	fi
-	exit 1
+    if [ "`id | grep vboxusers`" = "" ]; then
+        cat << EOF
+WARNING: You are not a member of the "vboxusers" group.  Please add yourself
+         to this group before starting VirtualBox.
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+    else
+        cat << EOF
+WARNING: /dev/vboxdrv not writable for some reason. If you recently added the
+         current user to the vboxusers group then you have to logout and
+	 re-login to take the change effect.
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+    fi
 fi
 
-export LD_LIBRARY_PATH="$INSTALL_DIR"
+export LD_LIBRARY_PATH="$INSTALL_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+
+SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
+if [ -z "$SERVER_PID" ]; then
+    # Server not running yet/anymore, cleanup socket path.
+    # See IPC_GetDefaultSocketPath()!
+    if [ -n "$LOGNAME" ]; then
+        rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1
+    else
+        rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1
+    fi
+fi
 
-if [ "$SERVER_PID" = "" ]; then
-	rm -rf /tmp/.vbox-$USER-ipc
-	[ -f "$LOG.1" ] && mv "$LOG.1" "$LOG.2"
-	[ -f "$LOG.0" ] && mv "$LOG.0" "$LOG.1"
-	[ -f "$LOG" ] && mv "$LOG" "$LOG.0"
-	/opt/VirtualBox/VBoxSVC --daemonize >"$LOG" 2>&1
+if [ "$SHUTDOWN" = "true" ]; then
+    if [ -n "$SERVER_PID" ]; then
+        kill -TERM $SERVER_PID
+        sleep 2
+    fi
+    exit 0
 fi
 
-APP=$( which $0 )
+APP=`which $0`
 APP=${APP##/*/}
 case "$APP" in
-	virtualbox)
-		exec "$INSTALL_DIR/VirtualBox" "$@"
-		;;
-	vboxmanage)
-		exec "$INSTALL_DIR/VBoxManage" "$@"
-		;;
-	vboxsdl)
-		exec "$INSTALL_DIR/VBoxSDL" "$@"
-		;;
-	vboxbfe)
-		exec "$INSTALL_DIR/VBoxBFE" "$@"
-		;;
-	*)
-		echo "Error: Unknown application - $APP"
-		exit 1
-		;;
+  VirtualBox)
+    exec "$INSTALL_DIR/VirtualBox" "$@"
+  ;;
+  VBoxManage)
+    exec "$INSTALL_DIR/VBoxManage" "$@"
+  ;;
+  VBoxSDL)
+    exec "$INSTALL_DIR/VBoxSDL" "$@"
+  ;;
+  *)
+    echo "Unknown application - $APP"
+  ;;
 esac



1.1                  app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch?rev=1.1&content-type=text/plain

Index: virtualbox-1.5.2-remove-splitted-stuff.patch
===================================================================
--- Config.kmk.orig	2007-10-19 14:38:41.000000000 +0200
+++ Config.kmk	2007-10-19 14:40:51.000000000 +0200
@@ -134,7 +134,7 @@
 
 # Build linux / win32 additions.
 ifeq ($(BUILD_TARGET),linux)
-  VBOX_WITH_LINUX_ADDITIONS = 1
+#  VBOX_WITH_LINUX_ADDITIONS = 1
   VBOX_WITH_WIN32_ADDITIONS = 1
 endif
 ifeq ($(BUILD_TARGET),l4)
@@ -173,7 +173,7 @@
 VBOX_WITHOUT_IDT_PATCHING = 1
 endif
 # The kernel driver/module and related runtime libraries.
-VBOX_WITH_VBOXDRV = 1
+#VBOX_WITH_VBOXDRV = 1
 # build with secure label support
 ifeq ($(filter win.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),) # too much work with freetype and all that.
 VBOX_WITH_SECURELABEL = 1
@@ -206,11 +206,11 @@
 # Disable WINMM support for Windows (not implemented)
 VBOX_WITH_WINMM =
 # Enable the kchmviewer
-VBOX_WITH_KCHMVIEWER = 1
+#VBOX_WITH_KCHMVIEWER = 1
 # Build the testsuite.
-VBOX_WITH_TESTSUITE = 1
+#VBOX_WITH_TESTSUITE = 1
 # Build the testcases.
-VBOX_WITH_TESTCASES = 1
+#VBOX_WITH_TESTCASES = 1
 # Set this to not use COM or XPCOM in places where it can be avoided.
 #VBOX_WITHOUT_COM = 1
 # Set this to skip installing the redistributable compiler runtime.
--- configure.orig	2007-10-19 14:41:28.000000000 +0200
+++ configure	2007-10-19 14:42:29.000000000 +0200
@@ -1402,14 +1402,14 @@
 # some things are not available in for OSE
 if [ $OSE -ge 1 ]; then
   cnf_append "VBOX_OSE" "1"
-  cnf_append "VBOX_WITH_TESTSUITE" ""
+#  cnf_append "VBOX_WITH_TESTSUITE" ""
   cnf_append "VBOX_WITH_WIN32_ADDITIONS" ""
 
-  if [ "$OS" = "linux" ]; then
-    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
-  else
-    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
-  fi
+#  if [ "$OS" = "linux" ]; then
+#    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
+#  else
+#    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
+#  fi
   echo >> $CNF
 fi
 



1.1                  app-emulation/virtualbox/files/virtualbox-interfaces

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-interfaces?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-interfaces?rev=1.1&content-type=text/plain

Index: virtualbox-interfaces
===================================================================
# This file is for registering VirtualBox permanent host networking interfaces
# and optionally adding them to network bridges on the host.
# Each line should be of the format <interface name> <user name> [<bridge>].




1.1                  app-emulation/virtualbox/files/virtualbox-1.5.2-remove-alsa.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-alsa.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-alsa.patch?rev=1.1&content-type=text/plain

Index: virtualbox-1.5.2-remove-alsa.patch
===================================================================
--- Config.kmk.orig	2007-10-19 14:44:53.000000000 +0200
+++ Config.kmk	2007-10-19 14:45:11.000000000 +0200
@@ -202,7 +202,7 @@
 # Enable the ISCSI feature.
 VBOX_WITH_ISCSI = 1
 # Enable ALSA support for Linux
-VBOX_WITH_ALSA = 1
+#VBOX_WITH_ALSA = 1
 # Disable WINMM support for Windows (not implemented)
 VBOX_WITH_WINMM =
 # Enable the kchmviewer
--- configure.orig	2007-10-19 14:44:59.000000000 +0200
+++ configure	2007-10-19 14:45:31.000000000 +0200
@@ -1451,7 +1451,7 @@
 # Linux-specific
 if [ "$OS" = "linux" ]; then
   check_linux
-  check_alsa
+#  check_alsa
   check_compiler_h
   [ "$BUILD_MACHINE" = "amd64" ] && check_32bit
 fi



1.1                  app-emulation/virtualbox/files/virtualbox-config

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-config?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/virtualbox-config?rev=1.1&content-type=text/plain

Index: virtualbox-config
===================================================================
INSTALL_DIR=/opt/VirtualBox



1.1                  app-emulation/virtualbox/files/digest-virtualbox-1.5.2

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/digest-virtualbox-1.5.2?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox/files/digest-virtualbox-1.5.2?rev=1.1&content-type=text/plain

Index: digest-virtualbox-1.5.2
===================================================================
MD5 2940f92160c88e241606f0fa91428b2c VirtualBox-1.5.2_OSE.tar.bz2 24227070
RMD160 ca9ae0ad715109835800a2258124101ada679ede VirtualBox-1.5.2_OSE.tar.bz2 24227070
SHA256 a34c3ef9d3c07bbf8fd5c1b62a7a1f05185a1760299ac99f19dd6926f1dc39bd VirtualBox-1.5.2_OSE.tar.bz2 24227070



-- 
gentoo-commits@g.o mailing list