Fix vsock

4 files changed, 11 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e71011203ca..a6c6c593cd73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Jan 23 18:28:24 UTC 2017
+# Mon Jan 30 03:16:15 UTC 2017
 pkgbase = vmware-modules-dkms
 	pkgdesc = VMware Workstation kernel modules (DKMS)
 	pkgver = 308.0
-	pkgrel = 12
+	pkgrel = 13
 	url = http://www.vmware.com/
 	install = vmware-modules-dkms.install
 	arch = i686
@@ -23,9 +23,9 @@ pkgbase = vmware-modules-dkms
 	source = vmnet.patch
 	source = vsock.patch
 	source = NOTES
-	sha256sums = 9041b85cea2e2c35b27629d47bee2e37b913635e5ace54a46fd9c45f90c4f1d4
+	sha256sums = 493ff26082307ff58f19b391c5a72625d7071ad12fed9232f0f2e2d4339c3a45
 	sha256sums = 7baecdfd979d57aed7dac0db57e0165fc1730b15ed6bf42ed25571e68ec34b52
-	sha256sums = c8f9399196b50fb7ffb763e006bd54c8153d2c0717d935590ea9bf673346f1d3
+	sha256sums = 489ab58c7bc605588271f41e563c4e97ea65798fbc4ab7ec5b2135c79df5de1a
 	sha256sums = b81a2c26a6af145a934118a0d19d22ff7a73464dfa849d24ba0dd785f119ae7e
 	sha256sums = f24586ccb45106322bcff9dff92ef2caf9f32c73f2ec1c67f178c7ee2559ac0e
 	sha256sums = 270493aac68667a78e3aab54316a4548d15e610c19c5791f7b6cc2e7483be6da
diff --git a/Makefile b/Makefile
index 8273f0ad4bb0..ffd56641c2a4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ KVERSION = $(shell uname -r)
 all: $(foreach m, $(MODULES), $m.ko)
 
 %.ko: % $(TARDIR)/%.tar
-	$(MAKE) KVERSION=$(KVERSION) VM_KBUILD=yes -C $*
+	$(MAKE) KVERSION=$(KVERSION) VM_KBUILD=yes MODULEBUILDDIR=$(MODULEBUILDDIR) -C $*
 	mv $*.o $*.ko
 
 $(MODULES): %: $(TARDIR)/%.tar
@@ -25,6 +25,8 @@ $(MODULES): %: $(TARDIR)/%.tar
 		patch -p1 < $*.patch ; \
 	fi;
 
+vsock.ko: vmci.ko
+
 clean:
 	rm -rf $(MODULES)
 	rm -rf $(foreach m, $(MODULES), $m-only)
diff --git a/PKGBUILD b/PKGBUILD
index 38cfc292871b..b7bed5a2f0b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 pkgname=vmware-modules-dkms
 _pkgbase=vmware-modules
 pkgver=308.0
-pkgrel=12
+pkgrel=13
 pkgdesc="VMware Workstation kernel modules (DKMS)"
 arch=('i686' 'x86_64')
 url="http://www.vmware.com/"
@@ -34,9 +34,9 @@ source=('Makefile'
         'vmnet.patch'
         'vsock.patch'
         'NOTES')
-sha256sums=('9041b85cea2e2c35b27629d47bee2e37b913635e5ace54a46fd9c45f90c4f1d4'
+sha256sums=('493ff26082307ff58f19b391c5a72625d7071ad12fed9232f0f2e2d4339c3a45'
             '7baecdfd979d57aed7dac0db57e0165fc1730b15ed6bf42ed25571e68ec34b52'
-            'c8f9399196b50fb7ffb763e006bd54c8153d2c0717d935590ea9bf673346f1d3'
+            '489ab58c7bc605588271f41e563c4e97ea65798fbc4ab7ec5b2135c79df5de1a'
             'b81a2c26a6af145a934118a0d19d22ff7a73464dfa849d24ba0dd785f119ae7e'
             'f24586ccb45106322bcff9dff92ef2caf9f32c73f2ec1c67f178c7ee2559ac0e'
             '270493aac68667a78e3aab54316a4548d15e610c19c5791f7b6cc2e7483be6da'
diff --git a/dkms.conf.in b/dkms.conf.in
index 3fd8bd5ed60c..15c489e0f654 100644
--- a/dkms.conf.in
+++ b/dkms.conf.in
@@ -1,11 +1,8 @@
 PACKAGE_NAME=@PKGNAME@
 PACKAGE_VERSION=@PKGVER@
-MAKE[0]="make KVERSION=$kernelver"
+MAKE[0]="make KVERSION=$kernelver MODULEBUILDDIR=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build"
 CLEAN[0]="make clean"
 
-# The vsock module depends on symbols exported by the vmci module, so it
-# needs to be built afterwards; the MODULEBUILDDIR variable tells the makefiles
-# where to store / retrive those symbol files.
 BUILT_MODULE_NAME[0]="vmblock"
 BUILT_MODULE_NAME[1]="vmci"
 BUILT_MODULE_NAME[2]="vmmon"