aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Shelton <stuart@shelton.me>2016-08-04 01:30:44 +0100
committerStuart Shelton <stuart@shelton.me>2016-08-04 01:30:44 +0100
commit85205b4aee59b834b0dfbec0973d37b9d9d7369c (patch)
tree7e311735c2f1143d1f73c3fd8bdc80dce49c33b1 /app-emulation
parentUpdate sys-power/acpid-2.0.23 (diff)
downloadsrcshelton-85205b4aee59b834b0dfbec0973d37b9d9d7369c.tar.gz
srcshelton-85205b4aee59b834b0dfbec0973d37b9d9d7369c.tar.bz2
srcshelton-85205b4aee59b834b0dfbec0973d37b9d9d7369c.zip
Update app-emulation/docker-9999
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/docker/Manifest2
-rw-r--r--app-emulation/docker/docker-9999.ebuild11
2 files changed, 9 insertions, 4 deletions
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 68e79420..bcd4b3be 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -15,4 +15,4 @@ EBUILD docker-1.0.0.ebuild 5622 SHA256 a75ff4862df2bb08b364220264918404cb6b93504
EBUILD docker-1.10.3.ebuild 8251 SHA256 2b1aa8b750675e742e03e9542f48a746f750346ce47d10a03af2270b32b8b073 SHA512 ace7c30ddbae4c83a5411e648cd0008edc7431e6d45b5f8dee8916cd38a0b013ccf427c1e7ec308984f368508505032082d0b6b205f04cfaee7412463cc7641a WHIRLPOOL 21e7041aaf35c9bd0316abafe00c52e8d35065259839dfd2fcbd8213a69f94c8ac2f81d756bbe39fbb5a91f2b2b8525b707333a96a9c8f5d8080a7ef86d196d3
EBUILD docker-1.11.0.ebuild 8387 SHA256 3141d719394b5a1dc634b7a5983b2c86d6ebac9cbe548a00156b16aa398039b8 SHA512 42efb087a2483279173aaed732592aae8cce3c9b51b5cb7c48ee7425a00d167dddf2abcdc1a85b34839abdf54d2868d201a4f6c2b3fa7151003977db051972da WHIRLPOOL 6c0143b7df84b581fc735c71ac19fdf6d86e83f01e413c9fbe21660d9c691b1cfba122535ce0bda602e60ce29e51cba6f4a8645fcbf9c0730fa0f9f819df7e3a
EBUILD docker-1.7.1.ebuild 7527 SHA256 9653e8bc1f6a3829910ea200d3245c41c5f1a2e98403401d2666c8c61abf7371 SHA512 110af8901e95f74fa711d7672c5d7948c754ba588594b330eb0de29685d338b3ef9b442ceb0a64cdbeb47c137b34fa5c7feb1e64fa0ab9397966d0cb9b8faf06 WHIRLPOOL 9b0ec6ef70d32665de9773e216b390639c453955e69d502dbf090c7ccb908e532c2c04aab51280e3ea2a5a54802cc32b97f0ce44f72ae84f903e11f67832d6fe
-EBUILD docker-9999.ebuild 8342 SHA256 9edb094812aa622d7004b66d54f847bc319cb623668d3a6b8410f883e9e2b03a SHA512 673181881ea28413896afb07ed6e2c5d7609ef863cbbdebcb1cfdbeb81a09f911f9ce10cf6abbcfaf25eeee545ad26bec9d19ccb488a8f6ced4fb9c99788cbd7 WHIRLPOOL af1654316206491e32314b8d71940f1f6c4e67e3b737db0e09bbbac9a68227df7fa446fcaaf123070bf54309efb088826712ec05d1dcdddfda78dcc0d1b63f0a
+EBUILD docker-9999.ebuild 8398 SHA256 ebf0d809b9d8f8171c9dde284019da5b1d57966f4ab25c14130d8fc0352e27f8 SHA512 1cd9996d9dfa7371d8a3d71f1752fd5d38fe2561abe4e115c10017d01c99a9f3348be315b2bd3803a90283d8dd193e9a9f4da10432a0d3b081e0db3f2f7d8aab WHIRLPOOL eca42e443e0f0c0ac93c2010d692dc363b320d538aaec100364e9e544373b9eff1b78650b2b6a5aad6bc6f6cb30c81ba60eb9bb406cd4294ce2f019e8709a448
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild
index 54513ba0..9f8f09b4 100644
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id: 9f78ea58ede976af4c6a853d0c184463f61c1a93 $
+# $Id: aff078a5804b3846ccc130ddc55952d6b2a12f7f $
EAPI=6
@@ -73,13 +73,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
@@ -151,6 +150,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