Author: lkundrak Update of /cvs/free/rpms/VirtualBox-OSE-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv547 Modified Files: VirtualBox-OSE-kmod.spec Added Files: VirtualBox-OSE-3.2.10-linux-2.6.37.patch Log Message: Fix build with 2.6.37 VirtualBox-OSE-3.2.10-linux-2.6.37.patch: vboxvideo_drm.c | 3 +++ 1 file changed, 3 insertions(+) --- NEW FILE VirtualBox-OSE-3.2.10-linux-2.6.37.patch --- svn log -c33754 http://www.virtualbox.org/svn/vbox/trunk ------------------------------------------------------------------------ r33754 | vboxsync | 2010-11-04 09:56:02 +0100 (Thu, 04 Nov 2010) | 2 lines Additions/linux/drm: Linux 2.6.37 fix ------------------------------------------------------------------------ svn diff -c33754 http://www.virtualbox.org/svn/vbox/trunk Index: src/VBox/Additions/linux/drm/vboxvideo_drm.c =================================================================== --- src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 33753) +++ src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 33754) @@ -78,8 +78,11 @@ /* .driver_features = DRIVER_USE_MTRR, */ .load = vboxvideo_driver_load, .reclaim_buffers = drm_core_reclaim_buffers, + /* As of Linux 2.65.37, always the internal functions are used. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 37) .get_map_ofs = drm_core_get_map_ofs, .get_reg_ofs = drm_core_get_reg_ofs, +#endif .fops = { .owner = THIS_MODULE, .open = drm_open, Index: VirtualBox-OSE-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/devel/VirtualBox-OSE-kmod.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- VirtualBox-OSE-kmod.spec 16 Nov 2010 08:25:59 -0000 1.45 +++ VirtualBox-OSE-kmod.spec 11 Jan 2011 08:38:53 -0000 1.46 @@ -19,7 +19,7 @@ Name: VirtualBox-OSE-kmod Version: 3.2.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kernel module for VirtualBox-OSE Group: System Environment/Kernel @@ -27,6 +27,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox # This filters out the XEN kernel, since we don't run on XEN Source1: VirtualBox-OSE-kmod-1.6.4-kernel-variants.txt +Patch0: VirtualBox-OSE-3.2.10-linux-2.6.37.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-OSE-kmodsrc = %{version}%{?prereltag}, xz @@ -50,6 +51,7 @@ %prep %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz +%{__patch} %{?_default_patch_flags} %{name}-%{version}/vboxvideo/vboxvideo_drm.c <%{PATCH0} # error out if there was something wrong with kmodtool %{?kmodtool_check} @@ -98,6 +100,9 @@ %changelog +* Tue Jan 11 2011 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.2.10-2 +- Fix build with 2.6.37 + * Tue Nov 16 2010 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.2.10-1 - New release