packages: open-vm-tools/open-vm-tools.spec, open-vm-tools/open-vm-tools-ker...

[baggins]

Author: baggins                      Date: Fri Apr  6 20:21:23 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ifdef ethtools methods removed in linux 3.3 from vmxnet

---- Files affected:
packages/open-vm-tools:
   open-vm-tools.spec (1.137 -> 1.138) , open-vm-tools-kernel-3.3.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/open-vm-tools/open-vm-tools.spec
diff -u packages/open-vm-tools/open-vm-tools.spec:1.137 packages/open-vm-tools/open-vm-tools.spec:1.138
--- packages/open-vm-tools/open-vm-tools.spec:1.137	Fri Apr  6 22:00:40 2012
+++ packages/open-vm-tools/open-vm-tools.spec	Fri Apr  6 22:21:18 2012
@@ -28,6 +28,7 @@
 Source3:	%{name}-init
 Source4:	%{name}-vmware-user.desktop
 Patch0:		%{name}-kernel-3.2.patch
+Patch1:		%{name}-kernel-3.3.patch
 URL:		http://open-vm-tools.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.453
 %if %{with userspace}
@@ -222,6 +223,7 @@
 #setup -q -n %{name}-%{snap}-%{rev}
 %setup -q -n %{name}-%{ver}-%{rev}
 %patch0 -p1
+%patch1 -p1
 
 cp %{SOURCE1} packaging
 %{__sed} -i -e 's|##{BUILD_OUTPUT}##|build|' docs/api/doxygen.conf
@@ -415,6 +417,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138  2012/04/06 20:21:18  baggins
+- ifdef ethtools methods removed in linux 3.3 from vmxnet
+
 Revision 1.137  2012/04/06 20:00:40  baggins
 - fix vmxnet build with kernels 3.2+
 

================================================================
Index: packages/open-vm-tools/open-vm-tools-kernel-3.3.patch
diff -u /dev/null packages/open-vm-tools/open-vm-tools-kernel-3.3.patch:1.1
--- /dev/null	Fri Apr  6 22:21:23 2012
+++ packages/open-vm-tools/open-vm-tools-kernel-3.3.patch	Fri Apr  6 22:21:18 2012
@@ -0,0 +1,18 @@
+--- open-vm-tools-8.8.2-590212/modules/linux/vmxnet/vmxnet.c~	2012-04-06 21:44:30.147182151 +0200
++++ open-vm-tools-8.8.2-590212/modules/linux/vmxnet/vmxnet.c	2012-04-06 22:20:15.724058800 +0200
+@@ -522,6 +522,7 @@
+    .get_settings        = vmxnet_get_settings,
+    .get_drvinfo         = vmxnet_get_drvinfo,
+    .get_link            = ethtool_op_get_link,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
+    .get_rx_csum         = vmxnet_get_rx_csum,
+    .set_rx_csum         = vmxnet_set_rx_csum,
+    .get_tx_csum         = vmxnet_get_tx_csum,
+@@ -535,6 +536,7 @@
+    .get_ufo             = ethtool_op_get_ufo,
+ #   endif
+ #endif
++#endif
+ };
+ 
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/open-vm-tools/open-vm-tools.spec?r1=1.137&r2=1.138