From: Manuel Rüger <mrueg@gentoo.org>
Date: Mon, 29 Jul 2019 09:12:25 +0000 (+0200)
Subject: app-emulation/docker: Fix kernel checks
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4ce24a96acc1f161e4ced2ab4cad13e6f18b2090;p=gentoo.git

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>
---

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