| 1 |
commit: dd94ae2304e4bb6845f178446eb1b87f4b21d7aa |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 30 04:03:48 2016 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 30 04:04:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd94ae23 |
| 7 |
|
| 8 |
app-emulation/docker: sync live ebuild |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
app-emulation/docker/docker-9999.ebuild | 9 +++++++-- |
| 13 |
1 file changed, 7 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild |
| 16 |
index 9f78ea5..aff078a 100644 |
| 17 |
--- a/app-emulation/docker/docker-9999.ebuild |
| 18 |
+++ b/app-emulation/docker/docker-9999.ebuild |
| 19 |
@@ -70,13 +70,12 @@ S="${WORKDIR}/${P}/src/${EGO_PN}" |
| 20 |
# see "contrib/check-config.sh" from upstream's sources |
| 21 |
CONFIG_CHECK=" |
| 22 |
~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS |
| 23 |
- ~DEVPTS_MULTIPLE_INSTANCES |
| 24 |
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG |
| 25 |
~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER |
| 26 |
~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_TARGET_MASQUERADE |
| 27 |
~IP_VS ~IP_VS_RR |
| 28 |
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK |
| 29 |
- ~NETFILTER_XT_MATCH_IVPS |
| 30 |
+ ~NETFILTER_XT_MATCH_IPVS |
| 31 |
~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT |
| 32 |
~NF_NAT ~NF_NAT_NEEDED |
| 33 |
|
| 34 |
@@ -148,6 +147,12 @@ pkg_setup() { |
| 35 |
ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" |
| 36 |
fi |
| 37 |
|
| 38 |
+ if kernel_is lt 4 7; then |
| 39 |
+ CONFIG_CHECK+=" |
| 40 |
+ ~DEVPTS_MULTIPLE_INSTANCES |
| 41 |
+ " |
| 42 |
+ fi |
| 43 |
+ |
| 44 |
if use aufs; then |
| 45 |
CONFIG_CHECK+=" |
| 46 |
~AUFS_FS |
Archives