app-emulation/docker: Fix kernel checks
authorManuel Rüger <mrueg@gentoo.org>
Mon, 29 Jul 2019 09:12:25 +0000 (11:12 +0200)
committerManuel Rüger <mrueg@gentoo.org>
Mon, 29 Jul 2019 09:12:25 +0000 (11:12 +0200)
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Manuel Rüger <mrueg@gentoo.org>
app-emulation/docker/docker-18.09.8.ebuild

index 54a3355176f9fcd7eb04ee6e4d8c2ce90b552fd5..58711331389a4621b0393c68a42f00085d7f49fb 100644 (file)
@@ -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