[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

[William Hubbs]

commit:     719d916ff2d7314f1c77f536715f597d810963a9
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 22:12:00 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 22:12:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719d916f

app-emulation/docker: sync live ebuild

Package-Manager: portage-2.2.28

 app-emulation/docker/docker-9999.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app-emulation/docker/docker-9999.ebuild 
b/app-emulation/docker/docker-9999.ebuild
index 9e2487c..c4c359b 100644
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-9999.ebuild
@@ -80,7 +80,7 @@ CONFIG_CHECK="
 
        ~POSIX_MQUEUE
 
-       ~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+       ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
 
        ~BLK_CGROUP ~IOSCHED_CFQ
        ~CGROUP_PERF
@@ -91,7 +91,6 @@ CONFIG_CHECK="
 "
 
 ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
 ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap 
usage of containers"
 ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container 
statistics gathering"
 
@@ -140,6 +139,13 @@ pkg_setup() {
                "
        fi
 
+       if kernel_is lt 4 5; then
+               CONFIG_CHECK+="
+                       ~MEMCG_KMEM
+               "
+               ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+       fi
+
        if use aufs; then
                CONFIG_CHECK+="
                        ~AUFS_FS