1 |
commit: 719d916ff2d7314f1c77f536715f597d810963a9 |
2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 27 22:12:00 2016 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 27 22:12:27 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719d916f |
7 |
|
8 |
app-emulation/docker: sync live ebuild |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
app-emulation/docker/docker-9999.ebuild | 10 ++++++++-- |
13 |
1 file changed, 8 insertions(+), 2 deletions(-) |
14 |
|
15 |
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild |
16 |
index 9e2487c..c4c359b 100644 |
17 |
--- a/app-emulation/docker/docker-9999.ebuild |
18 |
+++ b/app-emulation/docker/docker-9999.ebuild |
19 |
@@ -80,7 +80,7 @@ CONFIG_CHECK=" |
20 |
|
21 |
~POSIX_MQUEUE |
22 |
|
23 |
- ~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED |
24 |
+ ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED |
25 |
|
26 |
~BLK_CGROUP ~IOSCHED_CFQ |
27 |
~CGROUP_PERF |
28 |
@@ -91,7 +91,6 @@ CONFIG_CHECK=" |
29 |
" |
30 |
|
31 |
ERROR_KEYS="CONFIG_KEYS: is mandatory" |
32 |
-ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" |
33 |
ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" |
34 |
ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" |
35 |
|
36 |
@@ -140,6 +139,13 @@ pkg_setup() { |
37 |
" |
38 |
fi |
39 |
|
40 |
+ if kernel_is lt 4 5; then |
41 |
+ CONFIG_CHECK+=" |
42 |
+ ~MEMCG_KMEM |
43 |
+ " |
44 |
+ ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" |
45 |
+ fi |
46 |
+ |
47 |
if use aufs; then |
48 |
CONFIG_CHECK+=" |
49 |
~AUFS_FS |