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 18AB6138247 for ; Fri, 10 Oct 2014 13:55:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BC93E0B2B; Fri, 10 Oct 2014 13:55:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 67D14E0B28 for ; Fri, 10 Oct 2014 13:55:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4563E33FF5E for ; Fri, 10 Oct 2014 13:55:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 956C277B2 for ; Fri, 10 Oct 2014 13:55:21 +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: <1412889880.5bf8b1f68790299292623fa59ecce2415a230ade.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/271-3.15-00-readlink.patch app-emulation/vmware-modules/files/271-3.15-01-vsock.patch app-emulation/vmware-modules/vmware-modules-271.3-r1.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: 5bf8b1f68790299292623fa59ecce2415a230ade X-VCS-Branch: master Date: Fri, 10 Oct 2014 13:55:21 +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: 82f6f1ee-6543-4b62-9966-b4cb854ff5eb X-Archives-Hash: 1e0c4d331f3658459210a4eb9d3a0c32 commit: 5bf8b1f68790299292623fa59ecce2415a230ade Author: Evan Teran gmail com> AuthorDate: Thu Oct 9 21:24:40 2014 +0000 Commit: Evan Teran gmail com> CommitDate: Thu Oct 9 21:24:40 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=5bf8b1f6 compiles with 3.14/3.15 moving onto 3.16... --- .../files/271-3.15-00-readlink.patch | 12 ++++++ .../vmware-modules/files/271-3.15-01-vsock.patch | 43 ++++++++++++++++++++++ .../vmware-modules/vmware-modules-271.3-r1.ebuild | 7 ++-- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch new file mode 100644 index 0000000..36be37f --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch @@ -0,0 +1,12 @@ +diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c +--- vmblock-only/linux/inode.c 2014-10-05 23:20:14.545218357 -0400 ++++ vmblock-only/linux/inode.c 2014-10-05 23:33:01.549259933 -0400 +@@ -178,7 +178,7 @@ InodeOpReadlink(struct dentry *dentry, + return -EINVAL; + } + +- return vfs_readlink(dentry, buffer, buflen, iinfo->name); ++ return readlink_copy(buffer, buflen, iinfo->name); + } + + diff --git a/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch b/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch new file mode 100644 index 0000000..a880a75 --- /dev/null +++ b/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch @@ -0,0 +1,43 @@ +diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c +--- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -0500 ++++ vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400 +@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk, + vsk = vsock_sk(sk); + PKT_FIELD(vsk, sentWaitingRead) = FALSE; + #endif +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ sk->sk_data_ready(sk); ++#else + sk->sk_data_ready(sk, 0); ++#endif + } + + +diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c +--- vsock-only/linux/notifyQState.c 2013-11-05 23:33:27.000000000 -0500 ++++ vsock-only.new/linux/notifyQState.c 2014-10-05 23:46:33.231303931 -0400 +@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk, + struct sockaddr_vm *dst, // IN: unused + struct sockaddr_vm *src) // IN: unused + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ sk->sk_data_ready(sk); ++#else + sk->sk_data_ready(sk, 0); ++#endif + } + + +@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct + } + + /* See the comment in VSockVmciNotifyPktSendPostEnqueue */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ sk->sk_data_ready(sk); ++#else + sk->sk_data_ready(sk, 0); ++#endif + } + + return err; diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild index e922472..f1b1f2b 100644 --- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild @@ -79,10 +79,9 @@ src_prepare() { kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch" kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch" - - kernel_is ge 3 13 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch" - - + kernel_is ge 3 13 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.13-00-vmnet.patch" + kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-readlink.patch" + kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-01-vsock.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user