commit a74b146fb7cdb5a1ce0ee68da258c779d824a097 Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Mon Jan 26 00:56:19 2015 +0100
- fix building on linux 3.18.3 - rel 4 open-vm-tools-linux-3.18.3.patch | 26 ++++++++++++++++++++++++++ open-vm-tools.spec | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) --- diff --git a/open-vm-tools.spec b/open-vm-tools.spec index b7a6dbf..e22d15b 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -37,7 +37,7 @@ exit 1 %define subver %(echo %{snap} | tr -d .) %define ver 9.4.6 %define rev 1770165 -%define rel 3 +%define rel 4 %define pname open-vm-tools %define modsrc modules/linux Summary: VMWare guest utilities @@ -61,6 +61,7 @@ Patch2: %{pname}-linux-3.12.patch Patch3: %{pname}-linux-3.14.patch Patch4: %{pname}-linux-3.15.patch Patch5: %{pname}-linux-3.16.patch +Patch6: %{pname}-linux-3.18.3.patch URL: http://open-vm-tools.sourceforge.net/ BuildRequires: rpmbuild(macros) >= 1.679 %if %{with userspace} @@ -323,6 +324,7 @@ export OVT_SOURCE_DIR=$PWD\ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %endif cp %{SOURCE1} packaging diff --git a/open-vm-tools-linux-3.18.3.patch b/open-vm-tools-linux-3.18.3.patch new file mode 100644 index 0000000..b9420b0 --- /dev/null +++ b/open-vm-tools-linux-3.18.3.patch @@ -0,0 +1,26 @@ +--- open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/inode.c~ 2015-01-26 00:51:45.000000000 +0100 ++++ open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/inode.c 2015-01-26 00:54:24.305830333 +0100 +@@ -1859,7 +1859,11 @@ + p, + #endif + &inode->i_dentry, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 3) + d_alias) { ++#else ++ d_u.d_alias) { ++#endif + int dcount = compat_d_count(dentry); + if (dcount) { + LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount)); +@@ -1912,7 +1916,11 @@ + /* Find a dentry with valid d_count. Refer bug 587879. */ + list_for_each(pos, &inode->i_dentry) { + int dcount; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 3) + struct dentry *dentry = list_entry(pos, struct dentry, d_alias); ++#else ++ struct dentry *dentry = list_entry(pos, struct dentry, d_u.d_alias); ++#endif + dcount = compat_d_count(dentry); + if (dcount) { + LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount)); ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/open-vm-tools.git/commitdiff/a74b146fb7cdb5a1ce0ee68da258c779d824a097 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit