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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9BFCB15800F for ; Sat, 7 Jan 2023 19:33:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3E75E070D; Sat, 7 Jan 2023 19:33:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB880E070D for ; Sat, 7 Jan 2023 19:33:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0C5E33BE2E for ; Sat, 7 Jan 2023 19:33:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 918377FC for ; Sat, 7 Jan 2023 19:33:53 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1673120018.4ecb10dfa3683da470e48d3404bbafc88e43020c.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/docker/docker-20.10.22.ebuild X-VCS-Directories: app-containers/docker/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 4ecb10dfa3683da470e48d3404bbafc88e43020c X-VCS-Branch: master Date: Sat, 7 Jan 2023 19:33:53 +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: 756cf397-57ae-4dc9-ab14-fc539ab377a1 X-Archives-Hash: fb46298eeb220886f323149f261c9d89 commit: 4ecb10dfa3683da470e48d3404bbafc88e43020c Author: William Hubbs gentoo org> AuthorDate: Sat Jan 7 19:29:04 2023 +0000 Commit: William Hubbs gentoo 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 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