| 1 |
vadimk 10/02/28 17:51:17 |
| 2 |
|
| 3 |
Added: 1.0.0.26-makefile-kernel-dir.patch |
| 4 |
1.0.0.26-makefile-include.patch |
| 5 |
Log: |
| 6 |
vmware-modules for VMware Workstation 7.0.x and Player 3.0.x |
| 7 |
(Portage version: 2.1.7.17/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-emulation/vmware-modules/files/1.0.0.26-makefile-kernel-dir.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.26-makefile-kernel-dir.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.26-makefile-kernel-dir.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.0.0.26-makefile-kernel-dir.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/work/vmblock-only/Makefile b/work/vmblock-only/Makefile |
| 18 |
index 0bd0e74..27c3ede 100644 |
| 19 |
--- a/work/vmblock-only/Makefile |
| 20 |
+++ b/work/vmblock-only/Makefile |
| 21 |
@@ -46,9 +46,9 @@ endif |
| 22 |
VM_UNAME = $(shell uname -r) |
| 23 |
|
| 24 |
# Header directory for the running kernel |
| 25 |
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
| 26 |
+HEADER_DIR = $(KERNEL_DIR) |
| 27 |
|
| 28 |
-BUILD_DIR = $(HEADER_DIR)/.. |
| 29 |
+BUILD_DIR = $(KBUILD_OUTPUT) |
| 30 |
|
| 31 |
DRIVER := vmblock |
| 32 |
PRODUCT := tools |
| 33 |
diff --git a/work/vmci-only/Makefile b/work/vmci-only/Makefile |
| 34 |
index 7babb8a..fbc5878 100644 |
| 35 |
--- a/work/vmci-only/Makefile |
| 36 |
+++ b/work/vmci-only/Makefile |
| 37 |
@@ -46,9 +46,9 @@ endif |
| 38 |
VM_UNAME = $(shell uname -r) |
| 39 |
|
| 40 |
# Header directory for the running kernel |
| 41 |
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
| 42 |
+HEADER_DIR = $(KERNEL_DIR) |
| 43 |
|
| 44 |
-BUILD_DIR = $(HEADER_DIR)/.. |
| 45 |
+BUILD_DIR = $(KBUILD_OUTPUT) |
| 46 |
|
| 47 |
DRIVER := vmci |
| 48 |
PRODUCT := @@PRODUCT@@ |
| 49 |
diff --git a/work/vmmon-only/Makefile b/work/vmmon-only/Makefile |
| 50 |
index 4b4eb3e..1bb35ef 100644 |
| 51 |
--- a/work/vmmon-only/Makefile |
| 52 |
+++ b/work/vmmon-only/Makefile |
| 53 |
@@ -46,9 +46,9 @@ endif |
| 54 |
VM_UNAME = $(shell uname -r) |
| 55 |
|
| 56 |
# Header directory for the running kernel |
| 57 |
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
| 58 |
+HEADER_DIR = $(KERNEL_DIR) |
| 59 |
|
| 60 |
-BUILD_DIR = $(HEADER_DIR)/.. |
| 61 |
+BUILD_DIR = $(KBUILD_OUTPUT) |
| 62 |
|
| 63 |
DRIVER := vmmon |
| 64 |
PRODUCT := @@PRODUCT@@ |
| 65 |
diff --git a/work/vmnet-only/Makefile b/work/vmnet-only/Makefile |
| 66 |
index 06856e7..fd53bf8 100644 |
| 67 |
--- a/work/vmnet-only/Makefile |
| 68 |
+++ b/work/vmnet-only/Makefile |
| 69 |
@@ -46,9 +46,9 @@ endif |
| 70 |
VM_UNAME = $(shell uname -r) |
| 71 |
|
| 72 |
# Header directory for the running kernel |
| 73 |
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
| 74 |
+HEADER_DIR = $(KERNEL_DIR) |
| 75 |
|
| 76 |
-BUILD_DIR = $(HEADER_DIR)/.. |
| 77 |
+BUILD_DIR = $(KBUILD_OUTPUT) |
| 78 |
|
| 79 |
DRIVER := vmnet |
| 80 |
PRODUCT := @@PRODUCT@@ |
| 81 |
diff --git a/work/vsock-only/Makefile b/work/vsock-only/Makefile |
| 82 |
index e02adb0..210e502 100644 |
| 83 |
--- a/work/vsock-only/Makefile |
| 84 |
+++ b/work/vsock-only/Makefile |
| 85 |
@@ -46,9 +46,9 @@ endif |
| 86 |
VM_UNAME = $(shell uname -r) |
| 87 |
|
| 88 |
# Header directory for the running kernel |
| 89 |
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
| 90 |
+HEADER_DIR = $(KERNEL_DIR) |
| 91 |
|
| 92 |
-BUILD_DIR = $(HEADER_DIR)/.. |
| 93 |
+BUILD_DIR = $(KBUILD_OUTPUT) |
| 94 |
|
| 95 |
DRIVER := vsock |
| 96 |
PRODUCT := ws |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
1.1 app-emulation/vmware-modules/files/1.0.0.26-makefile-include.patch |
| 101 |
|
| 102 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.26-makefile-include.patch?rev=1.1&view=markup |
| 103 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.26-makefile-include.patch?rev=1.1&content-type=text/plain |
| 104 |
|
| 105 |
Index: 1.0.0.26-makefile-include.patch |
| 106 |
=================================================================== |
| 107 |
diff --git a/work/vmblock-only/Makefile.kernel b/work/vmblock-only/Makefile.kernel |
| 108 |
index 9d7c5ca..92cefff 100644 |
| 109 |
--- a/work/vmblock-only/Makefile.kernel |
| 110 |
+++ b/work/vmblock-only/Makefile.kernel |
| 111 |
@@ -19,7 +19,7 @@ |
| 112 |
|
| 113 |
INCLUDE += -I$(SRCROOT)/include |
| 114 |
|
| 115 |
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) |
| 116 |
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) |
| 117 |
|
| 118 |
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) |
| 119 |
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c, -DVMW_HAVE_EPOLL, ) |
| 120 |
diff --git a/work/vmci-only/Makefile.kernel b/work/vmci-only/Makefile.kernel |
| 121 |
index 22dc232..67e709f 100644 |
| 122 |
--- a/work/vmci-only/Makefile.kernel |
| 123 |
+++ b/work/vmci-only/Makefile.kernel |
| 124 |
@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI |
| 125 |
|
| 126 |
INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux |
| 127 |
|
| 128 |
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) |
| 129 |
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) |
| 130 |
|
| 131 |
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) |
| 132 |
|
| 133 |
diff --git a/work/vmmon-only/Makefile.kernel b/work/vmmon-only/Makefile.kernel |
| 134 |
index a7e26ea..befaca7 100644 |
| 135 |
--- a/work/vmmon-only/Makefile.kernel |
| 136 |
+++ b/work/vmmon-only/Makefile.kernel |
| 137 |
@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE |
| 138 |
INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \ |
| 139 |
-I$(SRCROOT)/vmcore |
| 140 |
|
| 141 |
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) |
| 142 |
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) |
| 143 |
|
| 144 |
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/nopage1.c, -DVMW_NOPAGE_261, ) |
| 145 |
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c, -DVMW_SKAS_MMAP, ) |
| 146 |
diff --git a/work/vmnet-only/Makefile.kernel b/work/vmnet-only/Makefile.kernel |
| 147 |
index 4b16d06..0e252a6 100644 |
| 148 |
--- a/work/vmnet-only/Makefile.kernel |
| 149 |
+++ b/work/vmnet-only/Makefile.kernel |
| 150 |
@@ -19,7 +19,7 @@ |
| 151 |
|
| 152 |
INCLUDE := -I$(SRCROOT) |
| 153 |
|
| 154 |
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) |
| 155 |
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) |
| 156 |
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/epoll.c, -DVMW_HAVE_EPOLL, ) |
| 157 |
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, ) |
| 158 |
EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, ) |
| 159 |
diff --git a/work/vsock-only/Makefile.kernel b/work/vsock-only/Makefile.kernel |
| 160 |
index 47ef5f3..b3539ef 100644 |
| 161 |
--- a/work/vsock-only/Makefile.kernel |
| 162 |
+++ b/work/vsock-only/Makefile.kernel |
| 163 |
@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include |
| 164 |
INCLUDE += -I$(SRCROOT)/linux |
| 165 |
INCLUDE += -I$(SRCROOT)/common |
| 166 |
|
| 167 |
-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) |
| 168 |
+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) |
| 169 |
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/epoll.c, -DVMW_HAVE_EPOLL, ) |
| 170 |
EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) |
Archives