summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-08-31 11:03:00 -0700
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-08-31 11:14:13 -0700
commit600d08be6cda4d2e2e1d17140d123f969e900823 (patch)
tree789f697a5faa8d42c671d79ebd6b62accd4e6e4d
parentnet-mail/rss2email: 3.12.2 (diff)
downloadgentoo-600d08be6cda4d2e2e1d17140d123f969e900823.tar.gz
gentoo-600d08be6cda4d2e2e1d17140d123f969e900823.tar.bz2
gentoo-600d08be6cda4d2e2e1d17140d123f969e900823.zip
app-emulation/docker: check MEMCG_SWAP_ENABLED only on <linux-5.8
linux commit 2d1c498072de69e2857b849ee197ba2aa7de53a3 removed it Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-rw-r--r--app-emulation/docker/docker-19.03.12.ebuild8
1 files changed, 7 insertions, 1 deletions
diff --git a/app-emulation/docker/docker-19.03.12.ebuild b/app-emulation/docker/docker-19.03.12.ebuild
index c0cea011dfbf..dd60b68bdb4f 100644
--- a/app-emulation/docker/docker-19.03.12.ebuild
+++ b/app-emulation/docker/docker-19.03.12.ebuild
@@ -82,7 +82,7 @@ CONFIG_CHECK="
~USER_NS
~SECCOMP
~CGROUP_PIDS
- ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+ ~MEMCG_SWAP
~BLK_CGROUP ~BLK_DEV_THROTTLING
~CGROUP_PERF
@@ -158,6 +158,12 @@ pkg_setup() {
"
fi
+ if kernel_is lt 5 8; then
+ CONFIG_CHECK+="
+ ~MEMCG_SWAP_ENABLED
+ "
+ fi
+
if use aufs; then
CONFIG_CHECK+="
~AUFS_FS