Update to 8.8.0 stable series.. including cartmans patch
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=207
This commit is contained in:
parent
360ae3ced6
commit
28ab190c87
11
_service
11
_service
@ -1,11 +0,0 @@
|
|||||||
<services>
|
|
||||||
<service name="download_url">
|
|
||||||
<param name="protocol">http</param>
|
|
||||||
<param name="host">sourceforge.net</param>
|
|
||||||
<param name="path">/projects/open-vm-tools/files/open-vm-tools/2011.07.19/open-vm-tools-2011.07.19-450511.tar.gz</param>
|
|
||||||
</service>
|
|
||||||
<service name="recompress">
|
|
||||||
<param name="file">_service:download_url:*.tar.gz</param>
|
|
||||||
<param name="compression">bz2</param>
|
|
||||||
</service>
|
|
||||||
</services>
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:8018096532710dd7e2472c914c667bc6aa118fe64a04b3c6fcc70383371bd4d7
|
|
||||||
size 2566147
|
|
3
open-vm-tools-8.8.0-471268.tar.gz
Normal file
3
open-vm-tools-8.8.0-471268.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:642cf860c9910cd64424a588f8ac4ad500af358e5ca992862bfbd667224ff79c
|
||||||
|
size 3760851
|
46
open-vm-tools-vmxnet+kernel-3.0.patch
Normal file
46
open-vm-tools-vmxnet+kernel-3.0.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
Index: modules/linux/shared/compat_netdevice.h
|
||||||
|
===================================================================
|
||||||
|
--- modules/linux/shared/compat_netdevice.h.orig
|
||||||
|
+++ modules/linux/shared/compat_netdevice.h
|
||||||
|
@@ -182,7 +182,7 @@ compat_alloc_netdev(int priv_size,
|
||||||
|
* All compat_* business is good but when we can we should just provide
|
||||||
|
* missing implementation to ease upstreaming task.
|
||||||
|
*/
|
||||||
|
-#ifndef HAVE_ALLOC_NETDEV
|
||||||
|
+#if !defined(HAVE_ALLOC_NETDEV) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
|
||||||
|
#define alloc_netdev(sz, name, setup) compat_alloc_netdev(sz, name, setup)
|
||||||
|
#define alloc_etherdev(sz) compat_alloc_etherdev(sz)
|
||||||
|
#endif
|
||||||
|
@@ -191,7 +191,7 @@ compat_alloc_netdev(int priv_size,
|
||||||
|
#define free_netdev(dev) kfree(dev)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#ifndef HAVE_NETDEV_PRIV
|
||||||
|
+#if !defined(HAVE_NETDEV_PRIV) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
|
||||||
|
#define netdev_priv(dev) ((dev)->priv)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -203,7 +203,7 @@ compat_alloc_netdev(int priv_size,
|
||||||
|
# define COMPAT_NETDEV_TX_BUSY 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#ifndef HAVE_NETIF_QUEUE
|
||||||
|
+#if !defined(HAVE_NETIF_QUEUE) && LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
|
||||||
|
static inline void
|
||||||
|
netif_start_queue(struct device *dev)
|
||||||
|
{
|
||||||
|
Index: modules/linux/vmxnet/vmxnet.c
|
||||||
|
===================================================================
|
||||||
|
--- modules/linux/vmxnet/vmxnet.c.orig
|
||||||
|
+++ modules/linux/vmxnet/vmxnet.c
|
||||||
|
@@ -64,6 +64,10 @@ static int vmxnet_debug = 1;
|
||||||
|
#define VMW_HAVE_POLL_CONTROLLER
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
|
||||||
|
+#define HAVE_NET_DEVICE_OPS
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
static int vmxnet_open(struct net_device *dev);
|
||||||
|
static int vmxnet_start_tx(struct sk_buff *skb, struct net_device *dev);
|
||||||
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 21 20:34:59 UTC 2011 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 8.8.0 (Stable series):
|
||||||
|
+ This release of open-vm-tools matches the VMware Tools package
|
||||||
|
released with Workstation 8.0 and Fusion 4.0.
|
||||||
|
It's targeted at desktop users who want the latest features in
|
||||||
|
(VMware's) Unity, HGFS and drag & drop support.
|
||||||
|
- Add open-vm-tools-vmxnet+kernel-3.0.patch: HAVE_NETDEV_PRIV is
|
||||||
|
gone in kernel 3.0 and netdev_priv is in kernel since 2.6.6.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 21 00:36:27 UTC 2011 - dimstar@opensuse.org
|
Thu Jul 21 00:36:27 UTC 2011 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
@ -20,27 +20,29 @@
|
|||||||
# exclude AMD PCnet32 LANCE pci.id from Supplements list [bnc#397554]
|
# exclude AMD PCnet32 LANCE pci.id from Supplements list [bnc#397554]
|
||||||
%define __find_supplements sh -c '/usr/lib/rpm/find-supplements %{name} | grep -v pci:v00001022d00002000'
|
%define __find_supplements sh -c '/usr/lib/rpm/find-supplements %{name} | grep -v pci:v00001022d00002000'
|
||||||
|
|
||||||
# Modules that have to be build up to version 12.1 (Last checked on 2011-04-14 with kernel 2.6.38)
|
# Modules that have to be build up to version 12.1 (Last checked on 2011-09-21 with kernel 3.1-rc6)
|
||||||
%define vm_modules vmblock vmhgfs vmsync vmxnet vmci vsock
|
%define vm_modules vmblock vmhgfs vmsync vmxnet vmci vsock
|
||||||
|
|
||||||
# X modules are lower prio upstream and once in a while fail. Offer an easy way to enable/disable them.
|
# X modules are lower prio upstream and once in a while fail. Offer an easy way to enable/disable them.
|
||||||
%define with_X 1
|
%define with_X 1
|
||||||
|
|
||||||
Name: open-vm-tools
|
Name: open-vm-tools
|
||||||
Version: 2011.07.19
|
Version: 8.8.0
|
||||||
Release: 1
|
Release: 1
|
||||||
%define svn_rev 450511
|
%define svn_rev 471268
|
||||||
License: BSD3c ; GPLv2 ; LGPLv2.1
|
License: BSD3c ; GPLv2 ; LGPLv2.1
|
||||||
Summary: Open Virtual Machine Tools
|
Summary: Open Virtual Machine Tools
|
||||||
Url: http://open-vm-tools.sourceforge.net/
|
Url: http://open-vm-tools.sourceforge.net/
|
||||||
Group: System/Emulators/PC
|
Group: System/Emulators/PC
|
||||||
Source: %{name}-%{version}-%{svn_rev}.tar.bz2
|
Source: http://sourceforge.net/projects/open-vm-tools/files/open-vm-tools/stable-8.8.x/%{name}-%{version}-%{svn_rev}.tar.gz
|
||||||
Source1: vmtoolsd
|
Source1: vmtoolsd
|
||||||
Source2: vmware-user-autostart.desktop
|
Source2: vmware-user-autostart.desktop
|
||||||
Source4: open-vm-tools.permissions
|
Source4: open-vm-tools.permissions
|
||||||
Source5: vmware-user-autostart-wrapper
|
Source5: vmware-user-autostart-wrapper
|
||||||
Source6: open-vm-tools-modprobe.conf
|
Source6: open-vm-tools-modprobe.conf
|
||||||
Source98: preamble
|
Source98: preamble
|
||||||
|
# PATCH-FIX-UPSTREAM open-vm-tools-vmxnet+kernel-3.0.patch idoenmez@suse.de -- Fix compilation with kernel 3.0
|
||||||
|
Patch0: open-vm-tools-vmxnet+kernel-3.0.patch
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
# don't use pkgconfig(gtk+-2.0) so we can build on SLE
|
# don't use pkgconfig(gtk+-2.0) so we can build on SLE
|
||||||
BuildRequires: gtk2-devel
|
BuildRequires: gtk2-devel
|
||||||
@ -157,6 +159,7 @@ if you intend to create own plugins for vmtoolsd.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}-%{svn_rev}
|
%setup -q -n %{name}-%{version}-%{svn_rev}
|
||||||
|
%patch0 -p0
|
||||||
chmod -x AUTHORS COPYING ChangeLog NEWS README
|
chmod -x AUTHORS COPYING ChangeLog NEWS README
|
||||||
# fix for an rpmlint warning regarding wrong line feeds
|
# fix for an rpmlint warning regarding wrong line feeds
|
||||||
sed -i -e "s/\r//" README
|
sed -i -e "s/\r//" README
|
||||||
@ -318,6 +321,7 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
%files gui
|
%files gui
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
|
%{_bindir}/vmware-toolbox
|
||||||
%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
|
%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
|
||||||
%verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper
|
%verify(not mode) %attr(0755,root,root) %{_bindir}/vmware-user-suid-wrapper
|
||||||
%{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so
|
%{_libdir}/%{name}/plugins/vmusr/libdesktopEvents.so
|
||||||
@ -326,6 +330,7 @@ rm -rf %{buildroot}
|
|||||||
%if 0%{?suse_version} >= 1140
|
%if 0%{?suse_version} >= 1140
|
||||||
%{_libdir}/%{name}/plugins/vmusr/libunity.so
|
%{_libdir}/%{name}/plugins/vmusr/libunity.so
|
||||||
%endif
|
%endif
|
||||||
|
%{_libdir}/%{name}/plugins/vmusr/libvixUser.so
|
||||||
%{_bindir}/vmware-user-autostart-wrapper
|
%{_bindir}/vmware-user-autostart-wrapper
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user