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
4 VM_UNAME = $(shell uname -r)
6 # Header directory for the running kernel
7 -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
8 +HEADER_DIR = /usr/src/linux/include
10 -BUILD_DIR = $(HEADER_DIR)/..
16 VM_KBUILD_OUTPUT := $(O)
19 -ifeq ($(VM_KBUILD_OUTPUT),)
20 -VM_KBUILD_OUTPUT := $(BUILD_DIR)
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.')
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)
35 -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes)
38 -ifeq ($(shell if $(GREP) "^PATCHLEVEL = 4$$" $(BUILD_DIR)/Makefile > /dev/null 2>&1; then echo "yes"; fi), yes)
47 ifndef VM_KBUILD_SHOWN
50 VMCCVER := $(shell $(CC) -dumpversion)
52 -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles...
55 ifeq ($(VM_KBUILD), 24)
56 DRIVER_KO := $(DRIVER).o
59 $(DRIVER): $(DRIVER_KO)
62 -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler
63 -VM_CCVER := $(VMCCVER)
68 MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES))
71 make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules
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 \
84 include $(SRCROOT)/Makefile.kernel
87 -ifeq ($(VM_KBUILD), 24)
89 -O_TARGET := $(DRIVER).o
91 -obj-y := $($(DRIVER)-y)
93 -include $(TOPDIR)/Rules.make
99 include $(SRCROOT)/Makefile.normal
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
106 -#include <linux/compile.h>
107 +#include <linux/compiler.h>
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
114 VM_UNAME = $(shell uname -r)
116 # Header directory for the running kernel
117 -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
118 +HEADER_DIR = /usr/src/linux/include
120 -BUILD_DIR = $(HEADER_DIR)/..
126 ifeq ($(VM_KBUILD_OUTPUT),)
127 VM_KBUILD_OUTPUT := $(BUILD_DIR)
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.')
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)
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)
154 ifndef VM_KBUILD_SHOWN
157 VMCCVER := $(shell $(CC) -dumpversion)
159 -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles...
162 ifeq ($(VM_KBUILD), 24)
163 DRIVER_KO := $(DRIVER).o
166 auto-build: $(DRIVER_KO)
167 cp -f $< $(SRCROOT)/../$(DRIVER).o
169 -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler
170 -VM_CCVER := $(VMCCVER)
175 MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES))
178 make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules
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 \
191 include $(SRCROOT)/Makefile.kernel
194 -ifeq ($(VM_KBUILD), 24)
196 -O_TARGET := $(DRIVER).o
198 -obj-y := $($(DRIVER)-y)
200 -include $(TOPDIR)/Rules.make
206 include $(SRCROOT)/Makefile.normal