=== modified file 'debian/changelog' --- debian/changelog 2010-09-25 00:08:40 +0000 +++ debian/changelog 2011-03-09 21:43:04 +0000 @@ -1,3 +1,15 @@ +open-vm-tools (2011.02.23-368700-0ubuntu1) natty; urgency=low + + * Merge latest upstream git tag. This has the unlocked_ioctl change + needed to fix dkms build failures (LP: 727342) + * Changes in debian/rules: + - work around a bug in toolbox/Makefile, where install-exec-hook is + not happening. This needs to get fixed the right way. + - don't install 'vmware-user' which seems to no longer exist + - move /etc/xdg into open-vm-toolbox (which should be done using .install) + + -- Serge Hallyn Wed, 09 Mar 2011 07:46:13 -0600 + open-vm-tools (2010.06.16-268169-3ubuntu1) maverick; urgency=low * Merge from Debian testing (LP: #632101), remaining changes: === modified file 'debian/patches/01-kvers.patch' --- debian/patches/01-kvers.patch 2010-09-07 02:10:30 +0000 +++ debian/patches/01-kvers.patch 2011-03-09 21:43:04 +0000 @@ -1,75 +1,81 @@ Author: Cyril Brulebois Description: Replacing uname call with KVERS, overwriting seemed not to work. -diff -Naurp open-vm-tools.orig/modules/linux/vmblock/Makefile open-vm-tools/modules/linux/vmblock/Makefile ---- open-vm-tools.orig/modules/linux/vmblock/Makefile 2010-06-18 01:02:36.000000000 +0200 -+++ open-vm-tools/modules/linux/vmblock/Makefile 2010-07-03 20:59:43.128041723 +0200 -@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared - endif - - --VM_UNAME = $(shell uname -r) -+VM_UNAME = $(KVERS) - - # Header directory for the running kernel - HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -diff -Naurp open-vm-tools.orig/modules/linux/vmci/Makefile open-vm-tools/modules/linux/vmci/Makefile ---- open-vm-tools.orig/modules/linux/vmci/Makefile 2010-06-18 01:02:36.000000000 +0200 -+++ open-vm-tools/modules/linux/vmci/Makefile 2010-07-03 20:59:46.384042352 +0200 -@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared - endif - - --VM_UNAME = $(shell uname -r) -+VM_UNAME = $(KVERS) - - # Header directory for the running kernel - HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -diff -Naurp open-vm-tools.orig/modules/linux/vmhgfs/Makefile open-vm-tools/modules/linux/vmhgfs/Makefile ---- open-vm-tools.orig/modules/linux/vmhgfs/Makefile 2010-06-18 01:02:36.000000000 +0200 -+++ open-vm-tools/modules/linux/vmhgfs/Makefile 2010-07-03 20:59:49.264041335 +0200 -@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared - endif - - --VM_UNAME = $(shell uname -r) -+VM_UNAME = $(KVERS) - - # Header directory for the running kernel - HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -diff -Naurp open-vm-tools.orig/modules/linux/vmsync/Makefile open-vm-tools/modules/linux/vmsync/Makefile ---- open-vm-tools.orig/modules/linux/vmsync/Makefile 2010-06-18 01:02:36.000000000 +0200 -+++ open-vm-tools/modules/linux/vmsync/Makefile 2010-07-03 20:59:56.041024330 +0200 -@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared - endif - - --VM_UNAME = $(shell uname -r) -+VM_UNAME = $(KVERS) - - # Header directory for the running kernel - HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -diff -Naurp open-vm-tools.orig/modules/linux/vmxnet/Makefile open-vm-tools/modules/linux/vmxnet/Makefile ---- open-vm-tools.orig/modules/linux/vmxnet/Makefile 2010-06-18 01:02:36.000000000 +0200 -+++ open-vm-tools/modules/linux/vmxnet/Makefile 2010-07-03 21:00:00.172042218 +0200 -@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared - endif - - --VM_UNAME = $(shell uname -r) -+VM_UNAME = $(KVERS) - - # Header directory for the running kernel - HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -diff -Naurp open-vm-tools.orig/modules/linux/vsock/Makefile open-vm-tools/modules/linux/vsock/Makefile ---- open-vm-tools.orig/modules/linux/vsock/Makefile 2010-06-18 01:02:36.000000000 +0200 -+++ open-vm-tools/modules/linux/vsock/Makefile 2010-07-03 21:00:05.380042340 +0200 -@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared - endif - - --VM_UNAME = $(shell uname -r) -+VM_UNAME = $(KVERS) - - # Header directory for the running kernel - HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include +Index: open-vm-tools-2010.06.16-268169/modules/linux/vmblock/Makefile +=================================================================== +--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmblock/Makefile 2011-03-08 17:11:48.701605582 -0600 ++++ open-vm-tools-2010.06.16-268169/modules/linux/vmblock/Makefile 2011-03-08 17:11:50.821605582 -0600 +@@ -43,7 +43,7 @@ + endif + + +-VM_UNAME = $(shell uname -r) ++VM_UNAME = $(KVERS) + + # Header directory for the running kernel + ifdef LINUXINCLUDE +Index: open-vm-tools-2010.06.16-268169/modules/linux/vmci/Makefile +=================================================================== +--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmci/Makefile 2011-03-08 17:11:48.721605582 -0600 ++++ open-vm-tools-2010.06.16-268169/modules/linux/vmci/Makefile 2011-03-08 17:11:50.841605582 -0600 +@@ -43,7 +43,7 @@ + endif + + +-VM_UNAME = $(shell uname -r) ++VM_UNAME = $(KVERS) + + # Header directory for the running kernel + ifdef LINUXINCLUDE +Index: open-vm-tools-2010.06.16-268169/modules/linux/vmhgfs/Makefile +=================================================================== +--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmhgfs/Makefile 2011-03-08 17:11:48.741605582 -0600 ++++ open-vm-tools-2010.06.16-268169/modules/linux/vmhgfs/Makefile 2011-03-08 17:11:50.861605582 -0600 +@@ -43,7 +43,7 @@ + endif + + +-VM_UNAME = $(shell uname -r) ++VM_UNAME = $(KVERS) + + # Header directory for the running kernel + ifdef LINUXINCLUDE +Index: open-vm-tools-2010.06.16-268169/modules/linux/vmsync/Makefile +=================================================================== +--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmsync/Makefile 2011-03-08 17:11:48.761605582 -0600 ++++ open-vm-tools-2010.06.16-268169/modules/linux/vmsync/Makefile 2011-03-08 17:11:50.891605582 -0600 +@@ -43,7 +43,7 @@ + endif + + +-VM_UNAME = $(shell uname -r) ++VM_UNAME = $(KVERS) + + # Header directory for the running kernel + ifdef LINUXINCLUDE +Index: open-vm-tools-2010.06.16-268169/modules/linux/vmxnet/Makefile +=================================================================== +--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmxnet/Makefile 2011-03-08 17:11:48.781605582 -0600 ++++ open-vm-tools-2010.06.16-268169/modules/linux/vmxnet/Makefile 2011-03-08 17:11:50.931605582 -0600 +@@ -43,7 +43,7 @@ + endif + + +-VM_UNAME = $(shell uname -r) ++VM_UNAME = $(KVERS) + + # Header directory for the running kernel + ifdef LINUXINCLUDE +Index: open-vm-tools-2010.06.16-268169/modules/linux/vsock/Makefile +=================================================================== +--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vsock/Makefile 2011-03-08 17:11:48.811605582 -0600 ++++ open-vm-tools-2010.06.16-268169/modules/linux/vsock/Makefile 2011-03-08 17:11:50.961605582 -0600 +@@ -43,7 +43,7 @@ + endif + + +-VM_UNAME = $(shell uname -r) ++VM_UNAME = $(KVERS) + + # Header directory for the running kernel + ifdef LINUXINCLUDE === removed file 'debian/patches/02-vmxnet.patch' --- debian/patches/02-vmxnet.patch 2010-09-07 02:10:30 +0000 +++ debian/patches/02-vmxnet.patch 1970-01-01 00:00:00 +0000 @@ -1,30 +0,0 @@ -Description: Compile against 3.6.35 -Author: Noel J. Bergman -Bug-Ubuntu: http://launchpad.net/bugs/598542 -Last-Update: 2010-07-24 ---- a/modules/linux/vmxnet/vmxnet.c -+++ b/modules/linux/vmxnet/vmxnet.c -@@ -2910,7 +2910,7 @@ - { - struct Vmxnet_Private *lp = netdev_priv(dev); - volatile u16 *mcast_table = (u16 *)lp->dd->LADRF; -- struct dev_mc_list *dmi = dev->mc_list; -+ struct netdev_hw_addr *ha; // struct dev_mc_list *dmi = dev->mc_list; - u8 *addrs; - int i, j, bit, byte; - u32 crc, poly = CRC_POLYNOMIAL_LE; -@@ -2919,10 +2919,11 @@ - lp->dd->LADRF[0] = 0; - lp->dd->LADRF[1] = 0; - -+ i = 0; - /* Add addresses */ -- for (i = 0; i < dev->mc_count; i++){ -- addrs = dmi->dmi_addr; -- dmi = dmi->next; -+ netdev_for_each_mc_addr(ha, dev) { // for (i = 0; i < dev->mc_count; i++){ -+ addrs = ha->addr; //dmi->dmi_addr; -+ ++i; // dmi = dmi->next; - - /* multicast address? */ - if (!(*addrs & 1)) === removed file 'debian/patches/03-vsock.patch' --- debian/patches/03-vsock.patch 2010-09-25 00:08:40 +0000 +++ debian/patches/03-vsock.patch 1970-01-01 00:00:00 +0000 @@ -1,87 +0,0 @@ -Description: Compile against 2.6.35. Corrects all references of - sk_sleep(somevar) to compat_sk_sleep(somevar) -Author: Noel J. Bergman, Nate Muench -Bug-Ubuntu: http://launchpad.net/bugs/598542 ---- a/modules/linux/vsock/linux/af_vsock.c -+++ b/modules/linux/vsock/linux/af_vsock.c -@@ -3566,7 +3566,7 @@ - * upon connection establishment. - */ - timeout = sock_sndtimeo(listener, flags & O_NONBLOCK); -- compat_init_prepare_to_wait(sk_sleep(listener), &wait, TASK_INTERRUPTIBLE); -+ compat_init_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE); - - while ((connected = VSockVmciDequeueAccept(listener)) == NULL && - listener->compat_sk_err == 0) { -@@ -3616,7 +3616,7 @@ - } - - outWait: -- compat_finish_wait(sk_sleep(listener), &wait, TASK_RUNNING); -+ compat_finish_wait(compat_sk_sleep(listener), &wait, TASK_RUNNING); - out: - release_sock(listener); - return err; -@@ -3714,7 +3714,7 @@ - sk = sock->sk; - vsk = vsock_sk(sk); - -- poll_wait(file, sk_sleep(sk), wait); -+ poll_wait(file, compat_sk_sleep(sk), wait); - mask = 0; - - if (sk->compat_sk_err) { -@@ -4313,7 +4313,7 @@ - goto out; - } - -- compat_init_prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); -+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - - while (totalWritten < len) { - Bool sentWrote; -@@ -4351,7 +4351,7 @@ - goto outWait; - } - -- compat_cont_prepare_to_wait(sk_sleep(sk), -+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), - &wait, TASK_INTERRUPTIBLE); - } - -@@ -4403,7 +4403,7 @@ - if (totalWritten > 0) { - err = totalWritten; - } -- compat_finish_wait(sk_sleep(sk), &wait, TASK_RUNNING); -+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING); - out: - release_sock(sk); - return err; -@@ -4589,7 +4589,7 @@ - goto out; - } - -- compat_init_prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); -+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - - while ((ready = VSockVmciStreamHasData(vsk)) < target && - sk->compat_sk_err == 0 && -@@ -4629,7 +4629,7 @@ - goto outWait; - } - -- compat_cont_prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); -+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - } - - if (sk->compat_sk_err) { -@@ -4693,7 +4693,7 @@ - err = copied; - - outWait: -- compat_finish_wait(sk_sleep(sk), &wait, TASK_RUNNING); -+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING); - out: - release_sock(sk); - return err; === modified file 'debian/patches/series' --- debian/patches/series 2010-09-07 02:10:30 +0000 +++ debian/patches/series 2011-03-09 21:43:04 +0000 @@ -1,3 +1,1 @@ 01-kvers.patch -02-vmxnet.patch -03-vsock.patch === modified file 'debian/rules' --- debian/rules 2010-09-07 02:10:30 +0000 +++ debian/rules 2011-03-09 21:43:04 +0000 @@ -165,14 +165,26 @@ # Moving open-vm-toolbox files mkdir -p debian/open-vm-toolbox/usr/bin - mv debian/open-vm-tools/usr/bin/vmware-user debian/open-vm-toolbox/usr/bin + # vmware-user no longer seems to exist + #mv debian/open-vm-tools/usr/bin/vmware-user debian/open-vm-toolbox/usr/bin mv debian/open-vm-tools/usr/bin/vmware-toolbox debian/open-vm-toolbox/usr/bin + # this should be done with open-vm-toolbox.install ? + mkdir -p debian/open-vm-toolbox/etc + mv debian/open-vm-tools/etc/xdg debian/open-vm-toolbox/etc/ mkdir -p debian/open-vm-toolbox/usr/lib/open-vm-tools/plugins mv debian/open-vm-tools/usr/lib/open-vm-tools/plugins/vmusr debian/open-vm-toolbox/usr/lib/open-vm-tools/plugins - mkdir -p debian/open-vm-toolbox/usr/share - mv debian/open-vm-tools/usr/share/applications debian/open-vm-toolbox/usr/share + # XXX This is wrong: install-exec-hook in toolbox/Makefile is not being called. + #mkdir -p debian/open-vm-toolbox/usr/share + #mv debian/open-vm-tools/usr/share/applications debian/open-vm-toolbox/usr/share + # when the instal-exec-hook is working, remove the rest of this stanza + mkdir -p debian/open-vm-toolbox/usr/share/applications + install -m 644 scripts/common/vmware-toolbox.desktop debian/open-vm-toolbox/usr/share/applications + sed -i s/Exec=.*/Exec=vmware-toolbox/ debian/open-vm-toolbox/usr/share/applications/vmware-toolbox.desktop + install -d debian/open-vm-toolbox/usr/share/pixmaps/vmware + install -m 644 toolbox/bigIcon.xpm debian/open-vm-toolbox/usr/share/pixmaps/vmware/vmware-toolbox.xpm + install -m 755 scripts/common/vmware-xdg-detect-de debian/open-vm-toolbox/usr/bin # Installing configuration files install -D -m 0644 debian/local/xautostart.conf debian/open-vm-toolbox/etc/vmware-tools/xautostart.conf