Hello community,
here is the log from the commit of package virtualbox-ose
checked in at Thu Sep 25 23:51:35 CEST 2008.
--------
--- virtualbox-ose/virtualbox-ose.changes 2008-09-11 20:43:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2008-09-25 15:57:10.000000000 +0200
@@ -1,0 +2,60 @@
+Thu Sep 25 15:56:18 CEST 2008 - mkudlvasr@suse.cz
+
+- merge into openSUSE Factory
+
+-------------------------------------------------------------------
+Tue Sep 23 18:29:11 CEST 2008 - suse-tux@gmx.de
+
+- splitted virtualbox-permissions into virtualbox-ose.easy and virtualbox-ose.secure to
+ be suse compliant
+
+-------------------------------------------------------------------
+Tue Sep 23 15:19:59 CEST 2008 - suse-tux@gmx.de
+
+- only apply Patch12 (vbox-buildfix) on factory
+- added dir /var/run/VirtualBox (this is needed by the VBoxAddIF/VBoxDeleteIF scripts)
+
+-------------------------------------------------------------------
+Mon Sep 22 20:26:54 CEST 2008 - mkudlvasr@suse.cz
+
+- modified Config.kmk fix to use realpath for splited kernels
+- fixed Required-Stop in init scripts
+
+-------------------------------------------------------------------
+Thu Sep 18 19:13:54 CEST 2008 - suse-tux@gmx.de
+
+- added Patch15 (vbox-configure_python26.diff) to detect the python installation on
+ factory
+
+-------------------------------------------------------------------
+Thu Sep 18 16:57:59 CEST 2008 - suse-tux@gmx.de
+
+- fixed #427266 - now virtualbox uses RUNPATH instead of ORIGIN to locate the
+ libs because ORIGIN seems to be broken if the hardening feature is enabled
+- updated Patch3 (vbox-kmp-vboxvfs.diff) and fixed Makefile-vboxvfs (finally!)
+ in order to remove undefined symbols
+- create wrapper script for VBoxHeadless
+
+-------------------------------------------------------------------
+Sun Sep 14 19:46:37 CEST 2008 - suse-tux@gmx.de
+
+- new upstream version 2.0.2
+
+-------------------------------------------------------------------
+Sun Sep 14 18:35:46 CEST 2008 - suse-tux@gmx.de
+
+- disabled Patch2 (vbox-kmp-vboxadd.diff)
+- updated Patch3 (vbox-kmp-vboxvfs.diff)
+- fixed Makefile, Makefile-vboxadd and Makefile-vboxvfs to compile on x86_64
+
+-------------------------------------------------------------------
+Sun Sep 14 12:40:48 CEST 2008 - suse-tux@gmx.de
+
+- new upstream version 2.0.0
+- replaced Patch14 (old: virtualbox-missing-Makefiles.diff) with vbox-kbuild_unit_paths.diff,
+ this is needed because our kbuild package doesn't ship these units
+- fixed Makefile, Makefile-vboxadd and Makefile-vboxvfs + some cleanups
+- modified virtualbox-patch-source so that it doesn't remove the kBuild/units dir
+- added Source9 (virtualbox-permissions) because we can't ship suid binaries
+
+-------------------------------------------------------------------
Old:
----
VirtualBox-1.6.6-OSE-patched.tar.bz2
New:
----
vbox-configure_python26.diff
vbox-kbuild_unit_paths.diff
vbox-vboxfs-2.6.25
VirtualBox-2.0.2-OSE-patched.tar.bz2
virtualbox-ose.easy
virtualbox-ose.secure
virtualbox-system-yasm.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox-ose.spec ++++++
--- /var/tmp/diff_new_pack.T31999/_old 2008-09-25 23:50:21.000000000 +0200
+++ /var/tmp/diff_new_pack.T31999/_new 2008-09-25 23:50:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package virtualbox-ose (Version 1.6.6)
+# spec file for package virtualbox-ose (Version 2.0.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,14 +26,14 @@
%else
BuildRequires: libXalan-c-devel libXerces-c-devel
%endif
-BuildRequires: bin86 dev86 libidl-devel libxslt-devel
+BuildRequires: bin86 dev86 libidl-devel libqt4-devel libxslt-devel
BuildRequires: SDL-devel kernel-syms module-init-tools pmtools
-BuildRequires: e2fsprogs-devel update-desktop-files
+BuildRequires: e2fsprogs-devel python-devel update-desktop-files
%if %suse_version <= 1030
BuildRequires: compat-libstdc++
%endif
BuildRequires: hal-devel pulseaudio-devel qt3-devel-tools xorg-x11-devel
-BuildRequires: kbuild python
+BuildRequires: kbuild
# is needed only as owner of xorg/modules directory
BuildRequires: xorg-x11-server-sdk
%if %suse_version > 1030
@@ -62,7 +62,7 @@
%endif
%endif
#
-Version: 1.6.6
+Version: 2.0.2
Release: 1
Summary: VirtualBox OSE is an Emulator
License: GPL v2 or later
@@ -80,6 +80,8 @@
Source6: Makefile-vboxvfs
Source7: LocalConfig.kmk
Source8: preamble
+Source9: virtualbox-ose.easy
+Source10: virtualbox-ose.secure
Source99: virtualbox-patch-source
#
Patch0: vbox-futex.diff
@@ -90,15 +92,16 @@
Patch6: virtualbox-gcc43-fixes.diff
Patch7: virtualbox-validate-op-gcc43.diff
Patch8: use-o3-to-workaround-gcc-ice.diff
-#Patch9: virtualbox-system-yasm.diff
+Patch9: virtualbox-system-yasm.diff
Patch10: vbox-2.6.25
-#Patch11: vbox-vboxfs-2.6.25
+Patch11: vbox-vboxfs-2.6.25
Patch12: vbox-buildfix
Patch13: virtualbox-use-intree-yasm.diff
-#Patch14: virtualbox-missing-Makefiles.diff
+Patch14: vbox-kbuild_unit_paths.diff
+Patch15: vbox-configure_python26.diff
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: pwdutils
+PreReq: pwdutils permissions
Requires: virtualbox-ose-kmp
Provides: virtualbox <= 1.5.4
Obsoletes: virtualbox <= 1.5.4
@@ -176,9 +179,9 @@
# to the latest virtualbox-ose package)
# http://cvs.mandriva.com/cgi-bin/viewvc.cgi/contrib-SPECS/virtualbox/VirtualB...
%patch0
-%patch2
-%patch3
+#%patch2
%endif
+%patch3
%patch1
%patch4
%patch6
@@ -188,9 +191,12 @@
#%patch9
%patch10 -p1
#%patch11 -p1
-%patch12 -p1
%patch13
-#%patch14
+%patch14
+%if %suse_version > 1100
+%patch12 -p1
+%patch15
+%endif
%__cp %{SOURCE7} .
%build
@@ -200,6 +206,7 @@
#%__mkdir linux
#%__cat /usr/src/linux/include/linux/autoconf.h | \
# %__sed 's/#define CONFIG_XEN 1//g' > linux/autoconf.h
+%__sed -i 's|@vboxinstdir@|%{_vbox_instdir}|' LocalConfig.kmk
%if %build_with_gcc41
EXTRA_OPTS=" --with-gcc=/usr/bin/gcc-4.1 --with-g++=/usr/bin/g++-4.1"
%endif
@@ -285,10 +292,6 @@
%__install -m 744 vboxadd-timesync.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd-timesync
%__install -m 744 vboxvfs.sh %{buildroot}%{_sysconfdir}/init.d/vboxvfs
popd
-# rc-links to virtualbox guest tools init scripts
-%__ln_s %{_sysconfdir}/init.d/vboxadd %{buildroot}%{_sbindir}/rcvboxadd
-%__ln_s %{_sysconfdir}/init.d/vboxadd-timesync %{buildroot}%{_sbindir}/rcvboxadd-timesync
-%__ln_s %{_sysconfdir}/init.d/vboxvfs %{buildroot}%{_sbindir}/rcvboxvfs
pushd src/VBox/Additions/x11/installer
%__install -d -m 755 %{buildroot}%{_datadir}/virtualbox
%__install -m 744 x11config.pl %{buildroot}%{_datadir}/virtualbox/x11config.pl
@@ -298,14 +301,15 @@
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 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 *.xpt %{buildroot}%{_vbox_instdir}
%__install -m 644 *.gc %{buildroot}%{_vbox_instdir}
%__install -m 644 *.r0 %{buildroot}%{_vbox_instdir}
%__cp -R components/ %{buildroot}%{_vbox_instdir}
%__rm %{buildroot}%{_vbox_instdir}/VBox.png
+%__rm %{buildroot}%{_vbox_instdir}/tst*
# install languages
%__cp -R nls %{buildroot}%{_datadir}/virtualbox
popd
@@ -320,6 +324,12 @@
# install the README.SUSE file
%__install -d -m 755 %{buildroot}%{_docdir}/%{name}
%__install -m 644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}
+# install permission files for the VirtualBox binaries
+%__install -d -m 755 %{buildroot}%{_sysconfdir}/permissions.d
+%__install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/permissions.d/virtualbox-ose.easy
+%__sed -i 's|@vboxinstdir@|%{_vbox_instdir}|g' %{buildroot}%{_sysconfdir}/permissions.d/virtualbox-ose.easy
+%__install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/permissions.d/virtualbox-ose.secure
+%__sed -i 's|@vboxinstdir@|%{_vbox_instdir}|g' %{buildroot}%{_sysconfdir}/permissions.d/virtualbox-ose.secure
# create a menu entry
%__install -d -m 755 %{buildroot}%{_datadir}/applications
%__install -d -m 755 %{buildroot}%{_datadir}/pixmaps
@@ -327,10 +337,12 @@
# copy the init scripts
%__install -m 744 src/VBox/Installer/linux/vboxdrv.sh.in %{buildroot}%{_sysconfdir}/init.d/vboxdrv
%__install -m 744 src/VBox/Installer/linux/vboxnet.sh.in %{buildroot}%{_sysconfdir}/init.d/vboxnet
+# this dir is needed by the VBoxAddIF/VBoxDeleteIF scripts
+%__install -d -m 755 %{buildroot}%{_var}/run/VirtualBox
# copy additional scripts
%__install -m 755 src/VBox/Installer/linux/VBoxAddIF.sh %{buildroot}%{_vbox_instdir}
# create wrapper scripts
-for file in VBoxManage VBoxSDL VBoxSVC VirtualBox vditool; do
+for file in VBoxManage VBoxHeadless VBoxSDL VBoxSVC VirtualBox VirtualBox3 vditool; do
echo '#!/bin/bash' > $file
echo 'export QT_NO_KDE_INTEGRATION=1' >> $file
echo "LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH:%{_vbox_instdir}\" %{_vbox_instdir}/$file \$@" >> %{buildroot}%{_bindir}/$file
@@ -343,8 +355,6 @@
%__ln_s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
%__cp %{SOURCE4} %{name}.desktop
%suse_update_desktop_file -i %{name} System Emulator
-%__ln_s %{_sysconfdir}/init.d/vboxdrv %{buildroot}%{_sbindir}/rcvboxdrv
-%__ln_s %{_sysconfdir}/init.d/vboxnet %{buildroot}%{_sbindir}/rcvboxnet
###
### generate SaX2/hwinfo data
###
@@ -383,6 +393,7 @@
groupadd -r vboxusers 2>/dev/null || :
/sbin/ldconfig
%fillup_and_insserv -f -y vboxdrv vboxnet
+%run_permissions
%post -n xorg-x11-driver-virtualbox-ose
if ls var/lib/hardware/ids/* &> /dev/null; then
@@ -418,6 +429,8 @@
%restart_on_update vboxadd
%restart_on_update vboxnet
%insserv_cleanup
+%verifyscript
+%verify_permissions -e %{_vbox_instdir}/VBoxBFE -e %{_vbox_instdir}/VBoxHeadless -e %{_vbox_instdir}/VBoxSDL -e %{_vbox_instdir}/VirtualBox -e %{_vbox_instdir}/VirtualBox3
%clean
[ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}"
@@ -427,15 +440,39 @@
%dir %{_docdir}/%{name}
%doc %{_docdir}/%{name}/README.SUSE
%{_bindir}/VBoxManage
+%{_bindir}/VBoxHeadless
%{_bindir}/VBoxSDL
%{_bindir}/VBoxSVC
%{_bindir}/VBoxAddIF
%{_bindir}/VBoxDeleteIF
%{_bindir}/VBoxTunctl
%{_bindir}/VirtualBox
+%{_bindir}/VirtualBox3
%{_bindir}/vditool
%dir %{_vbox_instdir}
-%{_vbox_instdir}/*
+%dir %{_vbox_instdir}/components
+%{_vbox_instdir}/VBox*.sh
+%{_vbox_instdir}/VBox*.so
+%{_vbox_instdir}/VirtualBox*.so
+%{_vbox_instdir}/VBox*.gc
+%{_vbox_instdir}/VBox*.r0
+%ifarch x86_64
+%{_vbox_instdir}/VBoxREM2.rel
+%endif
+%{_vbox_instdir}/vditool
+%{_vbox_instdir}/VMMGC.gc
+%{_vbox_instdir}/VMMR0.r0
+%{_vbox_instdir}/VBoxManage
+%{_vbox_instdir}/VBoxSVC
+%{_vbox_instdir}/VBoxTunctl
+%{_vbox_instdir}/VBoxXPCOMIPCD
+%{_vbox_instdir}/components/*.so
+%{_vbox_instdir}/components/*.xpt
+%verify(not mode) %{_vbox_instdir}/VBoxBFE
+%verify(not mode) %{_vbox_instdir}/VBoxHeadless
+%verify(not mode) %{_vbox_instdir}/VBoxSDL
+%verify(not mode) %{_vbox_instdir}/VirtualBox
+%verify(not mode) %{_vbox_instdir}/VirtualBox3
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/virtualbox.png
%dir %{_datadir}/virtualbox
@@ -446,8 +483,9 @@
%{_sysconfdir}/udev/rules.d/60-vboxdrv.rules
%{_sysconfdir}/init.d/vboxdrv
%{_sysconfdir}/init.d/vboxnet
-%{_sbindir}/rcvboxdrv
-%{_sbindir}/rcvboxnet
+%{_sysconfdir}/permissions.d/virtualbox-ose.easy
+%{_sysconfdir}/permissions.d/virtualbox-ose.secure
+%dir %{_var}/run/VirtualBox
%files -n xorg-x11-driver-virtualbox-ose
%defattr(-, root, root)
@@ -462,9 +500,6 @@
#%{_bindir}/vboxadd-xclient
%{_bindir}/VBoxClient
%{_sbindir}/mountvboxsf
-%{_sbindir}/rcvboxadd
-%{_sbindir}/rcvboxadd-timesync
-%{_sbindir}/rcvboxvfs
%{_sysconfdir}/init.d/vboxadd
%{_sysconfdir}/init.d/vboxvfs
%{_sysconfdir}/init.d/vboxadd-timesync
@@ -473,6 +508,39 @@
%{_datadir}/virtualbox/x11restore.pl
%changelog
+* Thu Sep 25 2008 mkudlvasr@suse.cz
+- merge into openSUSE Factory
+* Tue Sep 23 2008 suse-tux@gmx.de
+- splitted virtualbox-permissions into virtualbox-ose.easy and virtualbox-ose.secure to
+ be suse compliant
+* Tue Sep 23 2008 suse-tux@gmx.de
+- only apply Patch12 (vbox-buildfix) on factory
+- added dir /var/run/VirtualBox (this is needed by the VBoxAddIF/VBoxDeleteIF scripts)
+* Mon Sep 22 2008 mkudlvasr@suse.cz
+- modified Config.kmk fix to use realpath for splited kernels
+- fixed Required-Stop in init scripts
+* Thu Sep 18 2008 suse-tux@gmx.de
+- added Patch15 (vbox-configure_python26.diff) to detect the python installation on
+ factory
+* Thu Sep 18 2008 suse-tux@gmx.de
+- fixed #427266 - now virtualbox uses RUNPATH instead of ORIGIN to locate the
+ libs because ORIGIN seems to be broken if the hardening feature is enabled
+- updated Patch3 (vbox-kmp-vboxvfs.diff) and fixed Makefile-vboxvfs (finally!)
+ in order to remove undefined symbols
+- create wrapper script for VBoxHeadless
+* Sun Sep 14 2008 suse-tux@gmx.de
+- new upstream version 2.0.2
+* Sun Sep 14 2008 suse-tux@gmx.de
+- disabled Patch2 (vbox-kmp-vboxadd.diff)
+- updated Patch3 (vbox-kmp-vboxvfs.diff)
+- fixed Makefile, Makefile-vboxadd and Makefile-vboxvfs to compile on x86_64
+* Sun Sep 14 2008 suse-tux@gmx.de
+- new upstream version 2.0.0
+- replaced Patch14 (old: virtualbox-missing-Makefiles.diff) with vbox-kbuild_unit_paths.diff,
+ this is needed because our kbuild package doesn't ship these units
+- fixed Makefile, Makefile-vboxadd and Makefile-vboxvfs + some cleanups
+- modified virtualbox-patch-source so that it doesn't remove the kBuild/units dir
+- added Source9 (virtualbox-permissions) because we can't ship suid binaries
* Thu Sep 11 2008 mkudlvasr@suse.cz
- new upstream version 1.6.6
- removed Patch14 - not needed any more
++++++ LocalConfig.kmk ++++++
--- virtualbox-ose/LocalConfig.kmk 2008-09-08 15:07:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/virtualbox-ose/LocalConfig.kmk 2008-09-18 20:07:23.000000000 +0200
@@ -1 +1,4 @@
-DEFS += RTPATH_APP_PRIVATE=\"/usr/share/virtualbox\"
+VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
+# using ORIGIN doesn't work with the hardening feature
+VBOX_WITH_ORIGIN :=
+VBOX_WITH_RUNPATH := @vboxinstdir@
++++++ Makefile ++++++
--- virtualbox-ose/Makefile 2008-09-08 15:07:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/virtualbox-ose/Makefile 2008-09-14 18:13:24.000000000 +0200
@@ -1,59 +1,52 @@
KERNEL_SOURCE ?= /lib/modules/$(shell uname -r)/build
# this is taken from the original Makefile
-KFLAGS := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0
+KFLAGS = -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING
ifndef CONFIG_VBOXDRV_FIXEDMAJOR
KFLAGS += -DCONFIG_VBOXDRV_AS_MISC
endif
-#ifeq ($(BUILD_TARGET_ARCH),amd64)
-# KFLAGS += -DRT_ARCH_AMD64
-#else
-# KFLAGS += -DRT_ARCH_X86
-#endif
-# bwalle
-ifeq ($(xARCH),x86_64)
+ifeq ($(ARCH),x86_64)
KFLAGS += -DRT_ARCH_AMD64
else
KFLAGS += -DRT_ARCH_X86
endif
-# end bwalle
-#
-# Without IDT patching. See defetct #2160.
-#
-KFLAGS += -DVBOX_WITHOUT_IDT_PATCHING
-
-#
-# Use the RTR0MemObj API - testing.
-# If this makes testboxes crash/burn/leak disable it and add a comment to defect #2116.
-#
-KFLAGS += -DUSE_NEW_OS_INTERFACE_FOR_MM
-
-
-EXTRA_CFLAGS += $(addprefix -I$(KBUILD_EXTMOD),/ /include) $(KFLAGS)
-
-# bwalle
-EXTRA_CFLAGS += -I$(xPWD)/r0drv/linux/
-# end bwalle
+EXTRA_CFLAGS += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux ) $(KFLAGS)
vboxdrv-obj-y = \
linux/SUPDrv-linux.o \
- SUPDRVShared.o \
- alloc/heapsimple.o \
+ SUPDrv.o \
r0drv/alloc-r0drv.o \
r0drv/initterm-r0drv.o \
+ r0drv/memobj-r0drv.o \
+ r0drv/mpnotification-r0drv.o \
r0drv/linux/alloc-r0drv-linux.o \
r0drv/linux/initterm-r0drv-linux.o \
- r0drv/linux/process-r0drv-linux.o \
- r0drv/linux/semfastmutex-r0drv-linux.o \
+ r0drv/linux/memobj-r0drv-linux.o \
r0drv/linux/mp-r0drv-linux.o \
+ r0drv/linux/mpnotification-r0drv-linux.o \
+ r0drv/linux/process-r0drv-linux.o \
r0drv/linux/semevent-r0drv-linux.o \
+ r0drv/linux/semfastmutex-r0drv-linux.o \
r0drv/linux/spinlock-r0drv-linux.o \
r0drv/linux/semeventmulti-r0drv-linux.o \
r0drv/linux/thread-r0drv-linux.o \
- r0drv/memobj-r0drv.o \
- r0drv/linux/memobj-r0drv-linux.o
+ r0drv/linux/time-r0drv-linux.o \
+ r0drv/linux/timer-r0drv-linux.o \
+ common/err/RTErrConvertFromErrno.o
+
+ifeq ($(ARCH), i386)
+ vboxdrv-obj-y += \
+ math/gcc/divdi3.o \
+ math/gcc/moddi3.o \
+ math/gcc/qdivrem.o \
+ math/gcc/udivdi3.o
+endif
+ifeq ($(ARCH), x86_64)
+ vboxdrv-obj-y += alloc/heapsimple.o
+endif
+
vboxdrv-objs := $(vboxdrv-obj-y)
obj-m += vboxdrv.o
++++++ Makefile-vboxadd ++++++
--- virtualbox-ose/Makefile-vboxadd 2008-09-08 15:07:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/virtualbox-ose/Makefile-vboxadd 2008-09-14 18:01:08.000000000 +0200
@@ -1,10 +1,16 @@
KERNEL_SOURCE ?= /lib/modules/$(shell uname -r)/build
# this is taken from the original Makefile
-KFLAGS = -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ \
- -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DVBGL_VBOXGUEST -DVBOX_HGCM \
+KFLAGS = -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 \
+ -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DVBGL_VBOXGUEST -DVBOX_WITH_HGCM \
-DLOG_TO_BACKDOOR -DRT_WITH_VBOX -DIN_MODULE -DIN_GUEST_R0
+ifeq ($(ARCH), x86_64)
+ KFLAGS += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
+else
+ KFLAGS += -DRT_ARCH_X86
+endif
+
#EXTRA_CFLAGS += $(KFLAGS)
#EXTRA_CFLAGS += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) $(KFLAGS)
@@ -38,6 +44,13 @@
strformatrt.o \
strformattype.o \
strformat-vbox.o
+
+ifeq ($(ARCH), x86_64)
+ vboxadd-obj-y += \
+ alloc/heapsimple.o \
+ r0drv/linux/spinlock-r0drv-linux.o
+endif
+
vboxadd-objs := $(vboxadd-obj-y)
obj-m += vboxadd.o
++++++ Makefile-vboxvfs ++++++
--- virtualbox-ose/Makefile-vboxvfs 2008-09-08 15:07:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/virtualbox-ose/Makefile-vboxvfs 2008-09-18 16:57:20.000000000 +0200
@@ -1,13 +1,20 @@
KERNEL_SOURCE ?= /lib/modules/$(shell uname -r)/build
# this is taken from the original Makefile
-KFLAGS = -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ -DIN_RT_R0 \
- -DIN_SUP_R0 -DVBOX -DVBOX_HGCM -DLOG_TO_BACKDOOR -DIN_MODULE \
+KFLAGS =-D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
+ -DIN_SUP_R0 -DVBOX -DVBOX_WITH_HGCM -DLOG_TO_BACKDOOR -DIN_MODULE \
-DIN_GUEST_R0
+
#EXTRA_CFLAGS += $(KFLAGS)
#EXTRA_CFLAGS += $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux) $(KFLAGS)
+ifeq ($(ARCH), x86_64)
+ KFLAGS += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
+else
+ KFLAGS += -DRT_ARCH_X86
+endif
+
EXTRA_CFLAGS += -I$(M)/include -I$(M)/r0drv/linux $(KFLAGS) -fshort-wchar
vboxvfs-obj-y = \
@@ -26,11 +33,25 @@
r0drv/linux/alloc-r0drv-linux.o \
r0drv/linux/semevent-r0drv-linux.o \
r0drv/linux/semfastmutex-r0drv-linux.o \
+ RTErrConvertToErrno.o \
+ assert.o \
+ logbackdoor.o \
+ logformat.o \
+ strformat.o \
+ strformatrt.o \
+ strformattype.o \
divdi3.o \
moddi3.o \
udivdi3.o \
umoddi3.o \
qdivrem.o
+
+ifeq ($(ARCH), x86_64)
+ vboxvfs-obj-y += \
+ alloc/heapsimple.o \
+ r0drv/linux/spinlock-r0drv-linux.o
+endif
+
vboxvfs-objs := $(vboxvfs-obj-y)
obj-m += vboxvfs.o
++++++ use-o3-to-workaround-gcc-ice.diff ++++++
--- /var/tmp/diff_new_pack.T31999/_old 2008-09-25 23:50:22.000000000 +0200
+++ /var/tmp/diff_new_pack.T31999/_new 2008-09-25 23:50:22.000000000 +0200
@@ -1,6 +1,6 @@
--- src/recompiler/Makefile.kmk
+++ src/recompiler/Makefile.kmk
-@@ -225,9 +225,9 @@
+@@ -238,9 +238,9 @@
# Extra flags for these source modules.
target-i386/op.c_CFLAGS = -O2 -fno-strict-aliasing -fomit-frame-pointer -falign-functions=0 -fno-reorder-blocks -fno-optimize-sibling-calls
++++++ vbox-2.6.25 ++++++
--- /var/tmp/diff_new_pack.T31999/_old 2008-09-25 23:50:22.000000000 +0200
+++ /var/tmp/diff_new_pack.T31999/_new 2008-09-25 23:50:22.000000000 +0200
@@ -1,6 +1,6 @@
---- VirtualBox-1.6.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ VirtualBox-1.6.6/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-@@ -257,11 +257,21 @@
+--- VirtualBox-2.0.2/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
++++ VirtualBox-2.0.2/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+@@ -286,11 +286,21 @@
#undef bool
/*
++++++ vbox-buildfix ++++++
--- /var/tmp/diff_new_pack.T31999/_old 2008-09-25 23:50:22.000000000 +0200
+++ /var/tmp/diff_new_pack.T31999/_new 2008-09-25 23:50:22.000000000 +0200
@@ -1,6 +1,6 @@
---- VirtualBox-1.6.6/Config.kmk
-+++ VirtualBox-1.6.6/Config.kmk
-@@ -1493,17 +1493,28 @@
+--- VirtualBox-2.0.2/Config.kmk
++++ VirtualBox-2.0.2/Config.kmk
+@@ -1743,7 +1743,8 @@
kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
else
# Linux >= 2.6.25
@@ -10,24 +10,3 @@
endif
ifneq ($(kernelpath),)
VBOX_LINUX_INCS += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
- else
-- kernelpath := $(VBOX_LINUX_SRC)
-+ # 2.6.25 format for splitted sources
-+ kernelsrc := $(shell $(SED_EXT) -ne 's+^MAKEARGS := -C++p' $(VBOX_LINUX_SRC)/Makefile)
-+ ifneq ($(kernelsrc),)
-+ kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
-+ VBOX_LINUX_INCS += $(VBOX_LINUX_SRC)/include2 $(kernelpath)/include
-+ else
-+ kernelpath := $(VBOX_LINUX_SRC)
-+ endif
- endif
- ifeq ($(KBUILD_TARGET_ARCH),x86)
- VBOX_LINUX_INCS += $(kernelpath)/include/asm-i386/mach-default \
- $(kernelpath)/include/asm-x86/mach-default
- endif
-+ ifeq ($(KBUILD_TARGET_ARCH),amd64)
-+ VBOX_LINUX_INCS += $(kernelpath)/include/asm-x86/mach-default
-+ endif
- endif
- endif
- endif
++++++ vbox-configure_python26.diff ++++++
Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -1617,7 +1617,7 @@ extern "C" int main(void)
EOF
found=
for p in $PYTHONDIR; do
- for d in python2.5 python2.4 python2.3; do
+ for d in python2.6 python2.5 python2.4 python2.3; do
for b in lib64 lib/64 lib; do
echo "compiling the following source file:" >> $LOG
cat .tmp_src.cc >> $LOG
++++++ vbox-kbuild_unit_paths.diff ++++++
Index: Config.kmk
================================================================================
--- Config.kmk
+++ Config.kmk
@@ -37,6 +37,9 @@
## @todo checked and dbgopt
KBUILD_BLD_TYPES = release profile debug kprofile
+# path to the units
+KBUILD_UNIT_PATHS = $(PWD)/kBuild/units
+
# Install paths.
PATH_INS = $(PATH_OUT)
ifeq ($(KBUILD_TARGET),darwin)
++++++ vbox-kmp-vboxvfs.diff ++++++
--- /var/tmp/diff_new_pack.T31999/_old 2008-09-25 23:50:22.000000000 +0200
+++ /var/tmp/diff_new_pack.T31999/_new 2008-09-25 23:50:22.000000000 +0200
@@ -1,36 +1,44 @@
-Author: Andreas Schneider