1 |
commit: 4ce24a96acc1f161e4ced2ab4cad13e6f18b2090 |
2 |
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 29 09:12:25 2019 +0000 |
4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 29 09:12:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce24a96 |
7 |
|
8 |
app-emulation/docker: Fix kernel checks |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Manuel Rüger <mrueg <AT> gentoo.org> |
12 |
|
13 |
app-emulation/docker/docker-18.09.8.ebuild | 12 ++++++++++-- |
14 |
1 file changed, 10 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/docker/docker-18.09.8.ebuild b/app-emulation/docker/docker-18.09.8.ebuild |
17 |
index 54a3355176f..58711331389 100644 |
18 |
--- a/app-emulation/docker/docker-18.09.8.ebuild |
19 |
+++ b/app-emulation/docker/docker-18.09.8.ebuild |
20 |
@@ -71,7 +71,7 @@ CONFIG_CHECK=" |
21 |
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG |
22 |
~KEYS |
23 |
~VETH ~BRIDGE ~BRIDGE_NETFILTER |
24 |
- ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE |
25 |
+ ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE |
26 |
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS |
27 |
~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED |
28 |
~POSIX_MQUEUE |
29 |
@@ -81,7 +81,7 @@ CONFIG_CHECK=" |
30 |
~CGROUP_PIDS |
31 |
~MEMCG_SWAP ~MEMCG_SWAP_ENABLED |
32 |
|
33 |
- ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED |
34 |
+ ~BLK_CGROUP ~BLK_DEV_THROTTLING |
35 |
~CGROUP_PERF |
36 |
~CGROUP_HUGETLB |
37 |
~NET_CLS_CGROUP |
38 |
@@ -141,6 +141,14 @@ pkg_setup() { |
39 |
" |
40 |
fi |
41 |
|
42 |
+ if kernel_is lt 5 1; then |
43 |
+ CONFIG_CHECK+=" |
44 |
+ ~NF_NAT_IPV4 |
45 |
+ ~IOSCHED_CFQ |
46 |
+ ~CFQ_GROUP_IOSCHED |
47 |
+ " |
48 |
+ fi |
49 |
+ |
50 |
if use aufs; then |
51 |
CONFIG_CHECK+=" |
52 |
~AUFS_FS |