1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
#!/bin/sh /usr/share/dpatch/dpatch-run
# Description: Fix ARCH setting in modules Makefiles.
# Author: Michael Meskes <meskes@debian.org>
@DPATCH@
diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/linux/sharedfolders/Makefile.module virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module
--- virtualbox-ose-3.0.8-dfsg~/src/VBox/Additions/linux/sharedfolders/Makefile.module 2009-10-07 11:27:13.000000000 +0200
+++ virtualbox-ose-3.0.8-dfsg/src/VBox/Additions/linux/sharedfolders/Makefile.module 2009-10-07 13:43:30.705472033 +0200
@@ -37,9 +37,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
- BUILD_TARGET_ARCH := x86
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
else
- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ ifeq ($(ARCH),x86)
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
+ else
+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ endif
endif
endif
else
diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/Support/linux/Makefile virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/Support/linux/Makefile
--- virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/Support/linux/Makefile 2009-10-07 11:27:14.000000000 +0200
+++ virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/Support/linux/Makefile 2009-10-07 13:43:30.705472033 +0200
@@ -48,9 +48,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
- BUILD_TARGET_ARCH := x86
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
else
- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ ifeq ($(ARCH),x86)
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
+ else
+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ endif
endif
endif
else
diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
--- virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2009-10-07 11:27:14.000000000 +0200
+++ virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2009-10-07 13:43:30.705472033 +0200
@@ -39,9 +39,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
- BUILD_TARGET_ARCH := x86
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
else
- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ ifeq ($(ARCH),x86)
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
+ else
+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ endif
endif
endif
else
diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
--- virtualbox-ose-3.0.8-dfsg~/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2009-10-07 11:27:14.000000000 +0200
+++ virtualbox-ose-3.0.8-dfsg/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2009-10-07 13:43:30.705472033 +0200
@@ -39,9 +39,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
- BUILD_TARGET_ARCH := x86
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
else
- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ ifeq ($(ARCH),x86)
+ ifeq ($(CONFIG_X86_32),y)
+ BUILD_TARGET_ARCH := x86
+ else
+ BUILD_TARGET_ARCH := amd64
+ endif
+ else
+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
+ endif
endif
endif
else
|