Hello community,
here is the log from the commit of package virtualbox-ose
checked in at Thu Apr 10 13:58:13 CEST 2008.
--------
--- virtualbox-ose/virtualbox-ose.changes 2008-02-27 21:34:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2008-04-07 20:52:53.000000000 +0200
@@ -1,0 +2,32 @@
+Mon Apr 7 20:52:13 CEST 2008 - dmueller@suse.de
+
+- revert revert of of kbuild package instead of precompiled binaries
+- add patch to always use in-tree yasm
+
+-------------------------------------------------------------------
+Sun Apr 6 15:10:06 CEST 2008 - bwalle@suse.de
+
+- revert of of kbuild package instead of precompiled binaries
+ since it didn't work in Factory
+- revert removal of precompiled binaries from the tarball since
+ it didn't work in Factory
+- fix build on 2.6.25
+
+-------------------------------------------------------------------
+Thu Apr 3 01:39:21 CEST 2008 - dmueller@suse.de
+
+- use kbuild package instead of precompiled binaries in tarball
+- remove precompiled binaries from the tarball
+
+-------------------------------------------------------------------
+Mon Mar 10 23:38:21 CET 2008 - mkudlvasr@suse.cz
+
+- add init scripts for guest tools and x11 configuration script
+- update README.suse
+
+-------------------------------------------------------------------
+Thu Feb 28 13:44:34 CET 2008 - dmueller@suse.de
+
+- merge factory and buildservice packages
+
+-------------------------------------------------------------------
@@ -11,0 +44,12 @@
+Tue Feb 26 15:47:34 CET 2008 - suse-tux@gmx.de
+
+- new upstream version 1.5.6
+- fixed Makefile for building the vboxdrv module
+
+-------------------------------------------------------------------
+Thu Feb 21 11:50:50 CET 2008 - suse-tux@gmx.de
+
+- fixed Requires for the guest-tools (typo which was due to the rename)
+- minor spec fixes (replaced some hardcoded paths with the corresponding rpm macros)
+
+-------------------------------------------------------------------
Old:
----
VirtualBox-1.5.4_OSE-patched.tar.bz2
VirtualBox-1.5.4_OSE.tar.bz2
virtualbox-ose-init-script.diff
New:
----
vbox-2.6.25
vbox-buildfix
vbox-vboxfs-2.6.25
VirtualBox-1.5.6_OSE-patched.tar.bz2
VirtualBox-1.5.6_OSE.tar.bz2
virtualbox-ose-init-scripts.diff
virtualbox-system-yasm.diff
virtualbox-use-intree-yasm.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virtualbox-ose.spec ++++++
--- /var/tmp/diff_new_pack.vy9927/_old 2008-04-10 13:57:37.000000000 +0200
+++ /var/tmp/diff_new_pack.vy9927/_new 2008-04-10 13:57:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package virtualbox-ose (Version 1.5.4)
+# spec file for package virtualbox-ose (Version 1.5.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -27,6 +27,7 @@
BuildRequires: compat-libstdc++
%endif
BuildRequires: hal-devel pulseaudio-devel qt3-devel-tools xorg-x11-devel
+BuildRequires: kbuild
# is needed only as owner of xorg/modules directory
BuildRequires: xorg-x11-server-sdk
%if %suse_version > 1030
@@ -55,8 +56,8 @@
%endif
%endif
#
-Version: 1.5.4
-Release: 10
+Version: 1.5.6
+Release: 6
Summary: VirtualBox OSE is an Emulator
License: GPL v2 or later
Group: System/Emulators/PC
@@ -82,16 +83,21 @@
Patch1: %{name}-64issue.diff
Patch2: vbox-kmp-vboxadd.diff
Patch3: vbox-kmp-vboxvfs.diff
-Patch4: %{name}-init-script.diff
+Patch4: %{name}-init-scripts.diff
Patch6: virtualbox-gcc43-fixes.diff
Patch7: virtualbox-validate-op-gcc43.diff
Patch8: use-o3-to-workaround-gcc-ice.diff
+Patch9: virtualbox-system-yasm.diff
+Patch10: vbox-2.6.25
+Patch11: vbox-vboxfs-2.6.25
+Patch12: vbox-buildfix
+Patch13: virtualbox-use-intree-yasm.diff
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils
Requires: virtualbox-ose-kmp
Provides: virtualbox <= 1.5.4
-Obsoletes: virtualbox < 1.5.4
+Obsoletes: virtualbox <= 1.5.4
%description
VirtualBox OSE is an extremely feature rich, high performance product
@@ -107,6 +113,7 @@
%suse_kernel_module_package kdump um xen xenpae
%package kmp
+License: GPL v2 or later
Summary: Kernel Module for VirtualBox
Group: System/Emulators/PC
Obsoletes: virtualbox-kmp
@@ -122,6 +129,7 @@
innotek GmbH
%package -n xorg-x11-driver-virtualbox-ose
+License: GPL v2 or later
Summary: VirtualBox X11 drivers for mouse and video
Group: System/X11/Servers/XF86_4
%if %suse_version > 1010
@@ -140,9 +148,13 @@
innotek GmbH
%package guest-tools
+License: GPL v2 or later
Summary: VirtualBox guest tools
Group: System/Emulators/PC
-Requires: virtualbox-kmp
+Requires: virtualbox-ose-kmp
+%if %suse_version > 1010
+Supplements: modalias(pci:v000080EEd0000BEEFsv*sd*bc*sc*i*)
+%endif
%description guest-tools
VirtualBox guest addition tools.
@@ -168,6 +180,12 @@
%patch6
%patch7
%patch8
+# 0.6.2 in state is apparently too new - needs 0.6.0 specifically
+#%patch9
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13
%__cp %{SOURCE7} .
%build
@@ -185,9 +203,7 @@
--with-linux=/usr/src/linux-obj/%{_target_cpu}/default \
%endif
--with-qt-dir=%{_libdir}/qt3 $EXTRA_OPTS
-# FIXME: is it possible to get rid of this precompiled binaries?
-source ./env.sh
-kmk \
+/usr/bin/kmk \
KBUILD_VERBOSE=2 \
%if %suse_version > 1020
VBOX_LINUX_SRC=/usr/src/linux-obj/%{_target_cpu}/default \
@@ -214,7 +230,7 @@
%__cp -r $i obj/$flavor/
done
%__make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \
- M=$PWD/obj/$flavor
+ M=$PWD/obj/$flavor xPWD=$(pwd) xARCH=%{_target_cpu}
done
popd
done
@@ -242,6 +258,8 @@
%__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
+# create init scripts directory
+%__install -d -m 755 %{buildroot}%{_sysconfdir}/init.d
# virtualbox guest tools
%__install -d -m 755 %{buildroot}%{_bindir}
%__install -d -m 755 %{buildroot}%{_sbindir}
@@ -249,6 +267,13 @@
%__install -m 755 vboxadd-xclient %{buildroot}%{_bindir}
%__install -m 755 mountvboxsf %{buildroot}%{_sbindir}
popd
+pushd src/VBox/Additions/linux/installer
+%__install -m 744 vboxadd.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd
+%__install -m 744 vboxadd-timesync.sh %{buildroot}%{_sysconfdir}/init.d/vboxadd-timesync
+%__install -m 744 vboxvfs.sh %{buildroot}%{_sysconfdir}/init.d/vboxvfs
+%__install -d -m 755 %{buildroot}%{_datadir}/virtualbox
+%__install -m 744 x11config.pl %{buildroot}%{_datadir}/virtualbox/x11config.pl
+popd
# copy the main files to %{_vbox_instdir}
pushd out/linux.*/release/bin
%__install -d -m 755 %{buildroot}%{_vbox_instdir}
@@ -262,7 +287,6 @@
%__cp -R components/ %{buildroot}%{_vbox_instdir}
%__rm %{buildroot}%{_vbox_instdir}/VBox.png
# install languages
-%__install -d -m 755 %{buildroot}%{_datadir}/virtualbox
%__cp -R nls %{buildroot}%{_datadir}/virtualbox
popd
# removing executable flags to disable stripping
@@ -281,7 +305,6 @@
%__install -d -m 755 %{buildroot}%{_datadir}/pixmaps
%__install -m 644 src/VBox/Installer/linux/VBox.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
# copy additional scripts
@@ -295,17 +318,17 @@
done
# create links
for file in VBoxAddIF VBoxDeleteIF; do
-ln -s %{_vbox_instdir}/VBoxAddIF.sh %{buildroot}%{_bindir}/$file
+%__ln_s %{_vbox_instdir}/VBoxAddIF.sh %{buildroot}%{_bindir}/$file
done
-ln -s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
-cp %{SOURCE4} %{name}.desktop
+%__ln_s %{_vbox_instdir}/VBoxTunctl %{buildroot}%{_bindir}/VBoxTunctl
+%__cp %{SOURCE4} %{name}.desktop
%suse_update_desktop_file -i %{name} System Emulator
###
### generate SaX2/hwinfo data
###
-mkdir -p $RPM_BUILD_ROOT/usr/share/sax/sysp/maps/update/ \
- $RPM_BUILD_ROOT/usr/share/sax/api/data/cdb/ \
- $RPM_BUILD_ROOT/var/lib/hardware/ids
+%__mkdir_p $RPM_BUILD_ROOT/%{_datadir}/sax/sysp/maps/update/ \
+ $RPM_BUILD_ROOT/%{_datadir}/sax/api/data/cdb/ \
+ $RPM_BUILD_ROOT/%{_var}/lib/hardware/ids
NAME="InnoTek Systemberatung GmbH"
DEVICE="VirtualBox Graphics Adapter"
VID=0x80ee
@@ -314,15 +337,15 @@
PROFILE=
SVID=
SDID=
-cat > $RPM_BUILD_ROOT/usr/share/sax/sysp/maps/update/Identity.map.xorg-x11-driver-virtualbox-ose << EOF
+%__cat > $RPM_BUILD_ROOT/%{_datadir}/sax/sysp/maps/update/Identity.map.xorg-x11-driver-virtualbox-ose << EOF
NAME=${NAME}&DEVICE=${DEVICE}&VID=${VID}&DID=${DID}&SERVER=${SERVER}&EXT=&OPT=&RAW=&PROFILE=${PROFILE}&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=${SVID}&SUBDEVICE=${SDID}
EOF
-cat > $RPM_BUILD_ROOT/usr/share/sax/api/data/cdb/Cards.xorg-x11-driver-virtualbox-ose << EOF
+%__cat > $RPM_BUILD_ROOT/%{_datadir}/sax/api/data/cdb/Cards.xorg-x11-driver-virtualbox-ose << EOF
${NAME}:${DEVICE} {
Driver = ${SERVER}
}
EOF
-cat > $RPM_BUILD_ROOT/var/lib/hardware/ids/xorg-x11-driver-virtualbox-ose << EOF
+%__cat > $RPM_BUILD_ROOT/%{_var}/lib/hardware/ids/xorg-x11-driver-virtualbox-ose << EOF
vendor.id pci ${VID}
&device.id pci ${DID}
+device.name ${DEVICE}
@@ -349,6 +372,9 @@
%postun
/sbin/ldconfig
+%restart_on_update vboxdrv
+%restart_on_update vboxnet
+%insserv_cleanup
%postun -n xorg-x11-driver-virtualbox-ose
if ls var/lib/hardware/ids/* &> /dev/null; then
@@ -358,6 +384,11 @@
fi
exit 0
+%postun guest-tools
+%restart_on_update vboxadd
+%restart_on_update vboxnet
+%insserv_cleanup
+
%clean
[ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}"
@@ -381,18 +412,18 @@
%defattr(-, root, root)
%dir %{_libdir}/xorg/modules/drivers
%dir %{_libdir}/xorg/modules/input
-%dir /usr/share/sax
-%dir /usr/share/sax/api
-%dir /usr/share/sax/api/data
-%dir /usr/share/sax/api/data/cdb
-%dir /usr/share/sax/sysp
-%dir /usr/share/sax/sysp/maps
-%dir /usr/share/sax/sysp/maps/update
-%dir /var/lib/hardware
-%dir /var/lib/hardware/ids
-/usr/share/sax/api/data/cdb/Cards.xorg-x11-driver-virtualbox-ose
-/usr/share/sax/sysp/maps/update/Identity.map.xorg-x11-driver-virtualbox-ose
-/var/lib/hardware/ids/xorg-x11-driver-virtualbox-ose
+%dir %{_datadir}/sax
+%dir %{_datadir}/sax/api
+%dir %{_datadir}/sax/api/data
+%dir %{_datadir}/sax/api/data/cdb
+%dir %{_datadir}/sax/sysp
+%dir %{_datadir}/sax/sysp/maps
+%dir %{_datadir}/sax/sysp/maps/update
+%dir %{_var}/lib/hardware
+%dir %{_var}/lib/hardware/ids
+%{_datadir}/sax/api/data/cdb/Cards.xorg-x11-driver-virtualbox-ose
+%{_datadir}/sax/sysp/maps/update/Identity.map.xorg-x11-driver-virtualbox-ose
+%{_var}/lib/hardware/ids/xorg-x11-driver-virtualbox-ose
%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
%{_libdir}/xorg/modules/input/vboxmouse_drv.so
@@ -401,17 +432,45 @@
%{_bindir}/vboxadd-timesync
%{_bindir}/vboxadd-xclient
%{_sbindir}/mountvboxsf
+%{_sysconfdir}/init.d/vboxadd
+%{_sysconfdir}/init.d/vboxvfs
+%{_sysconfdir}/init.d/vboxadd-timesync
+%dir %{_datadir}/virtualbox
+%{_datadir}/virtualbox/x11config.pl
%changelog
+* Mon Apr 07 2008 dmueller@suse.de
+- revert revert of of kbuild package instead of precompiled binaries
+- add patch to always use in-tree yasm
+* Sun Apr 06 2008 bwalle@suse.de
+- revert of of kbuild package instead of precompiled binaries
+ since it didn't work in Factory
+- revert removal of precompiled binaries from the tarball since
+ it didn't work in Factory
+- fix build on 2.6.25
+* Thu Apr 03 2008 dmueller@suse.de
+- use kbuild package instead of precompiled binaries in tarball
+- remove precompiled binaries from the tarball
+* Tue Mar 11 2008 mkudlvasr@suse.cz
+- add init scripts for guest tools and x11 configuration script
+- update README.suse
+* Thu Feb 28 2008 dmueller@suse.de
+- merge factory and buildservice packages
* Wed Feb 27 2008 mkudlvasr@suse.cz
- created symlink to VBoxTunctl in /usr/bin. VBoxAddIf should work ok now
* Tue Feb 26 2008 mkudlvasr@suse.cz
- re-added script which strips unneded parts of code [bug 270552]
+* Tue Feb 26 2008 suse-tux@gmx.de
+- new upstream version 1.5.6
+- fixed Makefile for building the vboxdrv module
+* Thu Feb 21 2008 suse-tux@gmx.de
+- fixed Requires for the guest-tools (typo which was due to the rename)
+- minor spec fixes (replaced some hardcoded paths with the corresponding rpm macros)
* Wed Feb 20 2008 dmueller@suse.de
- fix factory/x86_64 buildrequires
* Fri Feb 15 2008 dmueller@suse.de
- rename xorg-x11-driver-virtualbox to xorg-x11-driver-virtualbox-ose
-* Wed Feb 13 2008 dmueller@suse.de
+* Thu Feb 14 2008 dmueller@suse.de
- go back to gcc 4.1 for Factory, otherwise it does not work
* Tue Feb 12 2008 dmueller@suse.de
- rename to virtualbox-ose
++++++ Makefile ++++++
--- virtualbox-ose/Makefile 2008-02-12 18:21:37.000000000 +0100
+++ /mounts/work_src_done/STABLE/virtualbox-ose/Makefile 2008-04-06 16:45:38.000000000 +0200
@@ -5,11 +5,19 @@
ifndef CONFIG_VBOXDRV_FIXEDMAJOR
KFLAGS += -DCONFIG_VBOXDRV_AS_MISC
endif
-ifeq ($(BUILD_TARGET_ARCH),amd64)
+#ifeq ($(BUILD_TARGET_ARCH),amd64)
+# KFLAGS += -DRT_ARCH_AMD64
+#else
+# KFLAGS += -DRT_ARCH_X86
+#endif
+
+# bwalle
+ifeq ($(xARCH),x86_64)
KFLAGS += -DRT_ARCH_AMD64
else
KFLAGS += -DRT_ARCH_X86
endif
+# end bwalle
#
# Without IDT patching. See defetct #2160.
@@ -25,6 +33,10 @@
EXTRA_CFLAGS += $(addprefix -I$(KBUILD_EXTMOD),/ /include) $(KFLAGS)
+# bwalle
+EXTRA_CFLAGS += -I$(xPWD)/r0drv/linux/
+# end bwalle
+
vboxdrv-obj-y = \
linux/SUPDrv-linux.o \
SUPDRVShared.o \
@@ -37,8 +49,8 @@
r0drv/linux/semaphore-r0drv-linux.o \
r0drv/linux/spinlock-r0drv-linux.o \
r0drv/linux/thread-r0drv-linux.o \
- r0drv/memobj-r0drv.o \
- r0drv/linux/memobj-r0drv-linux.o
+ r0drv/memobj-r0drv.o \
+ r0drv/linux/memobj-r0drv-linux.o
vboxdrv-objs := $(vboxdrv-obj-y)
obj-m += vboxdrv.o
++++++ README.SUSE ++++++
--- virtualbox-ose/README.SUSE 2008-02-12 18:22:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/virtualbox-ose/README.SUSE 2008-04-01 22:19:29.000000000 +0200
@@ -1,6 +1,6 @@
QUICKSTART
- * Load the VirtualBox kernel-module: modprobe vboxdrv
+ * Load the VirtualBox kernel-module: /etc/init.d/vboxdrv setup
Note: if you are running virtualbox on an x86_64 (amd64) machine you
probably will have problems with loading the kernel module.
@@ -22,16 +22,17 @@
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.
+ VirtualBox kernel module should be loaded automaticaly by
+ /etc/init.d/vboxdrv in runlevels 3 and 5
GUEST ADDITIONS
Are packaged, for the virtualbox-guest-tools you need the kernel modules
- and you have to load vboxadd and vboxvfs.
+ and you have to use init scripts vboxadd and vboxvfs.
+
If you install the xorg modules you can configure the video card running:
- sax2 -m 0=vboxvideo
+ sax2 -m 0=vboxvideo . You can also try /usr/share/virtualbox/x11config.pl
+ to configure vboxvideo and vboxmouse.
The guest additions for Windows are available at:
http://code.google.com/p/virtual-box-windows-guest-additions-installer/
++++++ vbox-2.6.25 ++++++
---
src/VBox/Additions/linux/sharedfolders/vfsmod.c | 4 ++++
src/VBox/Runtime/r0drv/linux/the-linux-kernel.h | 16 +++++++++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
--- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c
@@ -329,10 +329,12 @@ sf_clear_inode (struct inode *inode)
the only thing that is known about inode at this point is its index
hence we can't do anything here, and let lookup/whatever with the
job to properly fill then [inode] */
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25)
static void
sf_read_inode (struct inode *inode)
{
}
+#endif
/* vfs is done with [sb] (umount called) call [sf_glob_free] to unmap
the folder and free [sf_g] */
@@ -370,7 +372,9 @@ sf_remount_fs (struct super_block *sb, i
static struct super_operations sf_super_ops = {
.clear_inode = sf_clear_inode,
+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25)
.read_inode = sf_read_inode,
+#endif
.put_super = sf_put_super,
.statfs = sf_statfs,
.remount_fs = sf_remount_fs
--- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
@@ -225,11 +225,21 @@ DECLINLINE(unsigned long) msecs_to_jiffi
#undef bool
/*
- * There are post-2.6.24 kernels (confusingly with unchanged version number)
- * which eliminate macros which were marked as deprecated.
+ * The 2.6.25 kernel eliminates macros that were marked as deprecated and eliminates
+ * routine change_page_attr() in favor of the set_pages_* API.
*/
-#ifndef __attribute_used__
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
#define __attribute_used__ __used
+
+static inline int my_change_page_attr(struct page *page, int numpages, pgprot_t prot)
+{
+ /* use the set_pages_* API */
+ if (pgprot_val(prot) & _PAGE_NX)
+ set_pages_nx(page, numpages);
+ set_pages_uc(page, numpages);
+ return 0;
+}
+#define change_page_attr(a,b,c) my_change_page_attr((a), (b), (c))
#endif
#endif
++++++ vbox-buildfix ++++++
---
Config.kmk | 9 ++++++++-
src/VBox/Runtime/Makefile.kmk | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
--- a/Config.kmk
+++ b/Config.kmk
@@ -1216,7 +1216,14 @@ ifneq ($(filter linux,$(BUILD_TARGET)),)
kernelpath := $(realpath $(VBOX_LINUX_SRC)/$(kernelsrc))
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 ($(BUILD_TARGET_ARCH),x86)
VBOX_LINUX_INCS += $(kernelpath)/include/asm-i386/mach-default \
--- a/src/VBox/Runtime/Makefile.kmk
+++ b/src/VBox/Runtime/Makefile.kmk
@@ -58,6 +58,7 @@ endif
# global (for now at least)
INCS += include
+INCS += /usr/include
ifneq ($(wildcard ./kLdr/kLdrModMachO.c),)
ifeq ($(filter-out darwin win os2,$(BUILD_TARGET)),)
++++++ vbox-vboxfs-2.6.25 ++++++
---
src/VBox/Additions/linux/sharedfolders/Makefile.kmk | 4 ++--
src/VBox/Additions/linux/sharedfolders/dirops.c | 17 +++++++++++++++++
src/VBox/Additions/linux/sharedfolders/vfsmod.c | 8 ++++++++
3 files changed, 27 insertions(+), 2 deletions(-)
--- a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
+++ b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
@@ -31,11 +31,11 @@ include files_vboxvfs
#
# Install the source.
#
-vboxvfs-bin_INST = $(INST_ADDITIONS)/src/vboxvfs
+vboxvfs-bin_INST = $(INST_ADDITIONS)src/vboxvfs/
vboxvfs-bin_MODE = a+r,u+w
vboxvfs-bin_SOURCES = $(subst ",,$(FILES_VBOXVFS_NOBIN))
-vboxvfs-sh_INST = $(INST_ADDITIONS)/src/vboxvfs
+vboxvfs-sh_INST = $(INST_ADDITIONS)src/vboxvfs/
vboxvfs-sh_MODE = a+rx,u+w
vboxvfs-sh_SOURCES = $(subst ",,$(FILES_VBOXVFS_BIN))
--- a/src/VBox/Additions/linux/sharedfolders/dirops.c
+++ b/src/VBox/Additions/linux/sharedfolders/dirops.c
@@ -286,7 +286,11 @@ sf_lookup (struct inode *parent, struct
}
ino = iunique (parent->i_sb, 1);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25)
+ inode = iget_locked (parent->i_sb, ino);
+#else
inode = iget (parent->i_sb, ino);
+#endif
if (!inode) {
elog2 ("iget failed\n");
err = -ENOMEM; /* XXX: ??? */
@@ -296,6 +300,10 @@ sf_lookup (struct inode *parent, struct
SET_INODE_INFO (inode, sf_new_i);
sf_init_inode (sf_g, inode, &fsinfo);
sf_new_i->path = path;
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25)
+ unlock_new_inode(inode);
+#endif
}
sf_i->force_restat = 0;
@@ -338,7 +346,11 @@ sf_instantiate (const char *caller, stru
}
ino = iunique (parent->i_sb, 1);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25)
+ inode = iget_locked (parent->i_sb, ino);
+#else
inode = iget (parent->i_sb, ino);
+#endif
if (!inode) {
elog3 ("%s: %s: iget failed\n", caller, __func__);
err = -ENOMEM;
@@ -354,6 +366,11 @@ sf_instantiate (const char *caller, stru
sf_new_i->force_restat = 1;
d_instantiate (dentry, inode);
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25)
+ unlock_new_inode(inode);
+#endif
+
return 0;
fail1:
--- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c
@@ -257,7 +257,11 @@ sf_read_super_aux (struct super_block *s
sb->s_blocksize = 1024;
sb->s_op = &sf_super_ops;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25)
+ iroot = iget_locked (sb, 0);
+#else
iroot = iget (sb, 0);
+#endif
if (!iroot) {
err = -ENOMEM; /* XXX */
elog2 ("could not get root inode\n");
@@ -267,6 +271,10 @@ sf_read_super_aux (struct super_block *s
sf_init_inode (sf_g, iroot, &fsinfo);
SET_INODE_INFO (iroot, sf_i);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25)
+ unlock_new_inode(iroot);
+#endif
+
droot = d_alloc_root (iroot);
if (!droot) {
err = -ENOMEM; /* XXX */
++++++ VirtualBox-1.5.4_OSE-patched.tar.bz2 -> VirtualBox-1.5.6_OSE-patched.tar.bz2 ++++++
virtualbox-ose/VirtualBox-1.5.4_OSE-patched.tar.bz2 /mounts/work_src_done/STABLE/virtualbox-ose/VirtualBox-1.5.6_OSE-patched.tar.bz2 differ: byte 11, line 1
++++++ VirtualBox-1.5.4_OSE.tar.bz2 -> VirtualBox-1.5.6_OSE.tar.bz2 ++++++
virtualbox-ose/VirtualBox-1.5.4_OSE.tar.bz2 /mounts/work_src_done/STABLE/virtualbox-ose/VirtualBox-1.5.6_OSE.tar.bz2 differ: byte 11, line 1
++++++ virtualbox-gcc43-fixes.diff ++++++
--- /var/tmp/diff_new_pack.vy9927/_old 2008-04-10 13:57:38.000000000 +0200
+++ /var/tmp/diff_new_pack.vy9927/_new 2008-04-10 13:57:38.000000000 +0200
@@ -1,15 +1,5 @@
---- src/VBox/Main/VMMDevInterface.cpp.old 2008-01-27 16:50:02.000000000 +0100
-+++ src/VBox/Main/VMMDevInterface.cpp 2008-01-27 16:50:28.000000000 +0100
-@@ -27,6 +27,7 @@
- #include
- #include
- #include
-+#include
-
- #ifdef VBOX_HGCM
- #include "hgcm/HGCM.h"
---- src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp.old 2008-01-27 16:49:32.000000000 +0100
-+++ src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-01-27 16:49:48.000000000 +0100
+--- src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
++++ src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
@@ -28,6 +28,8 @@
#include "VBoxRegistrationDlg.h"
#endif
@@ -19,3 +9,13 @@
#include
#include
#include
+--- src/VBox/Main/VMMDevInterface.cpp
++++ src/VBox/Main/VMMDevInterface.cpp
+@@ -27,6 +27,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #ifdef VBOX_HGCM
+ #include "hgcm/HGCM.h"
++++++ virtualbox-ose-init-scripts.diff ++++++
--- src/VBox/Additions/linux/installer/vboxadd.sh
+++ src/VBox/Additions/linux/installer/vboxadd.sh
@@ -104,7 +104,7 @@
}
fi
-kdir=/lib/modules/`uname -r`/misc
+kdir=/lib/modules/`uname -r`/updates
dev=/dev/vboxadd
modname=vboxadd
module=$kdir/$modname
--- src/VBox/Additions/linux/installer/vboxvfs.sh
+++ src/VBox/Additions/linux/installer/vboxvfs.sh
@@ -104,7 +104,7 @@
}
fi
-kdir=/lib/modules/`uname -r`/misc
+kdir=/lib/modules/`uname -r`/updates
modname=vboxvfs
module="$kdir/$modname"
--- src/VBox/Installer/linux/vboxdrv.sh
+++ src/VBox/Installer/linux/vboxdrv.sh
@@ -106,7 +106,7 @@
fi
-kdir=/lib/modules/`uname -r`/misc
+kdir=/lib/modules/`uname -r`/updates
dev=/dev/vboxdrv
modname=vboxdrv
groupname=vboxusers
@@ -187,17 +187,8 @@
}
setup() {
- . "$CONFIG"
stop
- if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then
- begin "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 "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
}
++++++ virtualbox-patch-source ++++++
--- virtualbox-ose/virtualbox-patch-source 2008-02-12 18:22:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-patch-source 2008-04-07 19:13:16.000000000 +0200
@@ -1,6 +1,16 @@
#!/bin/bash
-REMOVE_DIRS=( WINNT os2 )
+REMOVE_DIRS=(
+src/VBox/Additions/WINNT
+src/VBox/Additions/os2
+kBuild
+tools/darwin.x86
+tools/freebsd.x86
+tools/os2.x86
+tools/solaris.x86
+tools/win.amd64
+tools/win.x86
+)
set -o errexit
@@ -12,7 +22,7 @@
trap "rm -rf \"$BASENAME-patched.tar\" \"$BASENAME-patched.tar.bz2\"" ERR
for (( N=0 ; N<${#REMOVE_DIRS[@]} ; N++ )) ; do
- REMOVE_DIRS[N]="$BASENAME/src/VBox/Additions/${REMOVE_DIRS[N]}"
+ REMOVE_DIRS[N]="$BASENAME/${REMOVE_DIRS[N]}"
done
cd "$SOURCEDIR" >/dev/null
++++++ virtualbox-system-yasm.diff ++++++
--- Config.kmk
+++ Config.kmk
@@ -861,7 +861,7 @@
# We need to export YASM for OSE, but since it was converted to .zip we need to
# allow for the location used by the zip to be properly cleaned up first.
ifeq ($(filter-out win.x86 linux.x86 solaris.x86, $(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),)
- PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
+ PATH_TOOL_YASM ?= /usr/bin
endif
# XPCOM setup for all but win32.
--- configure
+++ configure
@@ -468,8 +468,8 @@
yasm_min=`echo $yasm_ver|cut -d. -f2`
yasm_rev=`echo $yasm_ver|cut -d. -f3`
yasm_ver_mul=`expr $yasm_maj \* 10000 + $yasm_min \* 100 + $yasm_rev`
- if [ $yasm_ver_mul -lt 501 ]; then
- log_failure "found version $yasm_ver, expected at least 0.5.1"
+ if [ $yasm_ver_mul -lt 600 ]; then
+ log_failure "found version $yasm_ver, expected at least 0.6.0"
fail
else
log_success "found version $yasm_ver"
@@ -1503,7 +1503,7 @@
[ "$OS" != "darwin" ] && check_bcc
[ "$OS" != "darwin" ] && check_iasl
# don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
-# [ "$OS" != "darwin" ] && check_yasm
+[ "$OS" != "darwin" ] && check_yasm
[ "$OS" != "darwin" ] && check_xsltproc
[ $OSE -eq 0 ] && check_mkisofs
++++++ virtualbox-use-intree-yasm.diff ++++++
--- Config.kmk.orig
+++ Config.kmk
@@ -860,7 +860,7 @@
# We need to export YASM for OSE, but since it was converted to .zip we need to
# allow for the location used by the zip to be properly cleaned up first.
-ifeq ($(filter-out win.x86 linux.x86 solaris.x86, $(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),)
+ifeq ($(filter-out win.x86 linux.x86 linux.amd64 solaris.x86, $(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),)
PATH_TOOL_YASM ?= $(PATH_DEVTOOLS_BLD)/bin
endif
++++++ virtualbox-validate-op-gcc43.diff ++++++
--- /var/tmp/diff_new_pack.vy9927/_old 2008-04-10 13:57:38.000000000 +0200
+++ /var/tmp/diff_new_pack.vy9927/_new 2008-04-10 13:57:38.000000000 +0200
@@ -1,8 +1,8 @@
Index: src/recompiler/InnoTek/op-validate.sed
-===================================================================
---- src/recompiler/InnoTek/op-validate.sed.orig
+================================================================================
+--- src/recompiler/InnoTek/op-validate.sed
+++ src/recompiler/InnoTek/op-validate.sed
-@@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan
+@@ -63,6 +63,8 @@
/\.Lfe[0-9][0-9]*:/d
/\.LFE[0-9][0-9]*:/d
/size[[:space:]]/d
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org