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/files/, app-emulation/vmware-modules/
Date: Mon, 30 May 2016 21:52:56
Message-Id: 1464645044.92a78cb3305fc182764cb0c6b2c44892dcc35212.fabio@gentoo
1 commit: 92a78cb3305fc182764cb0c6b2c44892dcc35212
2 Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it>
3 AuthorDate: Mon May 30 21:50:44 2016 +0000
4 Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net>
5 CommitDate: Mon May 30 21:50:44 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=92a78cb3
7
8 app-emulation/vmware-modules: add support to kernel 4.7
9
10 Fix compilation with latest 4.7-rc1 taking example from
11 kernel commit 860e9538a9482bb84589f7d0718a7e6d0a944d58
12
13 .../vmware-modules/files/304-4.7-00-trans_start.patch | 11 +++++++++++
14 .../vmware-modules/files/308-4.07-00-trans_start.patch | 11 +++++++++++
15 app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild | 1 +
16 app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild | 1 +
17 4 files changed, 24 insertions(+)
18
19 diff --git a/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch b/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch
20 new file mode 100644
21 index 0000000..751924f
22 --- /dev/null
23 +++ b/app-emulation/vmware-modules/files/304-4.7-00-trans_start.patch
24 @@ -0,0 +1,11 @@
25 +--- ./vmnet-only/netif.c.old 2016-05-19 20:13:14.259914206 +0200
26 ++++ ./vmnet-only/netif.c 2016-05-19 20:13:21.250914596 +0200
27 +@@ -465,7 +465,7 @@
28 + VNetSend(&netIf->port.jack, skb);
29 +
30 + netIf->stats.tx_packets++;
31 +- dev->trans_start = jiffies;
32 ++ netif_trans_update(dev);
33 +
34 + return 0;
35 + }
36
37 diff --git a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
38 new file mode 100644
39 index 0000000..751924f
40 --- /dev/null
41 +++ b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
42 @@ -0,0 +1,11 @@
43 +--- ./vmnet-only/netif.c.old 2016-05-19 20:13:14.259914206 +0200
44 ++++ ./vmnet-only/netif.c 2016-05-19 20:13:21.250914596 +0200
45 +@@ -465,7 +465,7 @@
46 + VNetSend(&netIf->port.jack, skb);
47 +
48 + netIf->stats.tx_packets++;
49 +- dev->trans_start = jiffies;
50 ++ netif_trans_update(dev);
51 +
52 + return 0;
53 + }
54
55 diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
56 index c56f4de..665965c 100644
57 --- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
58 +++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
59 @@ -102,6 +102,7 @@ src_prepare() {
60 kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.3-00-misc_deregister.patch"
61 kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.5-00-get_link.patch"
62 kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.6-00-user-pages.patch"
63 + kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.7-00-trans_start.patch"
64
65 # Allow user patches so they can support RC kernels and whatever else
66 epatch_user
67
68 diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
69 index a7e1daa..1bfbcb4 100644
70 --- a/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
71 +++ b/app-emulation/vmware-modules/vmware-modules-308.1.1.ebuild
72 @@ -102,6 +102,7 @@ src_prepare() {
73 kernel_is ge 4 3 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
74 kernel_is ge 4 5 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.05-00-vmblock-follow_link.patch"
75 kernel_is ge 4 6 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.06-00-user-pages.patch"
76 + kernel_is ge 4 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.07-00-trans_start.patch"
77
78 # Allow user patches so they can support RC kernels and whatever else
79 epatch_user