Accepting request 59258 from home:elvigia:branches:Virtualization

OBS-URL: https://build.opensuse.org/request/show/59258
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=26

vbox-2.6.38.patch

@@ -0,0 +1,60 @@
+--- include/iprt/types.h.orig
++++ include/iprt/types.h
+@@ -101,9 +101,6 @@ RT_C_DECLS_END
+ #  define true linux_true
+ #  define false linux_false
+ #  define uintptr_t linux_uintptr_t
+-#  ifndef AUTOCONF_INCLUDED
+-#   include <linux/autoconf.h>
+-#  endif
+ #  include <linux/types.h>
+ #  include <linux/stddef.h>
+ #  undef uintptr_t
+--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig
++++ src/VBox/HostDrivers/Support/SUPDrvInternal.h
+@@ -75,9 +75,6 @@
+     RT_C_DECLS_END
+ 
+ #elif defined(RT_OS_LINUX)
+-#   ifndef AUTOCONF_INCLUDED
+-#    include <linux/autoconf.h>
+-#   endif
+ #   include <linux/version.h>
+ #   if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
+ #       define MODVERSIONS
+--- src/VBox/Runtime/r0drv/linux/the-linux-kernel.h.orig
++++ src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
+@@ -34,9 +34,6 @@
+ #include <iprt/types.h>
+ #define bool linux_bool
+ 
+-#ifndef AUTOCONF_INCLUDED
+-# include <linux/autoconf.h>
+-#endif
+ #include <linux/version.h>
+ 
+ /* We only support 2.4 and 2.6 series kernels */
+--- src/VBox/Runtime/include/internal/iprt.h.orig
++++ src/VBox/Runtime/include/internal/iprt.h
+@@ -39,9 +39,6 @@
+  && defined(MODULE) \
+  && !defined(RT_NO_EXPORT_SYMBOL)
+ # define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */
+-# ifndef AUTOCONF_INCLUDED
+-#  include <linux/autoconf.h>
+-# endif
+ # if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
+ #  include <linux/version.h>
+ #  define MODVERSIONS
+--- src/VBox/Additions/linux/drm/vboxvideo_drm.c.orig
++++ src/VBox/Additions/linux/drm/vboxvideo_drm.c
+@@ -49,9 +49,6 @@
+  *    Gareth Hughes <gareth@valinux.com>
+  */
+ 
+-#ifndef AUTOCONF_INCLUDED
+-# include <linux/autoconf.h>
+-#endif
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include "version-generated.h"

virtualbox.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 27 12:47:31 UTC 2011 - cristian.rodriguez@opensuse.org
+
+- Fix build in 2.6.38 kernels. 
+
 -------------------------------------------------------------------
 Wed Jan 26 16:36:42 UTC 2011 - cristian.rodriguez@opensuse.org
 

virtualbox.spec

@@ -91,6 +91,7 @@ Patch101:       vbox-default-os-type.diff
 #disable update in vbox gui
 Patch102:         vbox-disable-updates.diff
 #
+Patch103:       vbox-2.6.38.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         pwdutils permissions
 Requires:       %{name}-host-kmp = %version
@@ -205,6 +206,7 @@ Development file for %{name}
 %patch100
 %patch101
 %patch102 -p1
+%patch103
 #copy user manual
 %__cp %{S:1} ./UserManual.pdf