← Back to branch summary

~ubuntu-branches/ubuntu/utopic/open-vm-tools/utopic

« back to all changes in this revision

Viewing changes to .pc/0001-kvers.patch/modules/linux/vmci/Makefile

  • Committer: Package Import Robot
  • Author(s): Bernd Zeimetz, 31c30832
  • Date: 2014-01-08 20:28:33 UTC
  • mfrom: (1.4.14) (2.4.42 sid)
  • Revision ID: package-import@ubuntu.com-20140108202833-l0ycdpzq5ayadedn
Tags: 2:9.4.0-1280544-5
[31c30832] Revert "Enable building of vmci again."
This reverts commit 0d55577cd3c262dbbc2bf79593d6f500f84c4170.
Too fast upload, sorry. vmhgfs is indeed (still) broken with
vmci.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/0001-kvers.patch/modules/linux/vmci/Makefile
67
67
ifndef VM_KBUILD
68
68
VM_KBUILD := no
69
69
ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes)
70
 
VM_KBUILD := yes
 
70
ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes)
 
71
VM_KBUILD := 26
 
72
endif
71
73
endif
72
74
export VM_KBUILD
73
75
endif
76
78
ifeq ($(VM_KBUILD), no)
77
79
VM_DUMMY := $(shell echo >&2 "Using standalone build system.")
78
80
else
79
 
VM_DUMMY := $(shell echo >&2 "Using kernel build system.")
 
81
ifeq ($(VM_KBUILD), 24)
 
82
VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.")
 
83
else
 
84
VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.")
 
85
endif
80
86
endif
81
87
VM_KBUILD_SHOWN := yes
82
88
export VM_KBUILD_SHOWN
89
95
# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles...
90
96
ifeq ($(VERSION),)
91
97
 
 
98
ifeq ($(VM_KBUILD), 24)
 
99
DRIVER_KO := $(DRIVER).o
 
100
else
92
101
DRIVER_KO := $(DRIVER).ko
 
102
endif
93
103
 
94
104
.PHONY: $(DRIVER_KO)
95
105
 
141
151
 
142
152
include $(SRCROOT)/Makefile.kernel
143
153
 
 
154
ifdef TOPDIR
 
155
ifeq ($(VM_KBUILD), 24)
 
156
 
 
157
O_TARGET := $(DRIVER).o
 
158
 
 
159
obj-y := $($(DRIVER)-y)
 
160
 
 
161
include $(TOPDIR)/Rules.make
 
162
endif
 
163
endif
 
164
 
144
165
else
145
166
 
146
167
include $(SRCROOT)/Makefile.normal