From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 00C6659CA3 for ; Thu, 17 Mar 2016 01:44:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A7F7E0802; Thu, 17 Mar 2016 01:44:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC917E0802 for ; Thu, 17 Mar 2016 01:44:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DD6F340CE4 for ; Thu, 17 Mar 2016 01:44:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D296184D for ; Thu, 17 Mar 2016 01:44:19 +0000 (UTC) From: "Evan Teran" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Evan Teran" Message-ID: <1458179045.0ecc3a12322a6ed9456cbb5d5d9136a2699280a8.eteran@gentoo> Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/, app-emulation/vmware-modules/ X-VCS-Repository: proj/vmware X-VCS-Files: app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch app-emulation/vmware-modules/files/304-4.2-02-vsock.patch app-emulation/vmware-modules/files/304-4.2-03-vsock.patch app-emulation/vmware-modules/vmware-modules-304.3.ebuild X-VCS-Directories: app-emulation/vmware-modules/files/ app-emulation/vmware-modules/ X-VCS-Committer: eteran X-VCS-Committer-Name: Evan Teran X-VCS-Revision: 0ecc3a12322a6ed9456cbb5d5d9136a2699280a8 X-VCS-Branch: master Date: Thu, 17 Mar 2016 01:44:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6e8962e7-be4a-4f5b-a46b-83600489580d X-Archives-Hash: 0bcc6533425f7dc1378038fbc77d2d65 commit: 0ecc3a12322a6ed9456cbb5d5d9136a2699280a8 Author: Evan Teran gmail com> AuthorDate: Thu Mar 17 01:44:05 2016 +0000 Commit: Evan Teran gmail com> CommitDate: Thu Mar 17 01:44:05 2016 +0000 URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=0ecc3a12 app-emulation/vmware-modules: now vmware-modules:11 compiles cleanly on 4.2 Package-Manager: portage-2.2.26 .../vmware-modules/files/304-4.2-00-inode_op.patch | 45 +++++++++++++ .../files/304-4.2-01-vmci_vmalloc.patch | 13 ++++ .../vmware-modules/files/304-4.2-02-vsock.patch | 77 ++++++++++++++++++++++ .../vmware-modules/files/304-4.2-03-vsock.patch | 14 ++++ .../vmware-modules/vmware-modules-304.3.ebuild | 4 ++ 5 files changed, 153 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch b/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch new file mode 100644 index 0000000..e6f2acb --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.2-00-inode_op.patch @@ -0,0 +1,45 @@ +diff -rupN vmblock-only/linux/inode.c vmblock-only.new/linux/inode.c +--- vmblock-only/linux/inode.c 2016-03-16 21:24:25.771034759 -0400 ++++ vmblock-only.new/linux/inode.c 2016-03-16 21:26:22.697036311 -0400 +@@ -44,7 +44,9 @@ static struct dentry *InodeOpLookup(stru + static int InodeOpReadlink(struct dentry *, char __user *, int); + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); + #else + static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); +@@ -220,7 +222,9 @@ InodeOpReadlink(struct dentry *dentry, + * + *---------------------------------------------------------------------------- + */ +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie) ++#else + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void * + #else +@@ -228,6 +232,7 @@ static int + #endif + InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink + struct nameidata *nd) // OUT: stores result ++#endif + { + int ret; + VMBlockInodeInfo *iinfo; +@@ -244,7 +249,11 @@ InodeOpFollowlink(struct dentry *dentry, + goto out; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++ return *cookie = (char *)(iinfo->name); ++#else + nd_set_link(nd, iinfo->name); ++#endif + + out: + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) diff --git a/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch b/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch new file mode 100644 index 0000000..2296c06 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.2-01-vmci_vmalloc.patch @@ -0,0 +1,13 @@ +diff -rupN vmci-only/linux/driver.c vmci-only.new/linux/driver.c +--- vmci-only/linux/driver.c 2015-11-03 19:27:55.000000000 -0500 ++++ vmci-only.new/linux/driver.c 2016-03-16 21:30:47.646039829 -0400 +@@ -26,6 +26,9 @@ + + #include + #include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++#include ++#endif + #include + #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) + # include diff --git a/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch b/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch new file mode 100644 index 0000000..bdac109 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.2-02-vsock.patch @@ -0,0 +1,77 @@ +diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c +--- vsock-only/linux/af_vsock.c 2016-03-16 21:31:24.582040320 -0400 ++++ vsock-only.new/linux/af_vsock.c 2016-03-16 21:37:22.140045067 -0400 +@@ -231,7 +231,16 @@ static int VSockVmciStreamSetsockopt(str + + static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname, + char __user *optval, int __user * optlen); +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++static int VSockVmciDgramSendmsg( ++ struct socket *sock, struct msghdr *msg, size_t len); ++static int VSockVmciDgramRecvmsg(struct socket *sock, ++ struct msghdr *msg, size_t len, int flags); ++static int VSockVmciStreamSendmsg( ++ struct socket *sock, struct msghdr *msg, size_t len); ++static int VSockVmciStreamRecvmsg(struct socket *sock, ++ struct msghdr *msg, size_t len, int flags); ++#else + static int VSockVmciDgramSendmsg(struct kiocb *kiocb, + struct socket *sock, struct msghdr *msg, size_t len); + static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock, +@@ -240,6 +249,7 @@ static int VSockVmciStreamSendmsg(struct + struct socket *sock, struct msghdr *msg, size_t len); + static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock, + struct msghdr *msg, size_t len, int flags); ++#endif + + static int VSockVmciCreate( + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) +@@ -4210,7 +4220,11 @@ VSockVmciShutdown(struct socket *sock, + */ + + static int ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++VSockVmciDgramSendmsg( ++#else + VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED ++#endif + struct socket *sock, // IN: socket to send on + struct msghdr *msg, // IN: message to send + size_t len) // IN: length of message +@@ -4540,7 +4554,11 @@ VSockVmciStreamGetsockopt(struct socket + */ + + static int ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++VSockVmciStreamSendmsg( ++#else + VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED ++#endif + struct socket *sock, // IN: socket to send on + struct msghdr *msg, // IN: message to send + size_t len) // IN: length of message +@@ -4709,7 +4727,11 @@ out: + */ + + static int ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++VSockVmciDgramRecvmsg( ++#else + VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED ++#endif + struct socket *sock, // IN: socket to receive from + struct msghdr *msg, // IN/OUT: message to receive into + size_t len, // IN: length of receive buffer +@@ -4804,7 +4826,11 @@ out: + */ + + static int ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++VSockVmciStreamRecvmsg( ++#else + VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED ++#endif + struct socket *sock, // IN: socket to receive from + struct msghdr *msg, // IN/OUT: message to receive into + size_t len, // IN: length of receive buffer diff --git a/app-emulation/vmware-modules/files/304-4.2-03-vsock.patch b/app-emulation/vmware-modules/files/304-4.2-03-vsock.patch new file mode 100644 index 0000000..a2504a6 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.2-03-vsock.patch @@ -0,0 +1,14 @@ +diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c +--- vsock-only/linux/af_vsock.c 2016-03-16 21:38:01.401045589 -0400 ++++ vsock-only.new/linux/af_vsock.c 2016-03-16 21:39:32.529046799 -0400 +@@ -2836,7 +2836,9 @@ __VSockVmciCreate(struct net *net, + * network namespace, and the option to zero the sock was dropped. + * + */ +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) ++ sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1); ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12) + sk = sk_alloc(vsockVmciFamilyOps.family, priority, + vsockVmciProto.slab_obj_size, vsockVmciProto.slab); + #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) diff --git a/app-emulation/vmware-modules/vmware-modules-304.3.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3.ebuild index 0980673..a77203d 100644 --- a/app-emulation/vmware-modules/vmware-modules-304.3.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-304.3.ebuild @@ -95,6 +95,10 @@ src_prepare() { kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch" kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch" kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch" + kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-00-inode_op.patch" + kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-01-vmci_vmalloc.patch" + kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-02-vsock.patch" + kernel_is ge 4 2 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.2-03-vsock.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user