| 1 |
commit: 600d08be6cda4d2e2e1d17140d123f969e900823 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 31 18:03:00 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 31 18:14:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=600d08be |
| 7 |
|
| 8 |
app-emulation/docker: check MEMCG_SWAP_ENABLED only on <linux-5.8 |
| 9 |
|
| 10 |
linux commit 2d1c498072de69e2857b849ee197ba2aa7de53a3 removed it |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 14 |
|
| 15 |
app-emulation/docker/docker-19.03.12.ebuild | 8 +++++++- |
| 16 |
1 file changed, 7 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/app-emulation/docker/docker-19.03.12.ebuild b/app-emulation/docker/docker-19.03.12.ebuild |
| 19 |
index c0cea011dfb..dd60b68bdb4 100644 |
| 20 |
--- a/app-emulation/docker/docker-19.03.12.ebuild |
| 21 |
+++ b/app-emulation/docker/docker-19.03.12.ebuild |
| 22 |
@@ -82,7 +82,7 @@ CONFIG_CHECK=" |
| 23 |
~USER_NS |
| 24 |
~SECCOMP |
| 25 |
~CGROUP_PIDS |
| 26 |
- ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED |
| 27 |
+ ~MEMCG_SWAP |
| 28 |
|
| 29 |
~BLK_CGROUP ~BLK_DEV_THROTTLING |
| 30 |
~CGROUP_PERF |
| 31 |
@@ -158,6 +158,12 @@ pkg_setup() { |
| 32 |
" |
| 33 |
fi |
| 34 |
|
| 35 |
+ if kernel_is lt 5 8; then |
| 36 |
+ CONFIG_CHECK+=" |
| 37 |
+ ~MEMCG_SWAP_ENABLED |
| 38 |
+ " |
| 39 |
+ fi |
| 40 |
+ |
| 41 |
if use aufs; then |
| 42 |
CONFIG_CHECK+=" |
| 43 |
~AUFS_FS |
Archives