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

[baggins]

Author: baggins                      Date: Sun Jul  1 12:47:32 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix building with linux 3.4

---- Files affected:
packages/open-vm-tools:
   open-vm-tools.spec (1.150 -> 1.151) , open-vm-tools-kernel-3.4.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.150 packages/open-vm-tools/open-vm-tools.spec:1.151
--- packages/open-vm-tools/open-vm-tools.spec:1.150	Sat Jun 23 21:49:52 2012
+++ packages/open-vm-tools/open-vm-tools.spec	Sun Jul  1 14:47:26 2012
@@ -30,6 +30,7 @@
 Source4:	%{pname}-vmware-user.desktop
 Patch0:		%{pname}-kernel-3.2.patch
 Patch1:		%{pname}-kernel-3.3.patch
+Patch2:		%{pname}-kernel-3.4.patch
 URL:		http://open-vm-tools.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.453
 %if %{with userspace}
@@ -225,6 +226,7 @@
 %setup -q -n %{pname}-%{ver}-%{rev}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 cp %{SOURCE1} packaging
 %{__sed} -i -e 's|##{BUILD_OUTPUT}##|build|' docs/api/doxygen.conf
@@ -420,6 +422,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2012/07/01 12:47:26  baggins
+- fix building with linux 3.4
+
 Revision 1.150  2012/06/23 19:49:52  arekm
 - rebuild for kernel-3.4.4-1
 - release 13 (by relup.sh)

================================================================
Index: packages/open-vm-tools/open-vm-tools-kernel-3.4.patch
diff -u /dev/null packages/open-vm-tools/open-vm-tools-kernel-3.4.patch:1.1
--- /dev/null	Sun Jul  1 14:47:32 2012
+++ packages/open-vm-tools/open-vm-tools-kernel-3.4.patch	Sun Jul  1 14:47:26 2012
@@ -0,0 +1,45 @@
+--- modules/linux/vmhgfs/filesystem.c.old	2012-06-08 11:46:42.000000000 +0000
++++ modules/linux/vmhgfs/filesystem.c	2012-06-08 11:47:57.000000000 +0000
+@@ -31,6 +31,7 @@
+ #include <linux/list.h>
+ #include <linux/module.h>
+ #include <linux/pagemap.h>
++#include <linux/version.h>
+ #include "compat_cred.h"
+ #include "compat_dcache.h"
+ #include "compat_fs.h"
+@@ -375,8 +376,11 @@
+              __func__));
+       goto exit;
+    }
+-
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
+    tempRootDentry = d_alloc_root(rootInode);
++#else
++   tempRootDentry = d_make_root(rootInode);
++#endif
+    if (tempRootDentry == NULL) {
+       LOG(4, (KERN_WARNING "VMware hgfs: %s: Could not get "
+               "root dentry\n", __func__));
+--- modules/linux/vmblock/linux/filesystem.c.old	2012-06-08 11:48:17.000000000 +0000
++++ modules/linux/vmblock/linux/filesystem.c	2012-06-08 11:49:05.000000000 +0000
+@@ -29,6 +29,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/mount.h>
+ #include <linux/fs.h>
++#include <linux/version.h>
+ 
+ #include "compat_namei.h"
+ 
+@@ -525,7 +526,11 @@
+       return -EINVAL;
+    }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)
+    rootDentry = d_alloc_root(rootInode);
++#else
++   rootDentry = d_make_root(rootInode);
++#endif
+    if (!rootDentry) {
+       iput(rootInode);
+       return -ENOMEM;
================================================================

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