From 0326b3e5c8bd3163cd658cc99b865251756bfec2 Mon Sep 17 00:00:00 2001 From: Fabio Rossi Date: Wed, 24 May 2017 01:08:30 +0200 Subject: app-emulation/vmware-modules: add support to kernel 4.11 --- .../files/308-4.11-00-missing-headers-p1.patch | 40 ++++++++++++++++++++++ .../files/308-4.11-00-missing-headers-p2.patch | 20 +++++++++++ .../files/308-4.11-01-vsock-lockdep.patch | 21 ++++++++++++ .../vmware-modules/files/308-4.11-02-vmmon.patch | 30 ++++++++++++++++ .../vmware-modules/vmware-modules-308.1.1.ebuild | 4 +++ .../vmware-modules/vmware-modules-308.5.6.ebuild | 2 ++ 6 files changed, 117 insertions(+) create mode 100644 app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch create mode 100644 app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch create mode 100644 app-emulation/vmware-modules/files/308-4.11-01-vsock-lockdep.patch create mode 100644 app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch diff --git a/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch new file mode 100644 index 0000000..60fcdfc --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p1.patch @@ -0,0 +1,40 @@ +--- vmblock-only/linux/inode.c 2017-05-06 16:54:57.000000000 +0200 ++++ vmblock-only/linux/inode.c.new 2017-05-06 16:55:32.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include "vmblockInt.h" + #include "filesystem.h" +--- vmci-only/linux/driver.c 2017-05-06 16:59:06.000000000 +0200 ++++ vmci-only/linux/driver.c.new 2017-05-06 17:00:03.000000000 +0200 +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + #include "compat_highmem.h" + #include "compat_interrupt.h" +--- vmci-only/linux/vmciKernelIf.c 2017-05-06 17:00:42.000000000 +0200 ++++ vmci-only/linux/vmciKernelIf.c.new 2017-05-06 17:01:24.000000000 +0200 +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #include "compat_highmem.h" + #include "compat_interrupt.h" +--- vsock-only/linux/af_vsock.c 2017-05-06 17:02:05.000000000 +0200 ++++ vsock-only/linux/af_vsock.c.new 2017-05-06 17:02:49.000000000 +0200 +@@ -106,6 +106,7 @@ + #include + #include + #include ++#include + #include + #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) + # include diff --git a/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch new file mode 100644 index 0000000..29a0c9d --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.11-00-missing-headers-p2.patch @@ -0,0 +1,20 @@ +--- vmmon-only/linux/hostif.c 2017-05-06 16:56:09.000000000 +0200 ++++ vmmon-only/linux/hostif.c.new 2017-05-06 16:56:41.000000000 +0200 +@@ -73,6 +73,7 @@ + #include + #include + #include ++#include + + #include + +--- vmnet-only/userif.c 2017-03-13 04:05:59.000000000 +0100 ++++ vmnet-only/userif.c.new 2017-05-06 16:58:32.000000000 +0200 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/app-emulation/vmware-modules/files/308-4.11-01-vsock-lockdep.patch b/app-emulation/vmware-modules/files/308-4.11-01-vsock-lockdep.patch new file mode 100644 index 0000000..7218d27 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.11-01-vsock-lockdep.patch @@ -0,0 +1,21 @@ +--- vsock-only/linux/af_vsock.c 2017-05-21 00:58:02.900776185 +0200 ++++ vsock-only/linux/af_vsock.c.new 2017-05-21 00:57:18.932773727 +0200 +@@ -213,7 +213,7 @@ + struct sockaddr *addr, int addrLen, int flags); + static int VSockVmciStreamConnect(struct socket *sock, + struct sockaddr *addr, int addrLen, int flags); +-static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int flags); ++static int VSockVmciAccept(struct socket *sock, struct socket *newsock, int flags, bool kern); + static int VSockVmciGetname(struct socket *sock, + struct sockaddr *addr, int *addrLen, int peer); + static unsigned int VSockVmciPoll(struct file *file, +@@ -3772,7 +3772,8 @@ + static int + VSockVmciAccept(struct socket *sock, // IN + struct socket *newsock, // IN/OUT +- int flags) // IN ++ int flags, // IN ++ bool kern) // IN + { + struct sock *listener; + int err; diff --git a/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch b/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch new file mode 100644 index 0000000..b126453 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch @@ -0,0 +1,30 @@ +diff -ur old/vmmon-only/linux/driver.c vmmon-only/linux/driver.c +--- old/vmmon-only/linux/driver.c 2016-11-12 09:15:52.000000000 +0200 ++++ vmmon-only/linux/driver.c 2017-03-06 10:46:33.347053458 +0200 +@@ -105,7 +105,7 @@ + static int LinuxDriver_Close(struct inode *inode, struct file *filp); + static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait); + #if defined(VMW_NOPAGE_2624) +-static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault); ++static int LinuxDriverFault(struct vm_fault *fault); + #else + static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, + unsigned long address, +@@ -882,15 +882,14 @@ + */ + + #if defined(VMW_NOPAGE_2624) +-static int LinuxDriverFault(struct vm_area_struct *vma, //IN +- struct vm_fault *fault) //IN/OUT ++static int LinuxDriverFault(struct vm_fault *fault) //IN/OUT + #else + static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN + unsigned long address, //IN + int *type) //OUT: Fault type + #endif + { +- VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data; ++ VMLinux *vmLinux = (VMLinux *) fault->vma->vm_file->private_data; + unsigned long pg; + struct page* page; + diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild index 51eaa63..86ee488 100644 --- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild @@ -109,6 +109,10 @@ src_prepare() { kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p1.patch" kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p2.patch" kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch" + kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p1.patch" + kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p2.patch" + kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch" + kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-02-vmmon.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild b/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild index 4fcb06c..92fc364 100644 --- a/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-308.5.6.ebuild @@ -106,6 +106,8 @@ src_prepare() { kernel_is ge 4 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.08-00-nr_anon_mapped.patch" kernel_is ge 4 9 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.09-00-user-pages-p1.patch" kernel_is ge 4 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.10-00-generic_readlink.patch" + kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-00-missing-headers-p1.patch" + kernel_is ge 4 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.11-01-vsock-lockdep.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user -- cgit v1.2.3-65-gdbad