Hello community,
here is the log from the commit of package virtualbox-ose for openSUSE:Factory
checked in at Sat Apr 3 00:20:30 CEST 2010.
--------
--- virtualbox-ose/virtualbox-ose.changes 2010-03-18 17:06:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2010-03-31 13:59:17.000000000 +0200
@@ -2 +2 @@
-Thu Mar 18 11:16:17 UTC 2010 - mseben@novell.com
+Wed Mar 31 11:04:45 UTC 2010 - mseben@novell.com
@@ -4,2 +4,2 @@
-- added vbox-x_crash.diff to fix X crash caused by guest additions
- see:http://www.virtualbox.org/ticket/6198
+- added Obsoletes: virtualbox-ose-kmp to splitted kmp host and
+ guest packages
@@ -8 +8 @@
-Fri Feb 26 17:59:48 UTC 2010 - masterpatricko@gmail.com
+Fri Mar 26 16:26:05 UTC 2010 - mseben@novell.com
@@ -10,3 +10,43 @@
-- Use version 1.7 xorg mouse and video drivers on 11.3
-- Build version 1.7 xorg mouse and video drivers against system libraries
- (virtualbox-ose-system-xorg17.patch)
+- updated to 3.1.6
+ * Linux hosts: fixed timing issue on hosts with Linux kernels 2.6.31 or later with certain CPUs (asynchronous timer mode; bug #6250)
+ * Linux hosts: properly handle host suspend/resume events on Linux kernels 2.6.30 or later (bug #5562)
+ * Mac OS X hosts: fixed VBoxSVC crash while enumerating the host network interfaces under certain circumstances
+ * Snapshots: fixed image corruption after snapshot merge under certain circumstances (bug #6023)
+ * Snapshots: fixed crash with VBoxHeadless / OSE
+ * VMM: fixed reference counting guru meditation (bug #4940)
+ * VMM: improved guest SMP stability
+ * VMM: fixed VT-x hardware debug issues (bugs #477 & #5792)
+ * VMM: fixed PGMDynMapHCPage guru meditation (Mac OS X; VT-x only; bug #6095)
+ * VMM: fixed pgmPoolTrackFlushGCPhysPTInt guru meditations (Mac OS X; VT-x only; bugs #6095 & #6125)
+ * VMM: Fixed host crash when running PAE guests in VT-X mode (Mac OS X only; bug #5771).
+ * GUI: fix displaying of error message (bug #4345)
+ * GUI: fix inability to enter seamless mode (bugs #6185, #6188)
+ * 3D support: fixed assertion and flickering when guest application uses several windows with a single OpenGL context (bug #4598)
+ * 3D support: fixed host crashes when using GL_EXT_compiled_vertex_array and array element calls (bug #6165)
+ * 3D support: fixed runtime linker errors with OpenGL guest libs (bug #5297)
+ * 3D support: fixed OpenGL extension viewer crash on startup (bug #4962)
+ * NAT: fixed a 3.1.4 regression on Windows hosts where graceful connection termination was broken (bug #6237)
+ * NAT: alternative network setting was not stored persistent (bug #6176)
+ * NAT: fixed memory corruption during ICMP traffic under certain circumstances
+ * Network: allow to switch the host interface or the internal network while a VM is running (bug #5781)
+ * VHD: fix for images with a block size different than 2MB
+ * USB: fixed filtered device attach regression (bug #6251)
+ * USB: fixed crash in OHCI under rare circumstances (bug #3571)
+ * VRDP: fixed hang under rare circumstances when attaching USB devices
+ * ACPI: prevent guest freezes when accessing /proc/acpi for determining the state of the host battery and the AC adapter (Linux hosts only; bug #2836)
+ * PulseAudio: fixed guest freezes under certain conditions (3.1.4 regression; bug #6224)
+ * BIOS: increased space for DMI strings
+ * BIOS: fixed interrupt routing problem for certain configurations (I/O-APIC enabled, ACPI not used; bug #6098)
+ * iSCSI: be more robust when handling the INQUIRY response
+ * iSCSI: be more robust when handling sense data
+ * BusLogic: fixed FreeBSD guests
+ * webservice: vboxwebsrv is now multithreaded
+ * Solaris Installer: fixed netmask to stay persistent across reboots for Host-only interface (bug #4590)
+ * Linux installer: removed external dependency to libpng12.so (bug #6243)
+ * Solaris Additions: fixed superfluous kernel logging (bug #6181)
+ * Linux Additions: fixed hang when starting the X server in Fedora12 guests and in guests with Linux 2.6.33 or later (bug #6198)
+ * Linux Additions: support Mandriva speedboot runlevel (bug #5484)
+ * Linux Additions: fixed SELinux security context of mount.vboxsf (bug #6362)
+ * Linux Additions: support Ubuntu 10.04 (bug #5737)
+ * Web service: update PHP bindings to fix problems with enums and collections
+- deprecated vbox-x_crash.diff
@@ -15 +55 @@
-Fri Feb 26 08:36:48 UTC 2010 - mseben@novell.com
+Thu Feb 18 10:32:25 UTC 2010 - mseben@novell.com
@@ -17,3 +57,4 @@
-- fix gcc build issues - use gcc4.3 for build (currently virtualbox
- doesn't support gcc4.5
-- added ret-in-nonvoid-fnc.diff to fix post build checks
+- rewritten spec file
+- split kmp packages to guest and host parts
+- added vbox-x_crash.diff to fix X crash caused by guest additions
+ see:http://www.virtualbox.org/ticket/6198
calling whatdependson for head-i586
Old:
----
60-vboxadd.rules
60-vboxdrv.rules
LocalConfig.kmk
README.SUSE
VirtualBox-3.1.4-OSE-patched.tar.bz2
default.virtualbox
preamble
vbox-2.6.25.diff
vbox-futex.diff
vbox-kbuild_unit_paths.diff
vbox-swab_2.6.29_header.diff
vbox-x_crash.diff
virtualbox-ose-disable-updates.diff
virtualbox-ose-init-scripts.diff
virtualbox-ose-permissions_warning.diff
virtualbox-ose-sudo-tmpdir.diff
virtualbox-ose-system-xorg17.patch
virtualbox-ose.easy
virtualbox-ose.secure
virtualbox-patch-source
virtualbox-system-yasm.diff
virtualbox.desktop
New:
----
VirtualBox-3.1.6-OSE-patched.tar.bz2
VirtualBox-3.1.6-OSE.tar.bz2
VirtualBox-3.1.6-UserManual.pdf
vbox-disable-updates.diff
vbox-permissions_warning.diff
vbox-vboxadd-init-script.diff
vbox-vboxdrv-init-script.diff
virtualbox-ose-3.1.6-rpmlintrc
virtualbox-ose-60-vboxdrv.rules
virtualbox-ose-60-vboxguest.rules
virtualbox-ose-default.virtualbox
virtualbox-ose-guest-kmp-files
virtualbox-ose-guest-preamble
virtualbox-ose-host-kmp-files
virtualbox-ose-host-preamble
virtualbox-ose-patch-source.sh
virtualbox-ose-wrapper.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox-ose.spec ++++++
++++ 799 lines (skipped)
++++ between virtualbox-ose/virtualbox-ose.spec
++++ and /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.spec
++++++ VirtualBox-3.1.4-OSE-patched.tar.bz2 -> VirtualBox-3.1.6-OSE-patched.tar.bz2 ++++++
virtualbox-ose/VirtualBox-3.1.4-OSE-patched.tar.bz2 /mounts/work_src_done/STABLE/virtualbox-ose/VirtualBox-3.1.6-OSE-patched.tar.bz2 differ: char 11, line 1
++++++ VirtualBox-3.1.4-OSE-patched.tar.bz2 -> VirtualBox-3.1.6-OSE.tar.bz2 ++++++
virtualbox-ose/VirtualBox-3.1.4-OSE-patched.tar.bz2 /mounts/work_src_done/STABLE/virtualbox-ose/VirtualBox-3.1.6-OSE.tar.bz2 differ: char 11, line 1
++++++ vbox-disable-updates.diff ++++++
Our OS provides superior way of dealing with updates (PackageKit).
Let's not bug the user with updates that are not yet packaged.
Lubomir Rintel
diff -up VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp.noupdate VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
--- VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp.noupdate 2009-11-12 15:25:16.000000000 +0100
+++ VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp 2009-11-12 15:28:49.000000000 +0100
@@ -186,7 +186,11 @@ void VBoxUpdateData::decode()
if (parser.size() > 1)
{
QDate date = QDate::fromString (parser [1], Qt::ISODate);
- mDate = date.isValid() ? date : QDate::currentDate();
+ if (date.isValid()) {
+ mDate = date;
+ } else {
+ mPeriodIndex = PeriodNever;
+ }
}
/* Parse 'branch' value */
++++++ vbox-permissions_warning.diff ++++++
diff -uNrp VirtualBox-3.1.2_OSE.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk VirtualBox-3.1.2_OSE/src/VBox/Frontends/VirtualBox/Makefile.kmk
--- VirtualBox-3.1.2_OSE.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk 2009-12-17 15:27:56.000000000 +0100
+++ VirtualBox-3.1.2_OSE/src/VBox/Frontends/VirtualBox/Makefile.kmk 2009-12-21 18:39:13.766349383 +0100
@@ -43,7 +43,7 @@ VBOX_WITH_UPDATE_REQUEST := 1
# The targets.
#
ifdef VBOX_WITH_HARDENING
-PROGRAMS += VirtualBoxHardened
+PROGRAMS += VirtualBoxHardened VBoxPermissionsMessage
DLLS += VirtualBox
else
PROGRAMS += VirtualBox
@@ -132,12 +132,18 @@ include $(PATH_SUB_CURRENT)/VBoxUI.pro
USES += qt4
VirtualBox_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE)
VirtualBox_NAME = VirtualBox
+
ifndef VBOX_WITH_HARDENING # For the launch trick we need different inode numbers.
ifeq ($(KBUILD_TARGET),darwin) ## @todo use .darwin when ticket 36 has been fixed.
#VirtualBox_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
VirtualBox_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
endif
endif
+
+VBoxPermissionsMessage_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE)
+VBoxPermissionsMessage_NAME = VBoxPermissionMessage
+VBoxPermissionsMessage_DEFS.linux = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL
+
VirtualBox_SDKS.win = WINPSDK DXSDK
ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(KBUILD_TARGET)),) # X11 + os2 ## @todo solaris
VirtualBox_SDKS += LIBSDL
@@ -373,6 +379,9 @@ VirtualBox_QT_MOCSRCS += \
src/extensions/QIFileDialog.cpp
endif
+VBoxPermissionsMessage_SOURCES = \
+ src/VBoxPermissionsMessage.cpp
+
VirtualBox_SOURCES = \
src/main.cpp \
src/VBoxAboutDlg.cpp \
@@ -521,6 +530,8 @@ endif
# (The include directory and lib/framework for each module will be added by the Qt4 unit.)
VirtualBox_QT_MODULES = Core Gui Network
+VBoxPermissionsMessage_QT_MODULES = Core Gui Network
+
if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL)
VirtualBox_QT_MODULES += OpenGL
endif
@@ -649,6 +660,8 @@ $$(PATH_VirtualBox)/VirtualBox-icon.rc:
endif # win
+INSTALLS += VBoxPermissionsMessage
+VBoxPermissionsMessage_INST = $(INST_VIRTUALBOX)
ifeq ($(KBUILD_TARGET),darwin)
#
diff -uNrp VirtualBox-3.1.2_OSE.orig/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp VirtualBox-3.1.2_OSE/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp
--- VirtualBox-3.1.2_OSE.orig/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp 1970-01-01 01:00:00.000000000 +0100
+++ VirtualBox-3.1.2_OSE/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp 2009-12-21 18:39:13.800468713 +0100
@@ -0,0 +1,12 @@
+#include
+#include
+int main(int argc, char *argv[])
+{
+ QApplication app(argc, argv);
+ QMessageBox msgBox;
+ msgBox.setWindowTitle(QObject::tr("Permissions problem !"));
+ msgBox.setText(QObject::tr("You are not a member of the \"vboxusers\" group. Please add yourself to this group before starting VirtualBox. You could do it using: Yast / Security and Users / User and Group management. Don't forget re-login your user account!"));
+ int ret = msgBox.exec();
+ app.quit();
+ return 0;
+}
\ No newline at end of file
++++++ vbox-vboxadd-init-script.diff ++++++
Index: src/VBox/Additions/linux/installer/vboxadd.sh
===================================================================
--- src/VBox/Additions/linux/installer/vboxadd.sh.orig
+++ src/VBox/Additions/linux/installer/vboxadd.sh
@@ -30,6 +30,7 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Description: VirtualBox Linux Additions kernel modules
+# Short-Description: VirtualBox Linux Additions kernel modules
### END INIT INFO
PATH=$PATH:/bin:/sbin:/usr/sbin
@@ -168,8 +169,6 @@ fi
dev=/dev/vboxguest
userdev=/dev/vboxuser
-owner=vboxadd
-group=1
fail()
{
@@ -234,12 +233,6 @@ start()
fail "Cannot create device $dev with major $maj and minor $min"
}
fi
- chown $owner:$group $dev 2>/dev/null || {
- rm -f $dev 2>/dev/null
- rm -f $userdev 2>/dev/null
- rmmod vboxguest 2>/dev/null
- fail "Cannot change owner $owner:$group for device $dev"
- }
if [ ! -c $userdev ]; then
maj=10
@@ -250,17 +243,10 @@ start()
rmmod vboxguest 2>/dev/null
fail "Cannot create device $userdev with major $maj and minor $min"
}
- chown $owner:$group $userdev 2>/dev/null || {
- rm -f $dev 2>/dev/null
- rm -f $userdev 2>/dev/null
- rmmod vboxguest 2>/dev/null
- fail "Cannot change owner $owner:$group for device $userdev"
- }
fi
fi
- if [ -n "$BUILDVBOXVFS" ]; then
- running_vboxvfs || {
+ running_vboxvfs || {
$MODPROBE vboxvfs > /dev/null 2>&1 || {
if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then
fail_msg
@@ -270,8 +256,7 @@ start()
fi
fail "modprobe vboxvfs failed"
}
- }
- fi
+ }
# Mount all shared folders from /etc/fstab. Normally this is done by some
# other startup script but this requires the vboxdrv kernel module loaded.
@@ -287,10 +272,8 @@ stop()
if ! umount -a -t vboxsf 2>/dev/null; then
fail "Cannot unmount vboxsf folders"
fi
- if [ -n "$BUILDVBOXVFS" ]; then
- if running_vboxvfs; then
- rmmod vboxvfs 2>/dev/null || fail "Cannot unload module vboxvfs"
- fi
+ if running_vboxvfs; then
+ rmmod vboxvfs 2>/dev/null || fail "Cannot unload module vboxvfs"
fi
if running_vboxguest; then
rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest"
@@ -310,106 +293,8 @@ restart()
# setup_script
setup()
{
- # don't stop the old modules here -- they might be in use
- 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
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|grep -q vboxvfs; then
- begin "Removing old VirtualBox vboxvfs kernel module"
- find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|grep -q vboxguest; then
- begin "Removing old VirtualBox vboxguest kernel module"
- find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- 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
- fail "`printf "Your system does not seem to be set up to build kernel modules.\nLook at $LOG to find out what went wrong"`"
- fi
- echo
- if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \
- --no-dkms --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
- 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
- if [ -n "$BUILDVBOXVFS" ]; then
- begin "Building the shared folder support module"
- if ! $BUILDVBOXVFS \
- --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
- 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
- depmod
-
- begin "Doing non-kernel setup of the Guest Additions"
- echo "Creating user for the Guest Additions." >> $LOG
- # This is the LSB version of useradd and should work on recent
- # distributions
- useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1
- # And for the others, we choose a UID ourselves
- useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1
-
- # Create udev description file
- if [ -d /etc/udev/rules.d ]; then
- echo "Creating udev rule for the Guest Additions kernel module." >> $LOG
- udev_call=""
- udev_app=`which udevadm 2> /dev/null`
- if [ $? -eq 0 ]; then
- udev_call="${udev_app} version 2> /dev/null"
- else
- udev_app=`which udevinfo 2> /dev/null`
- if [ $? -eq 0 ]; then
- udev_call="${udev_app} -V 2> /dev/null"
- fi
- fi
- udev_fix="="
- if [ "${udev_call}" != "" ]; then
- udev_out=`${udev_call}`
- udev_ver=`expr "$udev_out" : '[^0-9]*\([0-9]*\)'`
- if [ "$udev_ver" = "" -o "$udev_ver" -lt 55 ]; then
- udev_fix=""
- fi
- fi
- ## @todo 60-vboxadd.rules -> 60-vboxguest.rules ?
- echo "KERNEL=${udev_fix}\"vboxguest\", NAME=\"vboxguest\", OWNER=\"vboxadd\", MODE=\"0660\"" > /etc/udev/rules.d/60-vboxadd.rules
- echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules
- fi
-
- # Put mount.vboxsf in the right place
- ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
- # At least Fedora 11 and Fedora 12 demand on the correct security context when
- # executing this command from service scripts. Shouldn't hurt for other distributions.
- chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1
-
+ begin "Recompiling VirtualBox kernel modules, NOT. It has been packaged."
succ_msg
- if running_vboxguest || running_vboxadd; then
- printf "You should restart your guest to make sure the new modules are actually used\n\n"
- else
- start
- fi
}
# cleanup_script
++++++ vbox-vboxdrv-init-script.diff ++++++
Index: src/VBox/Installer/linux/vboxdrv.sh.in
===================================================================
--- src/VBox/Installer/linux/vboxdrv.sh.in.orig
+++ src/VBox/Installer/linux/vboxdrv.sh.in
@@ -23,19 +23,18 @@
#
### BEGIN INIT INFO
# Provides: vboxdrv
-# Required-Start: $syslog
-# Required-Stop:
+# Required-Start: $syslog $remote_fs
+# Required-Stop: $syslog $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: VirtualBox Linux kernel module
+# Description: VirtualBox Linux kernel module
### END INIT INFO
PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
DEVICE=/dev/vboxdrv
GROUPNAME=vboxusers
LOG="/var/log/vbox-install.log"
-NOLSB=%NOLSB%
-DEBIAN=%DEBIAN%
MODPROBE=/sbin/modprobe
if $MODPROBE -c | grep -q '^allow_unsupported_modules *0'; then
@@ -45,109 +44,30 @@ fi
[ -f /lib/lsb/init-functions ] || NOLSB=yes
[ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg
-if [ -n "$INSTALL_DIR" ]; then
- VBOXMANAGE="$INSTALL_DIR/VBoxManage"
- BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp"
- BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp"
- BUILDVBOXNETADP="$INSTALL_DIR/src/vboxnetadp/build_in_tmp"
-else
- VBOXMANAGE="/usr/lib/%PACKAGE%/VBoxManage"
- BUILDVBOXDRV="/usr/share/%PACKAGE%/src/vboxdrv/build_in_tmp"
- BUILDVBOXNETFLT="/usr/share/%PACKAGE%/src/vboxnetflt/build_in_tmp"
- BUILDVBOXNETADP="/usr/share/%PACKAGE%/src/vboxnetadp/build_in_tmp"
-fi
+VBOXMANAGE="$INSTALL_DIR/VBoxManage"
-# silently exit if the package was uninstalled but not purged,
-# applies to Debian packages only
-[ -z "$DEBIAN" -o -x $VBOXMANAGE -a -x $BUILDVBOXDRV ] || exit 0
-
-if [ -n "$NOLSB" ]; then
- if [ -f /etc/redhat-release ]; then
- system=redhat
- elif [ -f /etc/SuSE-release ]; then
- system=suse
- elif [ -f /etc/gentoo-release ]; then
- system=gentoo
- fi
-fi
+[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
-[ -r /etc/default/%PACKAGE% ] && . /etc/default/%PACKAGE%
+. /etc/rc.status
-if [ -z "$NOLSB" ]; then
- . /lib/lsb/init-functions
- fail_msg() {
- echo ""
- log_failure_msg "$1"
- }
- succ_msg() {
- log_success_msg " done."
- }
- begin_msg() {
- log_daemon_msg "$@"
- }
-else
- if [ "$system" = "redhat" ]; then
- . /etc/init.d/functions
- fail_msg() {
- echo -n " "
- echo_failure
- echo
- echo " ($1)"
- }
- succ_msg() {
- echo -n " "
- echo_success
- echo
- }
- elif [ "$system" = "suse" ]; then
- . /etc/rc.status
- fail_msg() {
- rc_failed 1
- rc_status -v
- echo " ($1)"
- }
- succ_msg() {
- rc_reset
- rc_status -v
- }
- elif [ "$system" = "gentoo" ]; then
- if [ -f /sbin/functions.sh ]; then
- . /sbin/functions.sh
- elif [ -f /etc/init.d/functions.sh ]; then
- . /etc/init.d/functions.sh
- fi
- fail_msg() {
- eerror "$1"
- }
- succ_msg() {
- eend "$?"
- }
- begin_msg() {
- ebegin "$1"
- }
- if [ "`which $0`" = "/sbin/rc" ]; then
- shift
- fi
- else
- fail_msg() {
- echo " ...failed!"
- echo " ($1)"
- }
- succ_msg() {
- echo " ...done."
- }
- fi
- if [ "$system" != "gentoo" ]; then
- begin_msg() {
- [ -z "${1:-}" ] && return 1
- if [ -z "${2:-}" ]; then
- echo -n "$1"
- else
- echo -n "$1: $2"
- fi
- }
- fi
-fi
+fail_msg() {
+ rc_failed 1
+ rc_status -v
+ echo " ($1)"
+}
+succ_msg() {
+ rc_reset
+ rc_status -v
+}
+begin_msg() {
+ [ -z "${1:-}" ] && return 1
+ if [ -z "${2:-}" ]; then
+ echo -n "$1"
+ else
+
+ echo -n "$1: $2"
+ fi
+}
failure()
{
@@ -196,13 +116,6 @@ start()
failure "Cannot create device $DEVICE with major $MAJOR and minor $MINOR"
fi
fi
- # ensure permissions
- if ! chown :$GROUPNAME $DEVICE 2>/dev/null; then
- rmmod vboxnetadp 2>/dev/null
- rmmod vboxnetflt 2>/dev/null
- rmmod vboxdrv 2>/dev/null
- failure "Cannot change owner $GROUPNAME for device $DEVICE"
- fi
if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
fi
@@ -236,7 +149,7 @@ stop()
succ_msg
}
-# enter the following variables in /etc/default/%PACKAGE%:
+# enter the following variables in /etc/default/virtualbox:
# SHUTDOWN_USERS="foo bar"
# check for running VMs of user foo and user bar
# SHUTDOWN=poweroff
@@ -285,41 +198,8 @@ stop_vms()
setup()
{
- stop
- if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then
- begin_msg "Removing old VirtualBox netadp kernel module"
- find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then
- begin_msg "Removing old VirtualBox netflt kernel module"
- find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
- begin_msg "Removing old VirtualBox kernel module"
- find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null
- succ_msg
- fi
- begin_msg "Recompiling VirtualBox kernel module"
- if ! $BUILDVBOXDRV \
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
- --no-print-directory install > $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
- if ! $BUILDVBOXNETFLT \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
- if ! $BUILDVBOXNETADP \
- --use-module-symvers /tmp/vboxdrv-Module.symvers \
- --no-print-directory install >> $LOG 2>&1; then
- failure "Look at $LOG to find out what went wrong"
- fi
- rm -f /etc/vbox/module_not_compiled
+ begin_msg "Recompiling VirtualBox kernel modules, NOT. It has been packaged."
succ_msg
- start
}
dmnstatus()
++++++ virtualbox-ose-3.1.6-rpmlintrc ++++++
addFilter("incoherent-init-script-name vboxdrv")
addFilter("incoherent-init-script-name vboxadd")
addFilter("xorg-x11-driver-virtualbox-ose.* shlib-policy-missing-suffix")
++++++ virtualbox-ose-60-vboxdrv.rules ++++++
KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
++++++ virtualbox-ose-60-vboxguest.rules ++++++
KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660"
KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0600", ENV{ACL_MANAGE}="1"
++++++ virtualbox-ose-default.virtualbox ++++++
# /etc/default/virtualbox
#
# -------------------------------------------------------------------------------------------------
# In the "SHUTDOWN_USERS" list all users for which a check for runnings VMs should be done during
# shutdown of "vboxdrv" resp. the server:
# SHUTDOWN_USERS="foo bar"
#
# Set "SHUTDOWN" to one of "poweroff", "acpibutton" or "savestate" depending on which of the
# shutdown methods for running VMs are wanted:
# SHUTDOWN="poweroff"
# SHUTDOWN="acpibutton"
# SHUTDOWN="savestate"
# -------------------------------------------------------------------------------------------------
#
#SHUTDOWN_USERS="foo bar"
#SHUTDOWN="savestate"
++++++ virtualbox-ose-guest-kmp-files ++++++
%defattr (-,root,root)
%dir /lib/modules/%2-%1/
%dir /lib/modules/%2-%1/updates
/lib/modules/%2-%1/updates/vboxvfs.ko
/lib/modules/%2-%1/updates/vboxvideo.ko
/lib/modules/%2-%1/updates/vboxguest.ko
++++++ virtualbox-ose-guest-preamble ++++++
Requires: kernel-%1
Provides: virtualbox-ose-guest-kmp = %version
Provides: virtualbox-ose-kmp
Obsoletes: virtualbox-ose-kmp
++++++ virtualbox-ose-host-kmp-files ++++++
%defattr (-,root,root)
%dir /lib/modules/%2-%1/
%dir /lib/modules/%2-%1/updates
/lib/modules/%2-%1/updates/vboxdrv.ko
/lib/modules/%2-%1/updates/vboxnetadp.ko
/lib/modules/%2-%1/updates/vboxnetflt.ko
++++++ virtualbox-ose-host-preamble ++++++
Requires: kernel-%1
Provides: virtualbox-ose-host-kmp = %version
Provides: virtualbox-ose-kmp
Obsoletes: virtualbox-ose-kmp
++++++ virtualbox-ose-patch-source.sh ++++++
#!/bin/bash
REMOVE_DIRS=(
src/VBox/Additions/WINNT
src/VBox/Additions/os2
kBuild/bin
kBuild/msgstyles
kBuild/tools
kBuild/sdks
tools/darwin.x86
tools/darwin.amd64
tools/freebsd.x86
tools/os2.x86
tools/solaris.x86
tools/solaris.amd64
tools/win.amd64
tools/win.x86
tools/linux.x86
tools/linux.amd64
)
set -o errexit
CMDNAME=${0##*/}
SOURCEDIR=${0%$CMDNAME}
BASENAME=${1%.tar.bz2}
trap "rm -rf \"$BASENAME-patched.tar\" \"$BASENAME-patched.tar.bz2\"" ERR
for (( N=0 ; N<${#REMOVE_DIRS[@]} ; N++ )) ; do
#REMOVE_DIRS[N]="$BASENAME/${REMOVE_DIRS[N]}"
# use a wildcard because VirtualBox-1.6.0-OSE != VirtualBox-1.6.0_OSE
REMOVE_DIRS[N]="*/${REMOVE_DIRS[N]}"
done
cd "$SOURCEDIR" >/dev/null
if ! test -f "$BASENAME.tar.bz2" ; then
exit 0
fi
if test -f "$BASENAME-patched.tar.bz2" ; then
if test "$BASENAME.tar.bz2" -ot "$BASENAME-patched.tar.bz2" ; then
if test $CMDNAME -ot "$BASENAME-patched.tar.bz2" ; then
exit 0
fi
fi
fi
cp -a "$BASENAME.tar.bz2" "$BASENAME-patched.tar.bz2"
bunzip2 "$BASENAME-patched.tar.bz2"
tar --wildcards --delete -f "$BASENAME-patched.tar" "${REMOVE_DIRS[@]}"
bzip2 "$BASENAME-patched.tar"
++++++ virtualbox-ose-wrapper.sh ++++++
#!/bin/bash
export QT_NO_KDE_INTEGRATION=1
/usr/bin/id -nG | grep -v -e "root" -e "vboxusers" >/dev/null && /usr/lib/virtualbox/VBoxPermissionMessage && exit
LD_LIBRARY_PATH="/usr/lib/virtualbox${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" /usr/lib/virtualbox/VirtualBox $@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org