From 1f82966c2431d673140c861bbda89b3a04cbf3c5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 27 Apr 2014 09:24:51 +0200 Subject: [PATCH] - added fixes for linux 3.14 - rel 10 --- open-vm-tools-linux-3.14.patch | 25 +++++++++++++++++++++++++ open-vm-tools.spec | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 open-vm-tools-linux-3.14.patch diff --git a/open-vm-tools-linux-3.14.patch b/open-vm-tools-linux-3.14.patch new file mode 100644 index 0000000..84416fb --- /dev/null +++ b/open-vm-tools-linux-3.14.patch @@ -0,0 +1,25 @@ +--- open-vm-tools.sept-update/modules/linux/vmblock/linux/inode.c 2014-03-31 18:49:14.843009422 +0100 ++++ open-vm-tools.sept-update/modules/linux/vmblock/linux/inode.c 2014-03-31 18:50:52.617009677 +0100 +@@ -135,7 +135,12 @@ InodeOpLookup(struct inode *dir, // + inode->i_size = INODE_TO_IINFO(inode)->nameLen; + inode->i_version = 1; + inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) + inode->i_uid = inode->i_gid = 0; ++#else ++ inode->i_uid = GLOBAL_ROOT_UID; ++ inode->i_gid = GLOBAL_ROOT_GID; ++#endif + inode->i_op = &LinkInodeOps; + + d_add(dentry, inode); +--- open-vm-tools.sept-update/lib/include/vm_assert.h 2014-03-31 18:49:14.845009422 +0100 ++++ open-vm-tools.sept-update/lib/include/vm_assert.h 2014-03-31 18:49:21.390009439 +0100 +@@ -256,6 +256,7 @@ void WarningThrottled(uint32 *count, con + __FILE__, __LINE__, __FUNCTION__, \ + _fix)) + #else ++ #undef DEPRECATED /* in since 3.14.0 */ + #define DEPRECATED(_fix) do {} while (0) + #endif + diff --git a/open-vm-tools.spec b/open-vm-tools.spec index d684778..fa4f500 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.0 %define rev 1280544 -%define rel 9 +%define rel 10 %define pname open-vm-tools %define modsrc modules/linux Summary: VMWare guest utilities @@ -59,6 +59,7 @@ Source4: %{pname}-vmware-user.desktop Patch0: %{pname}-linux-3.10.patch Patch1: %{pname}-linux-3.11.patch Patch2: %{pname}-linux-3.12.patch +Patch3: %{pname}-linux-3.14.patch URL: http://open-vm-tools.sourceforge.net/ BuildRequires: rpmbuild(macros) >= 1.679 %if %{with userspace} @@ -319,6 +320,7 @@ export OVT_SOURCE_DIR=$PWD\ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %endif cp %{SOURCE1} packaging -- 2.44.0