← Back to branch summary

~n-muench/ubuntu/saucy/open-vm-tools/open-vm-tools.fix-1175295

« back to all changes in this revision

Viewing changes to debian/patches/0004-dkms-vmsync.patch

Tags: 2012.12.26-958366-0ubuntu3
* Ubuntu-specific Changes
  - debian/rules: Added LIBS field with -lpthread.
    + Fixes package compile failure for Raring and future Ubuntu Releases.

* Items merged from Debian unstable:
  (From 2:9.2.2-893683-1 release)
  - Adding remote_fs dependency in initscript.
  - Correcting architecture fields in control.

  (From 2:9.2.2-893683-2 release)
  - Removing init order to network.

  (From 2:9.2.2-893683-4 release)
  - Removing init order to network also on start.

  (From 2:9.2.2-893683-5 release)
  - Updating to standards version 3.9.4.
  - Updating year in copyright file.
  - Prefixing patches with 4 digits for consistency.
  - Tightening diff headers in patches.
  - Dropping dpkg-source compression levels.

  (From 2:9.2.2-893683-6 release)
  - Remove all references to Daniel's old email address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0004-dkms-vmsync.patch
 
1
Author: Nate Muench <NowIWillDestroyAbydos@gmail.com>
 
2
Description: Delete lines involving vmsync, kernel takes care of this now.
 
3
 
 
4
Index: open-vm-tools.december-merge2/modules/linux/dkms.conf
 
5
===================================================================
 
6
--- open-vm-tools.december-merge2.orig/modules/linux/dkms.conf
 
7
+++ open-vm-tools.december-merge2/modules/linux/dkms.conf
 
8
@@ -9,31 +9,26 @@
 
9
 MAKE[0]="$MAKE_CMD_TMPL -C vmblock;    \
 
10
          $MAKE_CMD_TMPL -C vmci;       \
 
11
          $MAKE_CMD_TMPL -C vmhgfs;     \
 
12
-         $MAKE_CMD_TMPL -C vmsync;     \
 
13
          $MAKE_CMD_TMPL -C vmxnet;     \
 
14
          $MAKE_CMD_TMPL -C vsock"
 
15
 CLEAN[0]="$MAKE_CMD_TMPL -C vmblock clean;    \
 
16
           $MAKE_CMD_TMPL -C vmci clean;       \
 
17
           $MAKE_CMD_TMPL -C vmhgfs clean;     \
 
18
-          $MAKE_CMD_TMPL -C vmsync clean;    \
 
19
           $MAKE_CMD_TMPL -C vmxnet clean;     \
 
20
           $MAKE_CMD_TMPL -C vsock clean"
 
21
 BUILT_MODULE_NAME[0]="vmblock"
 
22
 BUILT_MODULE_NAME[1]="vmci"
 
23
 BUILT_MODULE_NAME[2]="vmhgfs"
 
24
-BUILT_MODULE_NAME[3]="vmsync"
 
25
-BUILT_MODULE_NAME[4]="vmxnet"
 
26
-BUILT_MODULE_NAME[5]="vsock"
 
27
+BUILT_MODULE_NAME[3]="vmxnet"
 
28
+BUILT_MODULE_NAME[4]="vsock"
 
29
 BUILT_MODULE_LOCATION[0]="vmblock/"
 
30
 BUILT_MODULE_LOCATION[1]="vmci/"
 
31
 BUILT_MODULE_LOCATION[2]="vmhgfs/"
 
32
-BUILT_MODULE_LOCATION[3]="vmsync/"
 
33
-BUILT_MODULE_LOCATION[4]="vmxnet/"
 
34
-BUILT_MODULE_LOCATION[5]="vsock/"
 
35
+BUILT_MODULE_LOCATION[3]="vmxnet/"
 
36
+BUILT_MODULE_LOCATION[4]="vsock/"
 
37
 DEST_MODULE_LOCATION[0]="/kernel/fs/vmblock"
 
38
 DEST_MODULE_LOCATION[1]="/kernel/drivers/misc"
 
39
 DEST_MODULE_LOCATION[2]="/kernel/fs/vmhgfs"
 
40
-DEST_MODULE_LOCATION[3]="/kernel/drivers/misc"
 
41
-DEST_MODULE_LOCATION[4]="/kernel/drivers/net"
 
42
-DEST_MODULE_LOCATION[5]="/kernel/net/vsock"
 
43
+DEST_MODULE_LOCATION[3]="/kernel/drivers/net"
 
44
+DEST_MODULE_LOCATION[4]="/kernel/net/vsock"
 
45
 AUTOINSTALL="YES"