diff --git a/open-vm-tools-linux-3.17.patch b/open-vm-tools-linux-3.17.patch new file mode 100644 index 0000000..af778a9 --- /dev/null +++ b/open-vm-tools-linux-3.17.patch @@ -0,0 +1,14 @@ +Index: open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/page.c +=================================================================== +--- open-vm-tools-9.4.6-1770165.orig/modules/linux/vmhgfs/page.c ++++ open-vm-tools-9.4.6-1770165/modules/linux/vmhgfs/page.c +@@ -1385,7 +1385,9 @@ HgfsWbRequestWait(HgfsWbPage *req) // I + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + return wait_on_bit(&req->wb_flags, + PG_BUSY, ++# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) + HgfsWbRequestWaitUninterruptible, ++# endif + TASK_UNINTERRUPTIBLE); + #else + wait_event(req->wb_queue, diff --git a/open-vm-tools.changes b/open-vm-tools.changes index d20be92..0232536 100644 --- a/open-vm-tools.changes +++ b/open-vm-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 12 10:04:48 UTC 2014 - dimstar@opensuse.org + +- Add open-vm-tools-linux-3.17.patch: Fix build with Linux 3.17.0. + ------------------------------------------------------------------- Mon Nov 10 16:01:56 UTC 2014 - dimstar@opensuse.org diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 3e69287..f93e35a 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -75,6 +75,7 @@ Patch5: 0005-Update-hgfs-file-operations-for-newer-kernels.patch Patch6: 0006-Fix-vmxnet-module-on-kernels-3.16.patch Patch7: 0007-Fix-vmhgfs-module-on-kernels-3.16.patch Patch8: 0008-Fix-segfault-in-vmhgfs.patch +Patch10: open-vm-tools-linux-3.17.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ # don't use pkgconfig(gtk+-2.0) so we can build on SLE @@ -224,6 +225,7 @@ sed -i -e "s/\r//" README %patch6 -p2 %patch7 -p2 %patch8 -p2 +%patch10 -p1 %build # disable warning unused-but-set-variable which will raise error because of -Werror