pool/open-vm-tools
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

- Update to version 8.8.1 (Stable series):

Browse Source 
* Updated code for compatibility with newer Linux kernel releases
    and with newer NetworkManager releases.
- dropped vmxnet+kernel-3.0 (not needed anymore)
- build with PIE [bnc#743130]

OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=213
This commit is contained in:
Pavol Rusnak
2012-01-24 16:53:12 +00:00
committed by Git OBS Bridge
parent 8be875ef89
commit d7fa98b44f
5 changed files with 23 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
open-vm-tools-8.8.0-471268.tar.gz
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:642cf860c9910cd64424a588f8ac4ad500af358e5ca992862bfbd667224ff79c
size 3760851

3
open-vm-tools-8.8.1-528969.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eba9dfb87b3f1bcea9b956e417e5bbaefe1ff20b41ddcf1f49035f5cfb3c56c1
size 3761288

46
open-vm-tools-vmxnet+kernel-3.0.patch
View File

@@ -1,46 +0,0 @@
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)

9
open-vm-tools.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Jan 24 15:53:36 UTC 2012 - prusnak@opensuse.org
- Update to version 8.8.1 (Stable series):
* Updated code for compatibility with newer Linux kernel releases
and with newer NetworkManager releases.
- dropped vmxnet+kernel-3.0 (not needed anymore)
- build with PIE [bnc#743130]
-------------------------------------------------------------------
Wed Sep 21 20:34:59 UTC 2011 - dimstar@opensuse.org

23
open-vm-tools.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package open-vm-tools
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands.
#
# All modifications and additions to the file contributed by third parties
@@ -27,10 +27,10 @@
%define with_X 1
Name: open-vm-tools
Version: 8.8.0
Version: 8.8.1
Release: 1
%define svn_rev 471268
License: BSD3c ; GPLv2 ; LGPLv2.1
%define svn_rev 528969
License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1
Summary: Open Virtual Machine Tools
Url: http://open-vm-tools.sourceforge.net/
Group: System/Emulators/PC
@@ -41,8 +41,6 @@ Source4: open-vm-tools.permissions
Source5: vmware-user-autostart-wrapper
Source6: open-vm-tools-modprobe.conf
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++
# don't use pkgconfig(gtk+-2.0) so we can build on SLE
BuildRequires: gtk2-devel
@@ -96,7 +94,7 @@ useful functions like:
guests and from guest to guest
%package -n vmware-guest-KMP
License: BSD3c ; GPLv2 ; LGPLv2.1
License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1
Summary: Open Virtual Machine Tools - for VM GUESTS
Group: System/Emulators/PC
@@ -127,7 +125,7 @@ guests and from guest to guest
%if %{with_X}
%package gui
License: BSD3c ; GPLv2 ; LGPLv2.1
License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1
Summary: Open Virtual Machine Tools - GUI
Group: System/Emulators/PC
Requires: open-vm-tools
@@ -139,7 +137,7 @@ GUI Toolbox for Open Virtual Machine Tools
%endif
%package -n libvmtools0
License: BSD3c ; GPLv2 ; LGPLv2.1
License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1
Summary: Open Virtual Machine Tools - shared library
Group: System/Libraries
@@ -148,7 +146,7 @@ This is a shared library used by several Open VM Tools components,
such as vmware-toolbox-cmd and vmtoolsd (and its plugins).
%package -n libvmtools-devel
License: BSD3c ; GPLv2 ; LGPLv2.1
License: BSD-3-Clause ; GPL-2.0 ; LGPL-2.1
Summary: Open Virtual Machine Tools - Development headers
Group: Development
Requires: libvmtools0 = %{version}
@@ -159,14 +157,15 @@ if you intend to create own plugins for vmtoolsd.
%prep
%setup -q -n %{name}-%{version}-%{svn_rev}
%patch0 -p0
chmod -x AUTHORS COPYING ChangeLog NEWS README
# fix for an rpmlint warning regarding wrong line feeds
sed -i -e "s/\r//" README
%build
# disable warning unused-but-set-variable which will raise error because of -Werror
export CFLAGS="%{optflags} -Wno-unused-but-set-variable"
export CFLAGS="%{optflags} -Wno-unused-but-set-variable -fPIE"
export CPPFLAGS="%{optflags} -Wno-unused-but-set-variable -fPIE"
export LDFLAGS="-pie"
# comments in a continued line seem not to work... shame
# --disable-unity : liburiparser was not present before 11.0
%configure \