From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E839713832E for ; Fri, 5 Aug 2016 07:29:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEA0AE0A5F; Fri, 5 Aug 2016 07:29:11 +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 28BD4E0A5F for ; Fri, 5 Aug 2016 07:29:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B6248340B7E for ; Fri, 5 Aug 2016 07:29:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D7762424 for ; Fri, 5 Aug 2016 07:29:07 +0000 (UTC) From: "Fabio Rossi" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabio Rossi" Message-ID: <1470381916.7688f8838d5b9761d0434d304be8fe8390270bd6.fabio@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.7-01-readlink_copy.patch app-emulation/vmware-modules/files/308-4.07-01-readlink_copy.patch app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild X-VCS-Directories: app-emulation/vmware-modules/files/ app-emulation/vmware-modules/ X-VCS-Committer: fabio X-VCS-Committer-Name: Fabio Rossi X-VCS-Revision: 7688f8838d5b9761d0434d304be8fe8390270bd6 X-VCS-Branch: master Date: Fri, 5 Aug 2016 07:29:07 +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: 47824dbc-ea84-4007-8071-dd805f51ef62 X-Archives-Hash: d902233c3a1c333e8ecd9f321eff3512 commit: 7688f8838d5b9761d0434d304be8fe8390270bd6 Author: Fabio Rossi inwind it> AuthorDate: Fri Aug 5 07:25:16 2016 +0000 Commit: Fabio Rossi inwind net> CommitDate: Fri Aug 5 07:25:16 2016 +0000 URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=7688f883 app-emulation/vmware-modules: complete support to kernel 4.7 Latest 4.7 kernel doesn't export anymore the readlink_copy() function: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=bfe8804d908a791b16e3686c101f0d7eca9fb5b9 This fixes bug #590220 .../vmware-modules/files/304-4.7-01-readlink_copy.patch | 16 ++++++++++++++++ .../vmware-modules/files/308-4.07-01-readlink_copy.patch | 16 ++++++++++++++++ .../vmware-modules/vmware-modules-304.3-r1.ebuild | 1 + .../vmware-modules/vmware-modules-308.1.1.ebuild | 1 + 4 files changed, 34 insertions(+) diff --git a/app-emulation/vmware-modules/files/304-4.7-01-readlink_copy.patch b/app-emulation/vmware-modules/files/304-4.7-01-readlink_copy.patch new file mode 100644 index 0000000..5fccd97 --- /dev/null +++ b/app-emulation/vmware-modules/files/304-4.7-01-readlink_copy.patch @@ -0,0 +1,16 @@ +--- vmblock-only/linux/inode.c 2016-08-03 19:26:15.293707751 +0200 ++++ vmblock-only/linux/inode.c.new 2016-08-03 21:37:42.199148756 +0200 +@@ -205,10 +205,11 @@ + + #if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99) + return vfs_readlink(dentry, buffer, buflen, iinfo->name); ++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99) ++ return readlink_copy(buffer, buflen, iinfo->name); + #else +- return readlink_copy(buffer, buflen, iinfo->name); ++ return generic_readlink(dentry, buffer, buflen); + #endif +- + } + + diff --git a/app-emulation/vmware-modules/files/308-4.07-01-readlink_copy.patch b/app-emulation/vmware-modules/files/308-4.07-01-readlink_copy.patch new file mode 100644 index 0000000..5fccd97 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.07-01-readlink_copy.patch @@ -0,0 +1,16 @@ +--- vmblock-only/linux/inode.c 2016-08-03 19:26:15.293707751 +0200 ++++ vmblock-only/linux/inode.c.new 2016-08-03 21:37:42.199148756 +0200 +@@ -205,10 +205,11 @@ + + #if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99) + return vfs_readlink(dentry, buffer, buflen, iinfo->name); ++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99) ++ return readlink_copy(buffer, buflen, iinfo->name); + #else +- return readlink_copy(buffer, buflen, iinfo->name); ++ return generic_readlink(dentry, buffer, buflen); + #endif +- + } + + diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild index 665965c..ba97b17 100644 --- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild @@ -103,6 +103,7 @@ src_prepare() { kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch" kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch" kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch" + kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-01-readlink_copy.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.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild index 1bfbcb4..da4a7a1 100644 --- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild @@ -103,6 +103,7 @@ src_prepare() { kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch" kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch" kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch" + kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-01-readlink_copy.patch" # Allow user patches so they can support RC kernels and whatever else epatch_user