diff options
| author |   William Hubbs <williamh@gentoo.org> | 2016-07-29 23:03:48 -0500 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2016-07-29 23:04:44 -0500 |
| commit | dd94ae2304e4bb6845f178446eb1b87f4b21d7aa (patch) | |
| tree | c7551c9f1b2b8202c99246b39f82ed1e9739664a /app-emulation/docker | |
| parent | app-emulation/docker: 1.12.0: clean up kernel checks (diff) | |
| download | gentoo-dd94ae2304e4bb6845f178446eb1b87f4b21d7aa.tar.gz gentoo-dd94ae2304e4bb6845f178446eb1b87f4b21d7aa.tar.bz2 gentoo-dd94ae2304e4bb6845f178446eb1b87f4b21d7aa.zip | |
app-emulation/docker: sync live ebuild
Package-Manager: portage-2.2.28
Diffstat (limited to 'app-emulation/docker')
| -rw-r--r-- | app-emulation/docker/docker-9999.ebuild | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild index 9f78ea58ede9..aff078a5804b 100644 --- a/app-emulation/docker/docker-9999.ebuild +++ b/app-emulation/docker/docker-9999.ebuild @@ -70,13 +70,12 @@ S="${WORKDIR}/${P}/src/${EGO_PN}" # see "contrib/check-config.sh" from upstream's sources CONFIG_CHECK=" ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~DEVPTS_MULTIPLE_INSTANCES ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_TARGET_MASQUERADE ~IP_VS ~IP_VS_RR ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK - ~NETFILTER_XT_MATCH_IVPS + ~NETFILTER_XT_MATCH_IPVS ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT ~NF_NAT ~NF_NAT_NEEDED @@ -148,6 +147,12 @@ pkg_setup() { ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" fi + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + if use aufs; then CONFIG_CHECK+=" ~AUFS_FS |