| 1 |
jokey 07/12/06 19:14:11 |
| 2 |
|
| 3 |
Modified: virtualbox-modules_2.6.24.patch |
| 4 |
Log: |
| 5 |
Only apply 2.6.24 patch if there is such a kernel and add more patch stuff from upstream, thanks to Bjoern Olausson in bug #199798 |
| 6 |
(Portage version: 2.1.4_rc7) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: virtualbox-modules_2.6.24.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/files/virtualbox-modules_2.6.24.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- virtualbox-modules_2.6.24.patch 5 Dec 2007 23:01:25 -0000 1.1 |
| 22 |
+++ virtualbox-modules_2.6.24.patch 6 Dec 2007 19:14:10 -0000 1.2 |
| 23 |
@@ -1,11 +1,51 @@ |
| 24 |
---- include/iprt/types.h~ 2007-11-20 17:15:54.000000000 +0100 |
| 25 |
-+++ include/iprt/types.h 2007-11-20 17:15:54.000000000 +0100 |
| 26 |
-@@ -69,6 +69,8 @@ |
| 27 |
+Index: include/iprt/types.h |
| 28 |
+=================================================================== |
| 29 |
+--- include/iprt/types.h (revision 5703) |
| 30 |
++++ include/iprt/types.h (revision 5704) |
| 31 |
+@@ -58,8 +58,9 @@ |
| 32 |
+ /* |
| 33 |
+ * Kludge for the linux kernel: |
| 34 |
+ * 1. sys/types.h doesn't mix with the kernel. |
| 35 |
+- * 2. Starting with 2.6.19 linux/types.h typedefs bool and linux/stddef.h |
| 36 |
++ * 2. Starting with 2.6.19, linux/types.h typedefs bool and linux/stddef.h |
| 37 |
+ * declares false and true as enum values. |
| 38 |
++ * 3. Starting with 2.6.24, linux/types.h typedefs uintptr_t. |
| 39 |
+ * We work around these issues here and nowhere else. |
| 40 |
+ */ |
| 41 |
+ # include <stddef.h> |
| 42 |
+@@ -69,8 +70,10 @@ |
| 43 |
# define bool linux_bool |
| 44 |
# define true linux_true |
| 45 |
# define false linux_false |
| 46 |
+# define uintptr_t linux_uintptr_t |
| 47 |
-+# include <linux/autoconf.h> |
| 48 |
# include <linux/types.h> |
| 49 |
# include <linux/stddef.h> |
| 50 |
++# undef uintptr_t |
| 51 |
# undef false |
| 52 |
+ # undef true |
| 53 |
+ # undef bool |
| 54 |
+Index: include/iprt/types.h |
| 55 |
+=================================================================== |
| 56 |
+--- include/iprt/types.h (revision 5764) |
| 57 |
++++ include/iprt/types.h (revision 5765) |
| 58 |
+@@ -71,6 +71,7 @@ |
| 59 |
+ # define true linux_true |
| 60 |
+ # define false linux_false |
| 61 |
+ # define uintptr_t linux_uintptr_t |
| 62 |
++# include <linux/autoconf.h> |
| 63 |
+ # include <linux/types.h> |
| 64 |
+ # include <linux/stddef.h> |
| 65 |
+ # undef uintptr_t |
| 66 |
+Index: Config.kmk |
| 67 |
+=================================================================== |
| 68 |
+--- Config.kmk (revision 5764) |
| 69 |
++++ Config.kmk (revision 5765) |
| 70 |
+@@ -1263,7 +1263,7 @@ |
| 71 |
+ kernelpath := $(VBOX_LINUX_SRC) |
| 72 |
+ endif |
| 73 |
+ ifeq ($(BUILD_TARGET_ARCH),x86) |
| 74 |
+- VBOX_LINUX_INCS += $(kernelpath)/include/asm-i386/mach-default |
| 75 |
++ VBOX_LINUX_INCS += $(kernelpath)/include/asm/mach-default |
| 76 |
+ endif |
| 77 |
+ endif |
| 78 |
+ endif |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
-- |
| 83 |
gentoo-commits@g.o mailing list |
Archives