Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Vadim Kuznetsov (vadimk)" <vadimk@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files: 264-netdevice.patch 264-makefile-include.patch 264-jobserver.patch 264-makefile-kernel-dir.patch
Date: Sat, 03 Dec 2011 20:04:29
Message-Id: 20111203200415.670F52004C@flycatcher.gentoo.org
1 vadimk 11/12/03 20:04:15
2
3 Added: 264-netdevice.patch 264-makefile-include.patch
4 264-jobserver.patch 264-makefile-kernel-dir.patch
5 Log:
6 vmware desktop version bump
7
8 (Portage version: 2.1.10.39/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 app-emulation/vmware-modules/files/264-netdevice.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-netdevice.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-netdevice.patch?rev=1.1&content-type=text/plain
15
16 Index: 264-netdevice.patch
17 ===================================================================
18 diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
19 index 7a56304..9ff4548 100644
20 --- a/vmnet-only/compat_netdevice.h
21 +++ b/vmnet-only/compat_netdevice.h
22 @@ -47,6 +47,19 @@
23 # define net_device device
24 #endif
25
26 +/* it looks like these have been removed from the kernel 3.1
27 + * probably because the "transition" is considered complete.
28 + * so to keep this source compatible we just redefine them like they were
29 + * previously
30 + */
31 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
32 +#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
33 + functions are available. */
34 +#define HAVE_FREE_NETDEV /* free_netdev() */
35 +#define HAVE_NETDEV_PRIV /* netdev_priv() */
36 +#define HAVE_NETIF_QUEUE
37 +#define HAVE_NET_DEVICE_OPS
38 +#endif
39
40 /*
41 * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
42
43
44
45 1.1 app-emulation/vmware-modules/files/264-makefile-include.patch
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-makefile-include.patch?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-makefile-include.patch?rev=1.1&content-type=text/plain
49
50 Index: 264-makefile-include.patch
51 ===================================================================
52 diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
53 index ab7a727..e3ec9d2 100644
54 --- a/vmblock-only/Makefile.kernel
55 +++ b/vmblock-only/Makefile.kernel
56 @@ -19,7 +19,7 @@
57
58 INCLUDE += -I$(SRCROOT)/include
59
60 -EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
61 +EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
62
63 EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
64 EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
65 diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
66 index ba343ee..861ea83 100644
67 --- a/vmci-only/Makefile.kernel
68 +++ b/vmci-only/Makefile.kernel
69 @@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
70
71 INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
72
73 -EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
74 +EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
75
76 obj-m += $(DRIVER).o
77
78 diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
79 index 8770d1d..c4746c3 100644
80 --- a/vmmon-only/Makefile.kernel
81 +++ b/vmmon-only/Makefile.kernel
82 @@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
83 INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
84 -I$(SRCROOT)/vmcore
85
86 -EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
87 +EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
88
89 EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
90
91 diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
92 index d1e3133..665d428 100644
93 --- a/vmnet-only/Makefile.kernel
94 +++ b/vmnet-only/Makefile.kernel
95 @@ -19,7 +19,7 @@
96
97 INCLUDE := -I$(SRCROOT)
98
99 -EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
100 +EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
101 EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
102 EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
103 EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
104 diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
105 index b4629ee..264b8cb 100644
106 --- a/vsock-only/Makefile.kernel
107 +++ b/vsock-only/Makefile.kernel
108 @@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
109 INCLUDE += -I$(SRCROOT)/linux
110 INCLUDE += -I$(SRCROOT)/common
111
112 -EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
113 +EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
114 EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
115
116
117
118
119
120 1.1 app-emulation/vmware-modules/files/264-jobserver.patch
121
122 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-jobserver.patch?rev=1.1&view=markup
123 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-jobserver.patch?rev=1.1&content-type=text/plain
124
125 Index: 264-jobserver.patch
126 ===================================================================
127 diff -ru a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
128 --- a/work/vmblock-only/Makefile 2011-01-22 08:59:15.907152002 -0500
129 +++ b/work/vmblock-only/Makefile 2011-01-22 09:13:55.894938002 -0500
130 @@ -123,9 +123,9 @@
131 postbuild:: ;
132
133 $(DRIVER_KO): prebuild
134 - make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
135 + $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
136 MODULEBUILDDIR=$(MODULEBUILDDIR) modules
137 - make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
138 + $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
139 MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
140 endif
141
142 diff -ru a/work/vmci-only/Makefile b/work/vmci-only/Makefile
143 --- a/work/vmci-only/Makefile 2011-01-22 08:59:15.907152002 -0500
144 +++ b/work/vmci-only/Makefile 2011-01-22 09:13:55.898936002 -0500
145 @@ -123,9 +123,9 @@
146 postbuild:: ;
147
148 $(DRIVER_KO): prebuild
149 - make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
150 + $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
151 MODULEBUILDDIR=$(MODULEBUILDDIR) modules
152 - make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
153 + $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
154 MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
155 endif
156
157 diff -ru a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
158 --- a/work/vmmon-only/Makefile 2011-01-22 08:59:15.907152002 -0500
159 +++ b/work/vmmon-only/Makefile 2011-01-22 09:13:55.894938002 -0500
160 @@ -123,9 +123,9 @@
161 postbuild:: ;
162
163 $(DRIVER_KO): prebuild
164 - make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
165 + $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
166 MODULEBUILDDIR=$(MODULEBUILDDIR) modules
167 - make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
168 + $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
169 MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
170 endif
171
172 diff -ru a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
173 --- a/work/vmnet-only/Makefile 2011-01-22 08:59:15.911150002 -0500
174 +++ b/work/vmnet-only/Makefile 2011-01-22 09:13:55.898936002 -0500
175 @@ -123,9 +123,9 @@
176 postbuild:: ;
177
178 $(DRIVER_KO): prebuild
179 - make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
180 + $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
181 MODULEBUILDDIR=$(MODULEBUILDDIR) modules
182 - make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
183 + $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
184 MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
185 endif
186
187 diff -ru a/work/vsock-only/Makefile b/work/vsock-only/Makefile
188 --- a/work/vsock-only/Makefile 2011-01-22 08:59:15.911150002 -0500
189 +++ b/work/vsock-only/Makefile 2011-01-22 09:13:55.894938002 -0500
190 @@ -123,9 +123,9 @@
191 postbuild:: ;
192
193 $(DRIVER_KO): prebuild
194 - make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
195 + $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \
196 MODULEBUILDDIR=$(MODULEBUILDDIR) modules
197 - make -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
198 + $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \
199 MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild
200 endif
201
202
203
204
205 1.1 app-emulation/vmware-modules/files/264-makefile-kernel-dir.patch
206
207 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-makefile-kernel-dir.patch?rev=1.1&view=markup
208 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/264-makefile-kernel-dir.patch?rev=1.1&content-type=text/plain
209
210 Index: 264-makefile-kernel-dir.patch
211 ===================================================================
212 diff --git a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile
213 index 0bd0e74..27c3ede 100644
214 --- a/work/vmblock-only/Makefile
215 +++ b/work/vmblock-only/Makefile
216 @@ -46,9 +46,9 @@ endif
217 VM_UNAME = $(shell uname -r)
218
219 # Header directory for the running kernel
220 -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
221 +HEADER_DIR = $(KERNEL_DIR)
222
223 -BUILD_DIR = $(HEADER_DIR)/..
224 +BUILD_DIR = $(KBUILD_OUTPUT)
225
226 DRIVER := vmblock
227 PRODUCT := tools
228 diff --git a/work/vmci-only/Makefile b/work/vmci-only/Makefile
229 index 7babb8a..fbc5878 100644
230 --- a/work/vmci-only/Makefile
231 +++ b/work/vmci-only/Makefile
232 @@ -46,9 +46,9 @@ endif
233 VM_UNAME = $(shell uname -r)
234
235 # Header directory for the running kernel
236 -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
237 +HEADER_DIR = $(KERNEL_DIR)
238
239 -BUILD_DIR = $(HEADER_DIR)/..
240 +BUILD_DIR = $(KBUILD_OUTPUT)
241
242 DRIVER := vmci
243 PRODUCT := @@PRODUCT@@
244 diff --git a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile
245 index 4b4eb3e..1bb35ef 100644
246 --- a/work/vmmon-only/Makefile
247 +++ b/work/vmmon-only/Makefile
248 @@ -46,9 +46,9 @@ endif
249 VM_UNAME = $(shell uname -r)
250
251 # Header directory for the running kernel
252 -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
253 +HEADER_DIR = $(KERNEL_DIR)
254
255 -BUILD_DIR = $(HEADER_DIR)/..
256 +BUILD_DIR = $(KBUILD_OUTPUT)
257
258 DRIVER := vmmon
259 PRODUCT := @@PRODUCT@@
260 diff --git a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile
261 index 06856e7..fd53bf8 100644
262 --- a/work/vmnet-only/Makefile
263 +++ b/work/vmnet-only/Makefile
264 @@ -46,9 +46,9 @@ endif
265 VM_UNAME = $(shell uname -r)
266
267 # Header directory for the running kernel
268 -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
269 +HEADER_DIR = $(KERNEL_DIR)
270
271 -BUILD_DIR = $(HEADER_DIR)/..
272 +BUILD_DIR = $(KBUILD_OUTPUT)
273
274 DRIVER := vmnet
275 PRODUCT := @@PRODUCT@@
276 diff --git a/work/vsock-only/Makefile b/work/vsock-only/Makefile
277 index e02adb0..210e502 100644
278 --- a/work/vsock-only/Makefile
279 +++ b/work/vsock-only/Makefile
280 @@ -46,9 +46,9 @@ endif
281 VM_UNAME = $(shell uname -r)
282
283 # Header directory for the running kernel
284 -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
285 +HEADER_DIR = $(KERNEL_DIR)
286
287 -BUILD_DIR = $(HEADER_DIR)/..
288 +BUILD_DIR = $(KBUILD_OUTPUT)
289
290 DRIVER := vsock
291 PRODUCT := ws
Report Message
Find on MARC Find on Google Groups