summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Rüger <mrueg@gentoo.org>2019-07-29 11:12:25 +0200
committerManuel Rüger <mrueg@gentoo.org>2019-07-29 11:12:25 +0200
commit4ce24a96acc1f161e4ced2ab4cad13e6f18b2090 (patch)
treed2bd205a4a5e6e5431cb094fb87e3fd13ba98c40 /app-emulation
parentapp-emulation/docker: Remove old (diff)
downloadgentoo-4ce24a96acc1f161e4ced2ab4cad13e6f18b2090.tar.gz
gentoo-4ce24a96acc1f161e4ced2ab4cad13e6f18b2090.tar.bz2
gentoo-4ce24a96acc1f161e4ced2ab4cad13e6f18b2090.zip
app-emulation/docker: Fix kernel checks
Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Manuel Rüger <mrueg@gentoo.org>
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/docker/docker-18.09.8.ebuild12
1 files changed, 10 insertions, 2 deletions
diff --git a/app-emulation/docker/docker-18.09.8.ebuild b/app-emulation/docker/docker-18.09.8.ebuild
index 54a3355176f9..58711331389a 100644
--- a/app-emulation/docker/docker-18.09.8.ebuild
+++ b/app-emulation/docker/docker-18.09.8.ebuild
@@ -71,7 +71,7 @@ CONFIG_CHECK="
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
~KEYS
~VETH ~BRIDGE ~BRIDGE_NETFILTER
- ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+ ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
~POSIX_MQUEUE
@@ -81,7 +81,7 @@ CONFIG_CHECK="
~CGROUP_PIDS
~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
- ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+ ~BLK_CGROUP ~BLK_DEV_THROTTLING
~CGROUP_PERF
~CGROUP_HUGETLB
~NET_CLS_CGROUP
@@ -141,6 +141,14 @@ pkg_setup() {
"
fi
+ if kernel_is lt 5 1; then
+ CONFIG_CHECK+="
+ ~NF_NAT_IPV4
+ ~IOSCHED_CFQ
+ ~CFQ_GROUP_IOSCHED
+ "
+ fi
+
if use aufs; then
CONFIG_CHECK+="
~AUFS_FS