commit: 4ecb10dfa3683da470e48d3404bbafc88e43020c Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Sat Jan 7 19:29:04 2023 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Sat Jan 7 19:33:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ecb10df
app-containers/docker: adjust kernel checks The CONFIG_MEMCG_SWAP kernel option was removed in linux 6.1, so adjust the check to account for this. Closes: https://bugs.gentoo.org/889932 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> app-containers/docker/docker-20.10.22.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app-containers/docker/docker-20.10.22.ebuild b/app-containers/docker/docker-20.10.22.ebuild index 380a03fcecc5..747183b2b483 100644 --- a/app-containers/docker/docker-20.10.22.ebuild +++ b/app-containers/docker/docker-20.10.22.ebuild @@ -77,7 +77,6 @@ CONFIG_CHECK=" ~USER_NS ~SECCOMP ~CGROUP_PIDS - ~MEMCG_SWAP ~BLK_CGROUP ~BLK_DEV_THROTTLING ~CGROUP_PERF @@ -142,6 +141,12 @@ pkg_setup() { " fi + if kernel_is lt 6 1; then + CONFIG_CHECK+=" + ~MEMCG_SWAP + " + fi + if use aufs; then CONFIG_CHECK+=" ~AUFS_FS
