From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E164138359 for ; Mon, 31 Aug 2020 18:14:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C698FE0998; Mon, 31 Aug 2020 18:14:46 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A788DE0998 for ; Mon, 31 Aug 2020 18:14:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69BB5340DE0 for ; Mon, 31 Aug 2020 18:14:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E20DC2EE for ; Mon, 31 Aug 2020 18:14:43 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1598897653.600d08be6cda4d2e2e1d17140d123f969e900823.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker/docker-19.03.12.ebuild X-VCS-Directories: app-emulation/docker/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 600d08be6cda4d2e2e1d17140d123f969e900823 X-VCS-Branch: master Date: Mon, 31 Aug 2020 18:14:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f8c3b24e-5f76-4fac-98a7-bf5749827f03 X-Archives-Hash: 086cc84ba2d7b1c1e8d1d459b335d11d commit: 600d08be6cda4d2e2e1d17140d123f969e900823 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Aug 31 18:03:00 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Aug 31 18:14:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=600d08be app-emulation/docker: check MEMCG_SWAP_ENABLED only on gentoo.org> app-emulation/docker/docker-19.03.12.ebuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app-emulation/docker/docker-19.03.12.ebuild b/app-emulation/docker/docker-19.03.12.ebuild index c0cea011dfb..dd60b68bdb4 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