Gentoo Archives: gentoo-commits

From: Fabio Rossi <rossi.f@××××××.net>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/, app-emulation/vmware-modules/files/
Date: Sat, 07 Apr 2018 15:00:44
Message-Id: 1519144984.78376a3171e9d29c9d132929159d22628fe86776.fabio@gentoo
1 commit: 78376a3171e9d29c9d132929159d22628fe86776
2 Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it>
3 AuthorDate: Tue Feb 20 16:43:04 2018 +0000
4 Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net>
5 CommitDate: Tue Feb 20 16:43:04 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=78376a31
7
8 app-emulation/vmware-modules: add support to kernel 4.16-rc2
9
10 The changes are due to kernel commit ae5e165d855dd978a461b22175531b07f54fb61f,
11 there is a new API to access inode->i_version
12
13 .../files/308-4.16-00-vmblock-iversion.patch | 25 ++++++++++++++++++++++
14 .../vmware-modules/vmware-modules-308.5.8.ebuild | 1 +
15 2 files changed, 26 insertions(+)
16
17 diff --git a/app-emulation/vmware-modules/files/308-4.16-00-vmblock-iversion.patch b/app-emulation/vmware-modules/files/308-4.16-00-vmblock-iversion.patch
18 new file mode 100644
19 index 0000000..42efdb9
20 --- /dev/null
21 +++ b/app-emulation/vmware-modules/files/308-4.16-00-vmblock-iversion.patch
22 @@ -0,0 +1,25 @@
23 +--- ./vmblock-only/linux/inode.c 2018-02-20 16:33:44.296417858 +0100
24 ++++ ./vmblock-only/linux/inode.c.new 2018-02-20 17:33:24.525618051 +0100
25 +@@ -30,6 +30,10 @@
26 + #include <linux/namei.h>
27 + #include <linux/cred.h>
28 +
29 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
30 ++#include <linux/iversion.h>
31 ++#endif
32 ++
33 + #include "vmblockInt.h"
34 + #include "filesystem.h"
35 + #include "block.h"
36 +@@ -155,7 +159,11 @@
37 +
38 + inode->i_mode = S_IFLNK | S_IRWXUGO;
39 + inode->i_size = INODE_TO_IINFO(inode)->nameLen;
40 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
41 ++ inode_set_iversion(inode, 1);
42 ++#else
43 + inode->i_version = 1;
44 ++#endif
45 + inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
46 + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
47 + inode->i_uid = inode->i_gid = 0;
48
49 diff --git a/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild b/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
50 index e6f2999..17264ed 100644
51 --- a/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
52 +++ b/app-emulation/vmware-modules/vmware-modules-308.5.8.ebuild
53 @@ -115,6 +115,7 @@ src_prepare() {
54 kernel_is ge 4 14 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.14-00-vmmon-global-page-state.patch"
55 kernel_is ge 4 14 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.14-01-deprecated-asm-uaccess.patch"
56 kernel_is ge 4 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.15-00-init_timer.patch"
57 + kernel_is ge 4 16 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.16-00-vmblock-iversion.patch"
58
59 # Allow user patches so they can support RC kernels and whatever else
60 epatch_user