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 C388313832F for ; Wed, 27 Jul 2016 22:13:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA05B21C051; Wed, 27 Jul 2016 22:12:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 610BA21C051 for ; Wed, 27 Jul 2016 22:12:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59095340DC1 for ; Wed, 27 Jul 2016 22:12:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3A2878D for ; Wed, 27 Jul 2016 22:12:55 +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: <1469657547.4b49a69ee4cf97249c3ef53af6166a9670540884.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/docker/docker-1.12.0_rc5.ebuild X-VCS-Directories: app-emulation/docker/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 4b49a69ee4cf97249c3ef53af6166a9670540884 X-VCS-Branch: master Date: Wed, 27 Jul 2016 22:12:55 +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-Archives-Salt: 1cc99575-df6f-4fbb-880d-c8189712a3ac X-Archives-Hash: a197efebb81d9a490fbfe572d8f344f2 commit: 4b49a69ee4cf97249c3ef53af6166a9670540884 Author: William Hubbs gentoo org> AuthorDate: Wed Jul 27 21:59:19 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Jul 27 22:12:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b49a69e app-emulation/docker: 1.12.0_rc5: adjust CONFIG_MEMCG_KMEM check for #589552 Package-Manager: portage-2.2.28 app-emulation/docker/docker-1.12.0_rc5.ebuild | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app-emulation/docker/docker-1.12.0_rc5.ebuild b/app-emulation/docker/docker-1.12.0_rc5.ebuild index 5344a16..8120c57 100644 --- a/app-emulation/docker/docker-1.12.0_rc5.ebuild +++ b/app-emulation/docker/docker-1.12.0_rc5.ebuild @@ -80,7 +80,7 @@ CONFIG_CHECK=" ~POSIX_MQUEUE - ~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED + ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED ~BLK_CGROUP ~IOSCHED_CFQ ~CGROUP_PERF @@ -91,7 +91,6 @@ CONFIG_CHECK=" " ERROR_KEYS="CONFIG_KEYS: is mandatory" -ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" @@ -140,6 +139,13 @@ pkg_setup() { " fi + if kernel_is lt 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" + fi + if use aufs; then CONFIG_CHECK+=" ~AUFS_FS