DKMS improvements.

1 files changed, 19 insertions, 16 deletions

diff --git a/dkms.conf b/dkms.conf
index 2cbefff293b3..1900290f537a 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,25 +1,28 @@
-PACKAGE_NAME='@PKGNAME@'
-PACKAGE_VERSION='@PKGVER@'
-AUTOINSTALL='yes'
-MAKE[0]='find -mindepth 1 -maxdepth 1 -type d -exec make KVERSION=$kernelver -C {} \;'
-CLEAN='find -mindepth 1 -maxdepth 1 -type d -exec make clean -C {} \;'
+# Linux DKMS config script for the VMware guest kernel modules
 
-BUILT_MODULE_NAME[0]='vmblock'
+PACKAGE_NAME="@PKGNAME@"
+PACKAGE_VERSION="@PKGVER@"
+MAKE="make KVERSION=$kernelver SRCDIR=/usr/src/$PACKAGE_NAME-$PACKAGE_VERSION"
+CLEAN="make clean"
+AUTOINSTALL="YES"
+
+BUILT_MODULE_NAME[0]="vmblock"
 BUILT_MODULE_LOCATION[0]='vmblock-only'
-DEST_MODULE_LOCATION[0]='/kernel/misc'
+DEST_MODULE_LOCATION[0]="/kernel/fs/vmblock"
 
-BUILT_MODULE_NAME[1]='vmci'
+BUILT_MODULE_NAME[1]="vmci"
 BUILT_MODULE_LOCATION[1]='vmci-only'
-DEST_MODULE_LOCATION[1]='/kernel/misc'
+DEST_MODULE_LOCATION[1]="/kernel/drivers/misc"
 
-BUILT_MODULE_NAME[2]='vmmon'
+BUILT_MODULE_NAME[2]="vmmon"
 BUILT_MODULE_LOCATION[2]='vmmon-only'
-DEST_MODULE_LOCATION[2]='/kernel/misc'
+DEST_MODULE_LOCATION[2]="/kernel/drivers/misc"
 
-BUILT_MODULE_NAME[3]='vmnet'
+BUILT_MODULE_NAME[3]="vmnet"
 BUILT_MODULE_LOCATION[3]='vmnet-only'
-DEST_MODULE_LOCATION[3]='/kernel/misc'
+DEST_MODULE_LOCATION[3]="/kernel/drivers/net"
 
-BUILT_MODULE_NAME[4]='vsock'
-BUILT_MODULE_LOCATION[4]='vsock-only'
-DEST_MODULE_LOCATION[4]='/kernel/misc'
+# vsock is already provided by the kernel
+#BUILT_MODULE_NAME[4]="vsock"
+#BUILT_MODULE_LOCATION[4]='vsock-only'
+#DEST_MODULE_LOCATION[4]="/kernel/net/vmw_vsock"