From a88c2ba3fc8e32a06c2d84ac2e41929d73a5d86c29ecd1ac31017708a0f8fec9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 25 Nov 2010 15:12:03 +0000 Subject: [PATCH 1/7] re-inject pvscsi OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=171 --- open-vm-tools.changes | 5 +++++ open-vm-tools.spec | 3 +++ pvscsi.tar.bz2 | 3 +++ 3 files changed, 11 insertions(+) create mode 100644 pvscsi.tar.bz2 diff --git a/open-vm-tools.changes b/open-vm-tools.changes index 6202e42..95beb7e 100644 --- a/open-vm-tools.changes +++ b/open-vm-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 25 15:11:31 UTC 2010 - dimstar@opensuse.org + +- Re-Inject pvscsi for older kernel builds. + ------------------------------------------------------------------- Mon Nov 22 11:51:35 UTC 2010 - dimstar@opensuse.org diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 31c6b44..3bc87e6 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -54,6 +54,8 @@ Source6: open-vm-tools-modprobe.conf Source7: vmxnet3.tar.bz2 # vmmemctl.tar.bz2 is extracted from open-vm-tools 2010.02.23 Source8: vmmemctl.tar.bz2 +# pvscsi, extracted from open-vm-tools 2010.03.18 +Source9: pvscsi.tar.bz2 Source98: preamble BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ @@ -172,6 +174,7 @@ if you intend to create own plugins for vmtoolsd. pushd modules/linux tar xvf %{S:7} tar xvf %{S:8} +tar xvf %{S:9} popd chmod -x AUTHORS COPYING ChangeLog NEWS README # fix for an rpmlint warning regarding wrong line feeds diff --git a/pvscsi.tar.bz2 b/pvscsi.tar.bz2 new file mode 100644 index 0000000..26fbce5 --- /dev/null +++ b/pvscsi.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bab6b73130d6a6a66e7549c5c794f016d8ca1267b65dbf4ce0f1a2b57214559 +size 41129 From e710d697eb47e5f98c47ec5f1949ae6ae4c7d7d90d82fac44501b0d3cf6f59a6 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 29 Nov 2010 16:11:33 +0000 Subject: [PATCH 2/7] Updating link to change in openSUSE:Factory/open-vm-tools revision 24.0 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=08eb05d16fb93f4fe2cbe98d1e9538fe --- open-vm-tools.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 3bc87e6..77a0e54 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -1,5 +1,5 @@ # -# spec file for package open-vm-tools (Version 2010.03.20) +# spec file for package open-vm-tools (Version 2010.11.17) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (C) 2010 Dominique Leuenberger, Amsterdam, Netherlands. @@ -139,6 +139,7 @@ useful functions like: guests and from guest to guest %if %with_X + %package gui License: BSD3c ; GPLv2 ; LGPLv2.1 Summary: Open Virtual Machine Tools - GUI @@ -332,6 +333,7 @@ rm -rf %{buildroot} %exclude %{_libdir}/*.so %if %with_X + %files gui %defattr(-, root, root) %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop From 88ec7e63985bcf8283a9e5181db38cefa6f7c0c4b9f7ee9d32a950f4904d6261 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 22 Dec 2010 09:17:01 +0000 Subject: [PATCH 3/7] update to 2010.12.19 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=173 --- open-vm-tools-2010.11.17-327185.tar.bz2 | 3 --- open-vm-tools-2010.12.19-339835.tar.bz2 | 3 +++ open-vm-tools.changes | 14 ++++++++++++++ open-vm-tools.spec | 18 ++++++++++++++---- 4 files changed, 31 insertions(+), 7 deletions(-) delete mode 100644 open-vm-tools-2010.11.17-327185.tar.bz2 create mode 100644 open-vm-tools-2010.12.19-339835.tar.bz2 diff --git a/open-vm-tools-2010.11.17-327185.tar.bz2 b/open-vm-tools-2010.11.17-327185.tar.bz2 deleted file mode 100644 index 4ebeeb4..0000000 --- a/open-vm-tools-2010.11.17-327185.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78f4b12e7943ac2be4cbca2bf99d6b2f8c69337e8a74eeccf36a2ee36e7d63e3 -size 2502230 diff --git a/open-vm-tools-2010.12.19-339835.tar.bz2 b/open-vm-tools-2010.12.19-339835.tar.bz2 new file mode 100644 index 0000000..ee58300 --- /dev/null +++ b/open-vm-tools-2010.12.19-339835.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e1d60a21ef573b5b6642c0434e1c01830328b3ce2a95606a3c1fb9e7aa72112 +size 2528090 diff --git a/open-vm-tools.changes b/open-vm-tools.changes index 95beb7e..bdadf94 100644 --- a/open-vm-tools.changes +++ b/open-vm-tools.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Dec 22 08:29:03 UTC 2010 - dimstar@opensuse.org + +- Update to version 2010.12.19: + + New version of DnD code lands in open-vm-tools. The host part + of the new DnD protocol is not available yet in VMware + products, though. + + vmtoolsd gets some new functionality to support new features + being developed internally. + + vmxnet driver for FreeBSD fixed to allow changing the MAC + address. + + lots of bug fixes and other cleanups in various areas. +- Re-enable building of X dependenices (with_X 1) + ------------------------------------------------------------------- Thu Nov 25 15:11:31 UTC 2010 - dimstar@opensuse.org diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 77a0e54..6f51d42 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -31,14 +31,14 @@ %endif # X modules are failing all the time the build currently. We need an easy way to enable/disable them. -%define with_X 0 +%define with_X 1 Name: open-vm-tools Group: System/Emulators/PC Summary: Open Virtual Machine Tools -Version: 2010.11.17 +Version: 2010.12.19 Release: 1 -%define svn_rev 327185 +%define svn_rev 339835 Url: http://open-vm-tools.sourceforge.net/ License: BSD3c ; GPLv2 ; LGPLv2.1 Source: %{name}-%{version}-%{svn_rev}.tar.bz2 @@ -250,6 +250,9 @@ ln -sf ../../etc/init.d/vmtoolsd $RPM_BUILD_ROOT%{_sbindir}/rcvmtoolsd # which checks for /proc/fs/vmblock/dev to appear and then starts vmware-user-suid-wrapper install -D -m 0755 %{S:5} $RPM_BUILD_ROOT%{_bindir}/vmware-user-autostart-wrapper install -D -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop +# We have our own 'safe' autostart wrapper, which checks for modules to start in autologin mode... +# Thus we drop the 'original' autostartup +%__rm %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user.desktop # handle the .destop files for translations %suse_update_desktop_file vmware-user-autostart @@ -338,10 +341,14 @@ rm -rf %{buildroot} %defattr(-, root, root) %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop %{_bindir}/vmware-toolbox -%{_bindir}/vmware-user +#%{_bindir}/vmware-user %verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper +%{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so +%{_libdir}/%{name}/plugins/vmusr/libdndcp.so %{_libdir}/%{name}/plugins/vmusr/libresolutionSet.so +%{_libdir}/%{name}/plugins/vmusr/libunity.so %{_libdir}/%{name}/plugins/vmusr/libvixUser.so + %{_bindir}/vmware-user-autostart-wrapper %endif @@ -358,3 +365,6 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/vmguestlib.pc %changelog + + + From 03080d24543a010e9744b74fbe09a932f114b78bffb160f228153b8f1a492b77 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 22 Dec 2010 09:27:26 +0000 Subject: [PATCH 4/7] - Disable unity on openSUSE < 11.4. It requires glib >= 2.24. OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=174 --- open-vm-tools.changes | 1 + open-vm-tools.spec | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/open-vm-tools.changes b/open-vm-tools.changes index bdadf94..e66b282 100644 --- a/open-vm-tools.changes +++ b/open-vm-tools.changes @@ -11,6 +11,7 @@ Wed Dec 22 08:29:03 UTC 2010 - dimstar@opensuse.org address. + lots of bug fixes and other cleanups in various areas. - Re-enable building of X dependenices (with_X 1) +- Disable unity on openSUSE < 11.4. It requires glib >= 2.24. ------------------------------------------------------------------- Thu Nov 25 15:11:31 UTC 2010 - dimstar@opensuse.org diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 6f51d42..176c813 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -188,7 +188,7 @@ sed -i -e "s/\r//" README # comments in a continued line seem not to work... shame # --disable-unity : liburiparser was not present before 11.0 %configure \ -%if 0%{?suse_version} < 1100 +%if 0%{?suse_version} < 1140 --disable-unity \ %endif --without-kernel-modules \ @@ -346,7 +346,9 @@ rm -rf %{buildroot} %{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so %{_libdir}/%{name}/plugins/vmusr/libdndcp.so %{_libdir}/%{name}/plugins/vmusr/libresolutionSet.so +%if 0%{?suse_version} >= 1140 %{_libdir}/%{name}/plugins/vmusr/libunity.so +%endif %{_libdir}/%{name}/plugins/vmusr/libvixUser.so %{_bindir}/vmware-user-autostart-wrapper From 6232c1dec93768a63a4f066f691f700f3b6ec22b8aaaa0baff0d82218e222463 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 22 Dec 2010 09:58:59 +0000 Subject: [PATCH 5/7] fix OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=175 --- open-vm-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 176c813..eb658ca 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -27,7 +27,7 @@ %endif # Modules that are needed up to openSUSE 11.2 (kernel in 11.3 includes them). The previous list is extended by this. %if 0%{suse_version} <= 1120 -%define mod1120 pvscsi vmmemctl vmxnet3 +%define mod1120 pvscsi vmxnet3 %endif # X modules are failing all the time the build currently. We need an easy way to enable/disable them. From 8502af011d5cabc863f23ae36a689023bb749eaa0c2701654c8ce92457836c05 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 22 Dec 2010 10:18:54 +0000 Subject: [PATCH 6/7] fix OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=176 --- open-vm-tools.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/open-vm-tools.spec b/open-vm-tools.spec index eb658ca..81946a6 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -27,7 +27,7 @@ %endif # Modules that are needed up to openSUSE 11.2 (kernel in 11.3 includes them). The previous list is extended by this. %if 0%{suse_version} <= 1120 -%define mod1120 pvscsi vmxnet3 +%define mod1120 pvscsi vmmemctl vmxnet3 %endif # X modules are failing all the time the build currently. We need an easy way to enable/disable them. @@ -350,7 +350,6 @@ rm -rf %{buildroot} %{_libdir}/%{name}/plugins/vmusr/libunity.so %endif %{_libdir}/%{name}/plugins/vmusr/libvixUser.so - %{_bindir}/vmware-user-autostart-wrapper %endif @@ -367,6 +366,3 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/vmguestlib.pc %changelog - - - From 7e5785c38bea3be78807b2f65552a43e248c3d87bdd1a3baa4852be930aaea87 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 22 Dec 2010 10:19:27 +0000 Subject: [PATCH 7/7] fix OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=177 --- open-vm-tools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 81946a6..4724ec3 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -341,7 +341,6 @@ rm -rf %{buildroot} %defattr(-, root, root) %{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop %{_bindir}/vmware-toolbox -#%{_bindir}/vmware-user %verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper %{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so %{_libdir}/%{name}/plugins/vmusr/libdndcp.so