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