open-vm-tools: cleanup

packages/sysutils/open-vm-tools/build

@@ -22,6 +22,8 @@
 
 . config/options $1
 
+KERNEL_VER=$(basename $(ls -d $ROOT/$BUILD/linux-[0-9]*)| sed 's|linux-||g')
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -29,6 +31,8 @@ cd $PKG_BUILD
             --sysconfdir=/etc \
             --enable-shared \
             --disable-static \
+            --disable-docs \
+            --disable-tests \
             --without-pam \
             --without-gtk2 \
             --without-gtkmm \
@@ -36,6 +40,7 @@ cd $PKG_BUILD
             --without-x \
             --without-icu \
             --without-procps \
+            --with-kernel-release=$KERNEL_VER \
             --with-linuxdir=$(kernel_path)
 
 make CFLAGS+="-DG_DISABLE_DEPRECATED"

packages/sysutils/open-vm-tools/init.d/92_open-vm-tools

@@ -32,11 +32,7 @@
 
   # load modules
   modprobe vmhgfs
-  modprobe vmsync
-  modprobe vmblock
-  modprobe -r pcnet32
   modprobe vmxnet
-  modprobe pcnet32
 
   /usr/bin/vmtoolsd --background /var/run/vmtoolsd.pid
 )&

packages/sysutils/open-vm-tools/patches/open-vm-tools-kernel-3.9.patch

@@ -1,44 +0,0 @@
-diff --git a/modules/linux/vmhgfs/inode.c b/modules/linux/vmhgfs/inode.c
-index af240d7..2994df7 100644
---- a/modules/linux/vmhgfs/inode.c
-+++ b/modules/linux/vmhgfs/inode.c
-@@ -1870,7 +1870,7 @@ HgfsPermission(struct inode *inode,
- #else
-    if (mask & MAY_ACCESS) { /* For sys_access. */
- #endif
--      struct list_head *pos;
-+      struct hlist_node *pos;
- 
-       /*
-        * In 2.6.38 path walk is done in 2 distinct modes: rcu-walk and
-@@ -1888,7 +1888,7 @@ HgfsPermission(struct inode *inode,
- #endif
- 
-       /* Find a dentry with valid d_count. Refer bug 587879. */
--      list_for_each(pos, &inode->i_dentry) {
-+      list_for_each(pos, inode->i_dentry.first) {
-          int dcount;
-          struct dentry *dentry = list_entry(pos, struct dentry, d_alias);
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
-diff --git a/modules/linux/vmsync/sync.c b/modules/linux/vmsync/sync.c
-index d05ccad..dff7fb5 100644
---- a/modules/linux/vmsync/sync.c
-+++ b/modules/linux/vmsync/sync.c
-@@ -162,7 +162,7 @@ VmSyncThawDevices(void  *_state)  // IN
-    cancel_delayed_work(&state->thawTask);
-    list_for_each_safe(cur, tmp, &state->devices) {
-       dev = list_entry(cur, VmSyncBlockDevice, list);
--      if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) {
-+      if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) {
-          thaw_bdev(dev->bdev, dev->sb);
-          atomic_dec(&gFreezeCount);
-       }
-@@ -237,7 +237,7 @@ VmSyncAddPath(const VmSyncState *state,   // IN
-     * the superblock is already frozen.
-     */
-    if (inode->i_sb->s_bdev == NULL ||
--       inode->i_sb->s_frozen != SB_UNFROZEN) {
-+       inode->i_sb->s_writers.frozen != SB_UNFROZEN) {
-       result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY;
-       compat_path_release(&nd);
-       goto exit;