summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTianon Gravi <admwiggin@gmail.com>2016-09-27 13:16:45 -0700
committerWilliam Hubbs <williamh@gentoo.org>2016-09-28 10:51:47 -0500
commit5d9b824f9a00dad9aca17d90cf3cf8e69046e0dc (patch)
tree8bac6c9664817b663384060e77ef7983aea155e5 /app-emulation/docker
parentapp-dicts/myspell-en: version bump (diff)
downloadgentoo-5d9b824f9a00dad9aca17d90cf3cf8e69046e0dc.tar.gz
gentoo-5d9b824f9a00dad9aca17d90cf3cf8e69046e0dc.tar.bz2
gentoo-5d9b824f9a00dad9aca17d90cf3cf8e69046e0dc.zip
app-emulation/docker: sync live ebuild with upstream overlay
Resync CONFIG_CHECK with "contrib/check-config.sh" from upstream
Diffstat (limited to 'app-emulation/docker')
-rw-r--r--app-emulation/docker/docker-9999.ebuild20
1 files changed, 13 insertions, 7 deletions
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild
index aff078a5804b..2d30bb946030 100644
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-9999.ebuild
@@ -71,24 +71,29 @@ S="${WORKDIR}/${P}/src/${EGO_PN}"
CONFIG_CHECK="
~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
~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
+ ~KEYS
+ ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+ ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
- ~NETFILTER_XT_MATCH_IPVS
- ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT
~NF_NAT ~NF_NAT_NEEDED
-
~POSIX_MQUEUE
+ ~USER_NS
+ ~SECCOMP
+ ~CGROUP_PIDS
~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
- ~BLK_CGROUP ~IOSCHED_CFQ
+ ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
~CGROUP_PERF
~CGROUP_HUGETLB
~NET_CLS_CGROUP
~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+ ~IP_VS
+
+ ~VXLAN
~XFRM_ALGO ~XFRM_USER
+ ~IPVLAN
+ ~MACVLAN ~DUMMY
"
ERROR_KEYS="CONFIG_KEYS: is mandatory"
@@ -164,6 +169,7 @@ pkg_setup() {
if use btrfs; then
CONFIG_CHECK+="
~BTRFS_FS
+ ~BTRFS_FS_POSIX_ACL
"
fi