Hello community,
here is the log from the commit of package virtualbox
checked in at Fri Nov 2 01:50:33 CET 2007.
--------
--- virtualbox/virtualbox.changes 2007-09-06 15:38:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/virtualbox/virtualbox.changes 2007-11-01 04:58:50.000000000 +0100
@@ -1,0 +2,76 @@
+Thu Nov 1 04:53:48 CET 2007 - mkudlvasr@suse.cz
+
+- added init scripts for starting kernel module. fixes [bug 328887]
+- disabled stripping of VBoxREM2.rel . fixes [bug 307722]
+- updating to 1.5.2 fixes [bug 335734]
+
+-------------------------------------------------------------------
+Sun Oct 28 21:51:11 CET 2007 - anschneider@suse.de
+
+- Added xorg-x11 drivers for mouse and video
+- Added kernel moduels for guest systems
+- Added guest tools for mounting shares, syncing the time and sharing
+ the clipboard
+
+-------------------------------------------------------------------
+Sun Oct 28 13:11:47 CET 2007 - anschneider@suse.de
+
+- updated to version 1.5.2
+ * Windows Installer: fixed installation on Windows 2000 hosts
+ * Windows Installer: proper warning when installing a 32-bit VirtualBox
+ version on 64-bit Windows and vice versa
+ * Linux Installer: no longer require license acceptance during install,
+ instead at first GUI startup (addresses issues with hanging installer
+ on Debian based distributions)
+ * GUI: added user registration dialog
+ * GUI: fixed crashes on 64-bit Linux hosts
+ * GUI: several fixes and improvements to seamless mode
+ * GUI: fixed DirectDraw mode with certain video cards (e.g. Intel i915)
+ * GUI: fixed incorrect guest resolution after leaving fullscreen mode
+ * GUI: improved keyboard handling on Linux host
+ * GUI: show fatal VM aborts (aka "Guru Meditation")
+ * GUI: fixed crashes due to a display update race condition on some systems
+ * GUI: added ACPI shutdown option to the VM close dialog
+ * GUI: NLS improvements
+ * BIOS: fixed floppy boot menu
+ * BIOS: expose the VM UUID in the DMI/SMBIOS area
+ * VGA: fixed CGA video modes
+ * VGA: fixed 8-bit DAC handling (Solaris setup)
+ * VMM: fixed issue with VT-x on Windows 64-bit hosts
+ * VMM: improved compatibility with Linux KVM
+ * VMM: fixed issues with Fedora 8 guests
+ * VMM: fixed fatal errors while installing Windows guests when using AMD-V
+ * VMM: fixed sporadic hangs when minimizing VM window and using VT-x/AMD-V
+ * VMM: fixed high load of ksoftirq on tickless Linux hosts
+ * VMM: fixed Windows 2000 guests hangs related to IRQ sharing
+ * VMM: fixed sporadic errors during openSUSE 10.3 installation
+ * VMM: fixed issue with Linux 2.6.23 guests
+ * VMM: fixed issues with Solaris guests
+ * VMM: fixed stability issue related to incorrect relocations
+ * Serial: significantly reduced CPU utilization
+ * Network: fixed issues with FreeBSD guests
+ * Network: added MII support (100MBit detection fix)
+ * Network: improved MAC address handling
+ * Network: added PXE release logging
+ * IDE: large reads from CD could exceed the I/O buffer size
+ * Audio: load ALSA dynamically on Linux (i.e. do not fail when ALSA is not
+ present)
+ * VRDP: support additional RDP clients (SunRay, WinConnect, Mac OS X)
+ * VRDP: fixed issues when client color depth is higher than server color depth
+ * VRDP: make PAM authentication service name configurable
+ * VRDP: increased stack size to deal with stack consuming PAM library calls
+ * Additions: various fixes and enhancements to clipboard handling
+ * Windows Additions: fixed issues with Additions on NT 4 guests
+ * Windows Additions: added support for 8-bit video modes
+ * Windows Additions: allow specifying custom resolutions for secondary screens
+ * Windows Additions: several fixes and improvements for DirectDraw
+ * Windows Additions: improved the mouse filter driver compatibility with other
+ mouse drivers
+ * Linux Additions: several fixes and enhancements to Shared Folders
+ * Linux Additions: added support for X.org Server 1.4
+ * Shared folders: fixed MS Powerpoint access issues (Linux host)
+ * API: fixed RPC_E_CHANGED_MODE startup error on Windows hosts
+ * API: fixed SMP race condition on Linux hosts
+ * API: fixed stability issues on Windows hosts in low memory conditions
+
+-------------------------------------------------------------------
Old:
----
VirtualBox-1.5.0_OSE.tar.bz2
New:
----
vbox-kmp-vboxadd.diff
vbox-kmp-vboxvfs.diff
VirtualBox-1.5.2_OSE-patched.tar.bz2
VirtualBox-1.5.2_OSE.tar.bz2
virtualbox-init-script.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox.spec ++++++
--- /var/tmp/diff_new_pack.Ww3856/_old 2007-11-02 01:50:19.000000000 +0100
+++ /var/tmp/diff_new_pack.Ww3856/_new 2007-11-02 01:50:19.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package virtualbox (Version 1.5.0)
+# spec file for package virtualbox (Version 1.5.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,11 +13,17 @@
Name: virtualbox
%define kernel_version %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-source`)
%define _vbox_instdir %{_libdir}/virtualbox
-BuildRequires: Xerces-c Xerces-c-devel bin86 dev86 libxslt
-BuildRequires: Xalan-c Xalan-c-devel libidl-devel qt3-devel
+%if %suse_version <= 1020
+BuildRequires: Xalan-c Xalan-c-devel Xerces-c Xerces-c-devel
+%else
+BuildRequires: libXalan-c-devel libXerces-c-devel
+%endif
+BuildRequires: bin86 dev86 libidl-devel libxslt qt3-devel
BuildRequires: SDL-devel kernel-source kernel-syms pmtools
BuildRequires: compat-libstdc++ e2fsprogs-devel update-desktop-files
BuildRequires: hal-devel qt3-devel-tools xorg-x11-devel
+# is needed only as owner of xorg/modules directory
+BuildRequires: xorg-x11-server-sdk
%ifarch amd64 x86_64 ia32e em64t
BuildRequires: gcc-32bit hal-32bit
BuildRequires: xorg-x11-libX11-devel-32bit xorg-x11-libXt-devel-32bit xorg-x11-libs-32bit
@@ -28,27 +34,24 @@
BuildRequires: libgcc42-32bit libmudflap42-32bit
%endif
%endif
-Version: 1.5.0
+Version: 1.5.2
Release: 1
Summary: VirtualBox OSE is an Emulator
License: GPL v2 or later
Group: System/Emulators/PC
-URL: http://www.virtualbox.org/
-%if 0%{?BUILD_ORIG}
-Source0: VirtualBox-%{version}_OSE.tar.bz2
-%else
+Url: http://www.virtualbox.org/
# WARNING: This is not a comment, but the real command to repack souce:
#%(sh %{_sourcedir}/%{name}-patch-source VirtualBox-%{version}_OSE.tar.bz2)
-Source0: VirtualBox-%{version}_OSE-patched.tar.bz2
-%endif
+Source0: VirtualBox-%{version}_OSE.tar.bz2
Source1: Makefile
Source2: 60-vboxdrv.rules
Source3: README.SUSE
Source4: virtualbox.desktop
-Source5: virtualbox-patch-source
Patch0: vbox-futex.diff
-#Patch1: config-comments.diff
-Patch2: %{name}-64issue.diff
+Patch1: %{name}-64issue.diff
+Patch2: vbox-kmp-vboxadd.diff
+Patch3: vbox-kmp-vboxvfs.diff
+Patch4: %{name}-init-script.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils
Requires: virtualbox-kmp
@@ -81,6 +84,33 @@
--------
innotek GmbH
+%package -n xorg-x11-driver-virtualbox
+Summary: VirtualBox X11 drivers for mouse and video
+Group: System/X11/Servers/XF86_4
+
+%description -n xorg-x11-driver-virtualbox
+X.org X11 VirtualBox video and mouse driver.
+
+
+
+Authors:
+--------
+ innotek GmbH
+
+%package guest-tools
+Summary: VirtualBox guest tools
+Group: System/Emulators/PC
+Requires: virtualbox-kmp
+
+%description guest-tools
+VirtualBox guest addition tools.
+
+
+
+Authors:
+--------
+ innotek GmbH
+
%prep
%setup -q -n VirtualBox-%{version}_OSE
%ifarch amd64 x86_64 ia32e em64t
@@ -89,8 +119,10 @@
# http://cvs.mandriva.com/cgi-bin/viewvc.cgi/contrib-SPECS/virtualbox/VirtualB...
%patch0
%endif
-#%patch1 -p1
+%patch1
%patch2
+%patch3
+%patch4
%build
# this fixes a XEN-issue on %%suse_version >= 1020 (some headers won't
@@ -116,9 +148,7 @@
all
pushd out/linux.*/release/bin/src
# we are using our own Makefile for the kernel module
-
-%__cp %{SOURCE1} .
-
+#%__cp %{SOURCE1} .
%__mkdir obj
echo "flavors_to_build: %{flavors_to_build}"
for flavor in %flavors_to_build; do
@@ -132,6 +162,35 @@
M=$PWD/obj/$flavor
done
popd
+# virtualbox guest kernel modules
+pushd out/linux.*/release/bin/additions/src/vboxadd
+%__mkdir obj
+echo "flavors_to_build: %{flavors_to_build}"
+for flavor in %flavors_to_build; do
+ %__rm -rf obj/$flavor
+ %__mkdir obj/$flavor
+ for i in * ; do
+ test $i = obj && continue
+ %__cp -r $i obj/$flavor/
+ done
+ %__make KERN_DIR=/usr/src/linux-obj/%_target_cpu/$flavor \
+ MODULE_DIR=$PWD/obj/$flavor
+done
+popd
+pushd out/linux.*/release/bin/additions/src/vboxvfs
+%__mkdir obj
+echo "flavors_to_build: %{flavors_to_build}"
+for flavor in %flavors_to_build; do
+ %__rm -rf obj/$flavor
+ %__mkdir obj/$flavor
+ for i in * ; do
+ test $i = obj && continue
+ %__cp -r $i obj/$flavor/
+ done
+ %__make KERN_DIR=/usr/src/linux-obj/%_target_cpu/$flavor \
+ MODULE_DIR=$PWD/obj/$flavor
+done
+popd
%install
pushd out/linux.*/release/bin/src
@@ -144,46 +203,71 @@
%__mkdir_p %{buildroot}/lib/modules/${kernel_version_}-$flavor/updates
done
popd
+pushd out/linux.*/release/bin/additions/src/vboxadd
+export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
+export INSTALL_MOD_DIR=updates
+k=%kernel_version
+kernel_version_=${k%%-*}
+for flavor in %flavors_to_build; do
+ %__make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD/obj/$flavor
+ %__mkdir_p %{buildroot}/lib/modules/${kernel_version_}-$flavor/updates
+done
+popd
+pushd out/linux.*/release/bin/additions/src/vboxvfs
+export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
+export INSTALL_MOD_DIR=updates
+k=%kernel_version
+kernel_version_=${k%%-*}
+for flavor in %flavors_to_build; do
+ %__make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install M=$PWD/obj/$flavor
+ %__mkdir_p %{buildroot}/lib/modules/${kernel_version_}-$flavor/updates
+done
+popd
+# virtualbox xorg-x11 guest additions
+pushd out/linux.*/release/bin/additions/
+%__install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/drivers
+%__install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/input
+%__install -m 755 vboxmouse_drv_71.so %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so
+%__install -m 755 vboxvideo_drv_71.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+# virtualbox guest tools
+%__install -d -m 755 %{buildroot}%{_bindir}
+%__install -d -m 755 %{buildroot}%{_sbindir}
+%__install -m 755 vboxadd-timesync %{buildroot}%{_bindir}
+%__install -m 755 vboxadd-xclient %{buildroot}%{_bindir}
+%__install -m 755 mountvboxsf %{buildroot}%{_sbindir}
+popd
# copy the main files to %{_vbox_instdir}
pushd out/linux.*/release/bin
-
%__install -d -m 755 %{buildroot}%{_vbox_instdir}
-
%__install -m 755 VBox* %{buildroot}%{_vbox_instdir}
-
%__install -m 755 VirtualBox %{buildroot}%{_vbox_instdir}
-
%__install -m 755 vditool %{buildroot}%{_vbox_instdir}
#%__install -m 755 xpidl %{buildroot}%{_vbox_instdir}
-
%__install -m 644 *.xpt %{buildroot}%{_vbox_instdir}
-
%__install -m 644 *.gc %{buildroot}%{_vbox_instdir}
-
%__install -m 644 *.r0 %{buildroot}%{_vbox_instdir}
-
%__cp -R components/ %{buildroot}%{_vbox_instdir}
popd
+# removing executable flags to disable stripping
+# see bug 307722
+%ifarch amd64 x86_64 ia32e em64t
+%__chmod ugo-x %{buildroot}%{_vbox_instdir}/VBoxREM2.rel
+%endif
# install udev rule
-
%__install -d -m 755 %{buildroot}%{_sysconfdir}/udev/rules.d
-
%__install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/udev/rules.d
# install the README.SUSE file
-
%__install -d -m 755 %{buildroot}%{_docdir}/%{name}
-
%__install -m 644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}
# create a menu entry
-
%__install -d -m 755 %{buildroot}%{_datadir}/applications
-
%__install -d -m 755 %{buildroot}%{_datadir}/pixmaps
-
%__install -m 644 src/VBox/Frontends/VirtualBox/images/ico32x01.png %{buildroot}%{_datadir}/pixmaps/virtualbox.png
+# copy the init scripts
+%__install -d -m 755 %{buildroot}%{_sysconfdir}/init.d
+%__install -m 744 src/VBox/Installer/linux/vboxdrv.sh %{buildroot}%{_sysconfdir}/init.d/vboxdrv
+%__install -m 744 src/VBox/Installer/linux/vboxnet.sh %{buildroot}%{_sysconfdir}/init.d/vboxnet
#create wrapper scripts
-
-%__install -d -m 755 %{buildroot}%{_bindir}
for file in VBoxManage VBoxSDL VBoxSVC VirtualBox vditool; do
echo '#!/bin/bash' > $file
echo 'export QT_NO_KDE_INTEGRATION=1' >> $file
@@ -198,6 +282,11 @@
groupadd -r vboxusers 2>/dev/null || :
/sbin/ldconfig
+%preun
+%stop_on_removal vboxdrv
+%stop_on_removal vboxnet
+exit 0
+
%postun
/sbin/ldconfig
@@ -214,8 +303,89 @@
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/virtualbox.png
%{_sysconfdir}/udev/rules.d/60-vboxdrv.rules
+%{_sysconfdir}/init.d/vboxdrv
+%{_sysconfdir}/init.d/vboxnet
+%files -n xorg-x11-driver-virtualbox
+%defattr(-, root, root)
+%dir %{_libdir}/xorg/modules/drivers
+%dir %{_libdir}/xorg/modules/input
+%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+%{_libdir}/xorg/modules/input/vboxmouse_drv.so
+
+%files guest-tools
+%defattr(-, root, root)
+%{_bindir}/vboxadd-timesync
+%{_bindir}/vboxadd-xclient
+%{_sbindir}/mountvboxsf
%changelog
+* Thu Nov 01 2007 - mkudlvasr@suse.cz
+- added init scripts for starting kernel module. fixes [bug 328887]
+- disabled stripping of VBoxREM2.rel . fixes [bug 307722]
+- updating to 1.5.2 fixes [bug 335734]
+* Sun Oct 28 2007 - anschneider@suse.de
+- Added xorg-x11 drivers for mouse and video
+- Added kernel moduels for guest systems
+- Added guest tools for mounting shares, syncing the time and sharing
+ the clipboard
+* Sun Oct 28 2007 - anschneider@suse.de
+- updated to version 1.5.2
+ * Windows Installer: fixed installation on Windows 2000 hosts
+ * Windows Installer: proper warning when installing a 32-bit VirtualBox
+ version on 64-bit Windows and vice versa
+ * Linux Installer: no longer require license acceptance during install,
+ instead at first GUI startup (addresses issues with hanging installer
+ on Debian based distributions)
+ * GUI: added user registration dialog
+ * GUI: fixed crashes on 64-bit Linux hosts
+ * GUI: several fixes and improvements to seamless mode
+ * GUI: fixed DirectDraw mode with certain video cards (e.g. Intel i915)
+ * GUI: fixed incorrect guest resolution after leaving fullscreen mode
+ * GUI: improved keyboard handling on Linux host
+ * GUI: show fatal VM aborts (aka "Guru Meditation")
+ * GUI: fixed crashes due to a display update race condition on some systems
+ * GUI: added ACPI shutdown option to the VM close dialog
+ * GUI: NLS improvements
+ * BIOS: fixed floppy boot menu
+ * BIOS: expose the VM UUID in the DMI/SMBIOS area
+ * VGA: fixed CGA video modes
+ * VGA: fixed 8-bit DAC handling (Solaris setup)
+ * VMM: fixed issue with VT-x on Windows 64-bit hosts
+ * VMM: improved compatibility with Linux KVM
+ * VMM: fixed issues with Fedora 8 guests
+ * VMM: fixed fatal errors while installing Windows guests when using AMD-V
+ * VMM: fixed sporadic hangs when minimizing VM window and using VT-x/AMD-V
+ * VMM: fixed high load of ksoftirq on tickless Linux hosts
+ * VMM: fixed Windows 2000 guests hangs related to IRQ sharing
+ * VMM: fixed sporadic errors during openSUSE 10.3 installation
+ * VMM: fixed issue with Linux 2.6.23 guests
+ * VMM: fixed issues with Solaris guests
+ * VMM: fixed stability issue related to incorrect relocations
+ * Serial: significantly reduced CPU utilization
+ * Network: fixed issues with FreeBSD guests
+ * Network: added MII support (100MBit detection fix)
+ * Network: improved MAC address handling
+ * Network: added PXE release logging
+ * IDE: large reads from CD could exceed the I/O buffer size
+ * Audio: load ALSA dynamically on Linux (i.e. do not fail when ALSA is not
+ present)
+ * VRDP: support additional RDP clients (SunRay, WinConnect, Mac OS X)
+ * VRDP: fixed issues when client color depth is higher than server color depth
+ * VRDP: make PAM authentication service name configurable
+ * VRDP: increased stack size to deal with stack consuming PAM library calls
+ * Additions: various fixes and enhancements to clipboard handling
+ * Windows Additions: fixed issues with Additions on NT 4 guests
+ * Windows Additions: added support for 8-bit video modes
+ * Windows Additions: allow specifying custom resolutions for secondary screens
+ * Windows Additions: several fixes and improvements for DirectDraw
+ * Windows Additions: improved the mouse filter driver compatibility with other
+ mouse drivers
+ * Linux Additions: several fixes and enhancements to Shared Folders
+ * Linux Additions: added support for X.org Server 1.4
+ * Shared folders: fixed MS Powerpoint access issues (Linux host)
+ * API: fixed RPC_E_CHANGED_MODE startup error on Windows hosts
+ * API: fixed SMP race condition on Linux hosts
+ * API: fixed stability issues on Windows hosts in low memory conditions
* Thu Sep 06 2007 - mvyskocil@suse.de
- updated to version 1.5.0
* Major: Seamless windows
++++++ README.SUSE ++++++
--- virtualbox/README.SUSE 2007-06-07 03:40:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/virtualbox/README.SUSE 2007-10-31 00:19:42.000000000 +0100
@@ -1,27 +1,28 @@
-Quick start:
- - load the VirtualBox kernel-module: modprobe vboxdrv
- Note: if you are running virtualbox on an x86_64 (amd64) machine you
- probably will have problems with loading the kernel module.
- Have a look at the /var/log/messages file:
- vboxdrv: NMI watchdog active -- refused to load the kernel module! Please disable
- vboxdrv: the NMI watchdog by specifying 'nmi_watchdog=0' at kernel command line.
- If you restart your machine with nmi_watchdog=0 it should work.
+QUICKSTART
- Additionally amd64 support is under __high development__ - so do not
- expect everything to work:)
+ * Load the VirtualBox kernel-module: modprobe vboxdrv
+ Note: if you are running virtualbox on an x86_64 (amd64) machine you
+ probably will have problems with loading the kernel module.
- - now you can run /usr/bin/VirtualBox
+ Check dmesg:
+ vboxdrv: NMI watchdog active -- refused to load the kernel module!
+ Please disable.
+ vboxdrv: The NMI watchdog by specifying 'nmi_watchdog=0' at kernel
+ command line.
- if you want to run VirtualBox as a normal user (which is recommended) you
- have to add your user to the group: "vboxusers". This can be done easily via
- YaST2.
+ If you add nmi_watchdog=0 to the kernel line in /boot/grub/menu.lst and
+ restart your machine it should work.
+ * Run /usr/bin/VirtualBox
-Other information:
+ If you want to run VirtualBox as a normal user (which is recommended) you
+ have to add your user to the group: "vboxusers". This can be done easily via
+ YaST2.
- Load the VirtualBox kernel module at boot time:
- - open the "/etc/sysconfig/kernel" file with your preferred $EDITOR or YaST
- and add "vboxdrv" to the MODULES_LOADED_ON_BOOT="" variable.
- This package does not contain the virtualbox additions. I hope i can include
- them in the next builds.
+OTHER
+
+ If you want to automatically load the VirtualBox kernel module,
+ open "/etc/sysconfig/kernel" with your preferred $EDITOR or YaST
+ and add "vboxdrv" to the MODULES_LOADED_ON_BOOT="" variable.
+
++++++ vbox-futex.diff ++++++
--- /var/tmp/diff_new_pack.Ww3856/_old 2007-11-02 01:50:19.000000000 +0100
+++ /var/tmp/diff_new_pack.Ww3856/_new 2007-11-02 01:50:19.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- src/VBox/Runtime/r3/linux/sems-linux.cpp.orig
+++ src/VBox/Runtime/r3/linux/sems-linux.cpp
-@@ -114,7 +114,7 @@ struct RTSEMRWINTERNAL
+@@ -110,7 +110,7 @@ struct RTSEMRWINTERNAL
static long sys_futex(int32_t volatile *uaddr, int op, int val, struct timespec *utime, int32_t *uaddr2, int val3)
{
errno = 0;
++++++ vbox-kmp-vboxadd.diff ++++++
Author: Andreas Schneider
Subject: Add missing files to compile vboxadd
Fixed upstream: No
Index: src/VBox/Additions/linux/module/Makefile.module
===================================================================
--- src/VBox/Additions/linux/module/Makefile.module.orig
+++ src/VBox/Additions/linux/module/Makefile.module
@@ -18,6 +18,7 @@ MODULE = vboxadd
OBJS = \
cmc.o \
hgcmcall.o \
+ heapsimple.o \
vboxmod.o \
GenericRequest.o \
PhysHeap.o \
@@ -27,7 +28,8 @@ OBJS = \
HGCMInternal.o \
r0drv/alloc-r0drv.o \
r0drv/linux/alloc-r0drv-linux.o \
- r0drv/linux/semaphore-r0drv-linux.o
+ r0drv/linux/semaphore-r0drv-linux.o \
+ r0drv/linux/spinlock-r0drv-linux.o
ifneq ($(MAKECMDGOALS),clean)
Index: src/VBox/Additions/linux/module/files_vboxadd
===================================================================
--- src/VBox/Additions/linux/module/files_vboxadd.orig
+++ src/VBox/Additions/linux/module/files_vboxadd
@@ -19,10 +19,12 @@ FILES_VBOXADD_NOBIN=" \
${PATH_ROOT}/include/iprt/assert.h=>include/iprt/assert.h \
${PATH_ROOT}/include/iprt/cdefs.h=>include/iprt/cdefs.h \
${PATH_ROOT}/include/iprt/err.h=>include/iprt/err.h \
+ ${PATH_ROOT}/include/iprt/heap.h=>include/iprt/heap.h \
${PATH_ROOT}/include/iprt/log.h=>include/iprt/log.h \
${PATH_ROOT}/include/iprt/mem.h=>include/iprt/mem.h \
${PATH_ROOT}/include/iprt/param.h=>include/iprt/param.h \
${PATH_ROOT}/include/iprt/semaphore.h=>include/iprt/semaphore.h \
+ ${PATH_ROOT}/include/iprt/spinlock.h=>include/iprt/spinlock.h \
${PATH_ROOT}/include/iprt/stdarg.h=>include/iprt/stdarg.h \
${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \
${PATH_ROOT}/include/iprt/string.h=>include/iprt/string.h \
@@ -43,11 +45,13 @@ FILES_VBOXADD_NOBIN=" \
${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h=>VBGLInternal.h \
${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h=>VBoxGuestLog.h \
${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp=>VMMDev.c \
+ ${PATH_ROOT}/src/VBox/Runtime/alloc/heapsimple.cpp=>heapsimple.c \
${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \
${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \
${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c=>r0drv/linux/alloc-r0drv-linux.c \
${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semaphore-r0drv-linux.c=>r0drv/linux/semaphore-r0drv-linux.c \
+ ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c=>r0drv/linux/spinlock-r0drv-linux.c \
${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/string.h=>r0drv/linux/string.h \
${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
${PATH_ROOT}/src/VBox/Additions/linux/module/vboxmod.c=>vboxmod.c \
++++++ vbox-kmp-vboxvfs.diff ++++++
Author: Andreas Schneider
Subject: Add missing files to compile vboxvfs
Fixed upstream: No
Index: src/VBox/Additions/linux/sharedfolders/Makefile.module
===================================================================
--- src/VBox/Additions/linux/sharedfolders/Makefile.module.orig
+++ src/VBox/Additions/linux/sharedfolders/Makefile.module
@@ -18,6 +18,7 @@ MODULE = vboxvfs
OBJS = \
vfsmod.o \
vfs-utils.o \
+ heapsimple.o \
GenericRequest.o \
SysHlp.o \
PhysHeap.o \
@@ -28,6 +29,7 @@ OBJS = \
r0drv/alloc-r0drv.o \
r0drv/linux/alloc-r0drv-linux.o \
r0drv/linux/semaphore-r0drv-linux.o \
+ r0drv/linux/spinlock-r0drv-linux.o \
divdi3.o \
moddi3.o \
udivdi3.o \
Index: src/VBox/Additions/linux/sharedfolders/files_vboxvfs
===================================================================
--- src/VBox/Additions/linux/sharedfolders/files_vboxvfs.orig
+++ src/VBox/Additions/linux/sharedfolders/files_vboxvfs
@@ -20,11 +20,13 @@ FILES_VBOXVFS_NOBIN=" \
${PATH_ROOT}/include/iprt/cdefs.h=>include/iprt/cdefs.h \
${PATH_ROOT}/include/iprt/err.h=>include/iprt/err.h \
${PATH_ROOT}/include/iprt/fs.h=>include/iprt/fs.h \
+ ${PATH_ROOT}/include/iprt/heap.h=>include/iprt/heap.h \
${PATH_ROOT}/include/iprt/log.h=>include/iprt/log.h \
${PATH_ROOT}/include/iprt/mem.h=>include/iprt/mem.h \
${PATH_ROOT}/include/iprt/param.h=>include/iprt/param.h \
${PATH_ROOT}/include/iprt/path.h=>include/iprt/path.h \
${PATH_ROOT}/include/iprt/semaphore.h=>include/iprt/semaphore.h \
+ ${PATH_ROOT}/include/iprt/spinlock.h=>include/iprt/spinlock.h \
${PATH_ROOT}/include/iprt/stdarg.h=>include/iprt/stdarg.h \
${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \
${PATH_ROOT}/include/iprt/string.h=>include/iprt/string.h \
@@ -50,6 +52,7 @@ FILES_VBOXVFS_NOBIN=" \
${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/VBoxCalls.h=>VBoxCalls.h \
${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h=>VBoxGuestLog.h \
${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp=>VMMDev.c \
+ ${PATH_ROOT}/src/VBox/Runtime/alloc/heapsimple.cpp=>heapsimple.c \
${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
${PATH_ROOT}/src/VBox/Runtime/math/gcc/divdi3.c=>divdi3.c \
${PATH_ROOT}/src/VBox/Runtime/math/gcc/moddi3.c=>moddi3.c \
@@ -61,6 +64,7 @@ FILES_VBOXVFS_NOBIN=" \
${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \
${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c=>r0drv/linux/alloc-r0drv-linux.c \
${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semaphore-r0drv-linux.c=>r0drv/linux/semaphore-r0drv-linux.c \
+ ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c=>r0drv/linux/spinlock-r0drv-linux.c \
${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/string.h=>r0drv/linux/string.h \
${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/Makefile.module=>Makefile \
++++++ VirtualBox-1.5.0_OSE.tar.bz2 -> VirtualBox-1.5.2_OSE.tar.bz2 ++++++
virtualbox/VirtualBox-1.5.0_OSE.tar.bz2 /mounts/work_src_done/STABLE/virtualbox/VirtualBox-1.5.2_OSE.tar.bz2 differ: byte 11, line 1
++++++ virtualbox-init-script.diff ++++++
--- src/VBox/Installer/linux/vboxdrv.sh
+++ src/VBox/Installer/linux/vboxdrv.sh
@@ -127,9 +127,6 @@
start() {
begin "Starting VirtualBox kernel module "
- test -f "$kdir/$modname.o" -o -f "$kdir/$modname.ko" || {
- fail "Kernel module not found"
- }
running || {
rm -f $dev || {
fail "Cannot remove $dev"
@@ -187,12 +184,8 @@
}
setup() {
- . "$CONFIG"
stop
- begin "Recompiling VirtualBox kernel module "
- if ! $INSTALL_DIR/src/build_in_tmp install > /var/log/vbox-install.log 2>&1; then
- fail "Look at /var/log/vbox-install.log to find out what went wrong"
- fi
+ begin "Recompiling VirtualBox kernel module, NOT. It has been packaged. "
succ_msg
start
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org