]>
Commit | Line | Data |
---|---|---|
42209adf PS |
1 | --- vmmon-only/Makefile.orig 2004-03-14 20:45:24.000000000 +0100 |
2 | +++ vmmon-only/Makefile 2004-03-29 23:58:30.000000000 +0200 | |
bf538210 PS |
3 | @@ -14,9 +14,9 @@ |
4 | VM_UNAME = $(shell uname -r) | |
5 | ||
6 | # Header directory for the running kernel | |
7 | -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include | |
8 | +HEADER_DIR = /usr/src/linux/include | |
9 | ||
10 | -BUILD_DIR = $(HEADER_DIR)/.. | |
11 | +BUILD_DIR = . | |
12 | ||
13 | DRIVER := vmmon | |
14 | ||
42209adf PS |
15 | @@ -44,32 +44,6 @@ |
16 | VM_KBUILD_OUTPUT := $(O) | |
17 | endif | |
bf538210 | 18 | endif |
42209adf PS |
19 | -ifeq ($(VM_KBUILD_OUTPUT),) |
20 | -VM_KBUILD_OUTPUT := $(BUILD_DIR) | |
21 | -endif | |
bf538210 PS |
22 | -ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) |
23 | -ifeq ($(call vm_check_file,$(VM_KBUILD_OUTPUT)/.config), no) | |
24 | -VM_DUMMY := $(shell echo >&2 '*** Your sources installation is broken:') | |
25 | -VM_DUMMY := $(shell echo >&2 '*** $(BUILD_DIR) does not contain .config file') | |
26 | -VM_DUMMY := $(shell echo >&2 '*** vmmon/vmnet build may fail, or built vmmon/vmnet may crash.') | |
27 | -ifeq ($(call vm_check_file,/boot/vmlinuz.config), yes) | |
28 | -VM_DUMMY := $(shell echo >&2 '*** You are apparently use SuSE system. You should copy') | |
29 | -VM_DUMMY := $(shell echo >&2 '*** /boot/vmlinuz.config to the $(BUILD_DIR)/.config.') | |
30 | -endif | |
31 | -VM_DUMMY := $(shell echo >&2) | |
32 | -VM_DUMMY := $(shell echo >&2 '*** Hit ENTER to continue, or ^C to stop build.') | |
33 | -VM_DUMMY := $(shell read dummy) | |
34 | -else | |
42209adf PS |
35 | -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) |
36 | -VM_KBUILD := 26 | |
37 | -else | |
bf538210 PS |
38 | -ifeq ($(shell if $(GREP) "^PATCHLEVEL = 4$$" $(BUILD_DIR)/Makefile > /dev/null 2>&1; then echo "yes"; fi), yes) |
39 | -VM_KBUILD := 24 | |
40 | -endif | |
bf538210 PS |
41 | -endif |
42 | -endif | |
43 | -endif | |
44 | -export VM_KBUILD | |
45 | endif | |
46 | ||
47 | ifndef VM_KBUILD_SHOWN | |
42209adf | 48 | @@ -90,9 +64,6 @@ |
bf538210 PS |
49 | |
50 | VMCCVER := $(shell $(CC) -dumpversion) | |
51 | ||
52 | -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... | |
53 | -ifeq ($(VERSION),) | |
54 | - | |
55 | ifeq ($(VM_KBUILD), 24) | |
56 | DRIVER_KO := $(DRIVER).o | |
57 | else | |
42209adf PS |
58 | @@ -105,41 +76,13 @@ |
59 | $(DRIVER): $(DRIVER_KO) | |
60 | cp -f $< $@ | |
bf538210 PS |
61 | |
62 | -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler | |
63 | -VM_CCVER := $(VMCCVER) | |
64 | -export VM_CCVER | |
65 | -VM_CC := $(CC) | |
66 | -export VM_CC | |
67 | - | |
68 | MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) | |
69 | ||
70 | $(DRIVER_KO): | |
71 | make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules | |
72 | ||
73 | -else | |
74 | - | |
75 | -ifneq ($(VM_CCVER), $(VMCCVER)) | |
76 | -$(warning *** Inappropriate build environment: you wanted to use gcc \ | |
77 | - version $(VM_CCVER) while kernel attempts to use gcc version $(VMCCVER).) | |
78 | -$(error For proper build you'll have to replace $(CC) with symbolic \ | |
79 | - link to $(VM_CC)) | |
80 | -endif | |
81 | - | |
82 | -endif | |
83 | - | |
84 | include $(SRCROOT)/Makefile.kernel | |
85 | ||
86 | -ifdef TOPDIR | |
87 | -ifeq ($(VM_KBUILD), 24) | |
88 | - | |
89 | -O_TARGET := $(DRIVER).o | |
90 | - | |
91 | -obj-y := $($(DRIVER)-y) | |
92 | - | |
93 | -include $(TOPDIR)/Rules.make | |
94 | -endif | |
95 | -endif | |
96 | - | |
97 | else | |
98 | ||
99 | include $(SRCROOT)/Makefile.normal | |
42209adf PS |
100 | --- vmmon-only/linux/hostif_compat.h.orig 2004-03-30 00:01:40.071406800 +0200 |
101 | +++ vmmon-only/linux/hostif_compat.h 2004-03-29 23:59:46.057739512 +0200 | |
102 | @@ -297,7 +297,7 @@ | |
103 | return 0; | |
104 | } | |
105 | ||
106 | -#include <linux/compile.h> | |
107 | +#include <linux/compiler.h> | |
108 | ||
109 | #define prop_hex(key,digits,val) \ | |
110 | asm volatile(".section \".properties\"\n\t" \ | |
111 | --- vmnet-only/Makefile.orig 2004-02-18 18:14:53.000000000 +0100 | |
112 | +++ vmnet-only/Makefile 2004-03-30 00:08:12.821699680 +0200 | |
bf538210 PS |
113 | @@ -14,9 +14,9 @@ |
114 | VM_UNAME = $(shell uname -r) | |
115 | ||
116 | # Header directory for the running kernel | |
117 | -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include | |
118 | +HEADER_DIR = /usr/src/linux/include | |
119 | ||
120 | -BUILD_DIR = $(HEADER_DIR)/.. | |
121 | +BUILD_DIR = . | |
122 | ||
123 | DRIVER := vmnet | |
124 | ||
125 | @@ -47,29 +47,6 @@ | |
126 | ifeq ($(VM_KBUILD_OUTPUT),) | |
127 | VM_KBUILD_OUTPUT := $(BUILD_DIR) | |
128 | endif | |
129 | -ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) | |
130 | -ifeq ($(call vm_check_file,$(VM_KBUILD_OUTPUT)/.config), no) | |
131 | -VM_DUMMY := $(shell echo >&2 '*** Your sources installation is broken:') | |
132 | -VM_DUMMY := $(shell echo >&2 '*** $(BUILD_DIR) does not contain .config file') | |
133 | -VM_DUMMY := $(shell echo >&2 '*** vmmon/vmnet build may fail, or built vmmon/vmnet may crash.') | |
134 | -ifeq ($(call vm_check_file,/boot/vmlinuz.config), yes) | |
135 | -VM_DUMMY := $(shell echo >&2 '*** You are apparently use SuSE system. You should copy') | |
136 | -VM_DUMMY := $(shell echo >&2 '*** /boot/vmlinuz.config to the $(BUILD_DIR)/.config.') | |
137 | -endif | |
138 | -VM_DUMMY := $(shell echo >&2) | |
139 | -VM_DUMMY := $(shell echo >&2 '*** Hit ENTER to continue, or ^C to stop build.') | |
140 | -VM_DUMMY := $(shell read dummy) | |
141 | -else | |
142 | -ifeq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) | |
143 | -ifeq ($(shell if $(GREP) "^PATCHLEVEL = 4$$" $(BUILD_DIR)/Makefile > /dev/null 2>&1; then echo "yes"; fi), yes) | |
144 | -VM_KBUILD := 24 | |
145 | -endif | |
146 | -else | |
147 | -VM_KBUILD := 26 | |
148 | -endif | |
149 | -endif | |
150 | -endif | |
151 | -export VM_KBUILD | |
152 | endif | |
153 | ||
154 | ifndef VM_KBUILD_SHOWN | |
155 | @@ -90,9 +67,6 @@ | |
156 | ||
157 | VMCCVER := $(shell $(CC) -dumpversion) | |
158 | ||
159 | -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... | |
160 | -ifeq ($(VERSION),) | |
161 | - | |
162 | ifeq ($(VM_KBUILD), 24) | |
163 | DRIVER_KO := $(DRIVER).o | |
164 | else | |
165 | @@ -102,41 +76,13 @@ | |
166 | auto-build: $(DRIVER_KO) | |
167 | cp -f $< $(SRCROOT)/../$(DRIVER).o | |
168 | ||
169 | -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler | |
170 | -VM_CCVER := $(VMCCVER) | |
171 | -export VM_CCVER | |
172 | -VM_CC := $(CC) | |
173 | -export VM_CC | |
174 | - | |
175 | MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) | |
176 | ||
177 | $(DRIVER_KO): | |
178 | make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules | |
179 | ||
180 | -else | |
181 | - | |
182 | -ifneq ($(VM_CCVER), $(VMCCVER)) | |
183 | -$(warning *** Inappropriate build environment: you wanted to use gcc \ | |
184 | - version $(VM_CCVER) while kernel attempts to use gcc version $(VMCCVER).) | |
185 | -$(error For proper build you'll have to replace $(CC) with symbolic \ | |
186 | - link to $(VM_CC)) | |
187 | -endif | |
188 | - | |
189 | -endif | |
190 | - | |
191 | include $(SRCROOT)/Makefile.kernel | |
192 | ||
193 | -ifdef TOPDIR | |
194 | -ifeq ($(VM_KBUILD), 24) | |
195 | - | |
196 | -O_TARGET := $(DRIVER).o | |
197 | - | |
198 | -obj-y := $($(DRIVER)-y) | |
199 | - | |
200 | -include $(TOPDIR)/Rules.make | |
201 | -endif | |
202 | -endif | |
203 | - | |
204 | else | |
205 | ||
206 | include $(SRCROOT)/Makefile.normal |