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 4C8CA13832E for ; Sat, 30 Jul 2016 04:05:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E450D21C012; Sat, 30 Jul 2016 04:05:55 +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 0A52021C012 for ; Sat, 30 Jul 2016 04:05:54 +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 9111D340C8A for ; Sat, 30 Jul 2016 04:05:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 627E67DC for ; Sat, 30 Jul 2016 04:05:50 +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: <1469851484.ccbdbde873e3f1f2ff9ce4fd0a667a55c4799d91.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.ebuild X-VCS-Directories: app-emulation/docker/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: ccbdbde873e3f1f2ff9ce4fd0a667a55c4799d91 X-VCS-Branch: master Date: Sat, 30 Jul 2016 04:05:50 +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: 06d28481-f9ee-4e84-86da-8f7869808a1a X-Archives-Hash: 52a3ca615c8dab267ca5fc8988ae18db commit: ccbdbde873e3f1f2ff9ce4fd0a667a55c4799d91 Author: William Hubbs gentoo org> AuthorDate: Sat Jul 30 04:00:15 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat Jul 30 04:04:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbdbde8 app-emulation/docker: 1.12.0: clean up kernel checks Package-Manager: portage-2.2.28 app-emulation/docker/docker-1.12.0.ebuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app-emulation/docker/docker-1.12.0.ebuild b/app-emulation/docker/docker-1.12.0.ebuild index 1b1ed87..9eef62f 100644 --- a/app-emulation/docker/docker-1.12.0.ebuild +++ b/app-emulation/docker/docker-1.12.0.ebuild @@ -70,13 +70,12 @@ S="${WORKDIR}/${P}/src/${EGO_PN}" # see "contrib/check-config.sh" from upstream's sources CONFIG_CHECK=" ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS - ~DEVPTS_MULTIPLE_INSTANCES ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_TARGET_MASQUERADE ~IP_VS ~IP_VS_RR ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK - ~NETFILTER_XT_MATCH_IVPS + ~NETFILTER_XT_MATCH_IPVS ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT ~NF_NAT ~NF_NAT_NEEDED @@ -148,6 +147,12 @@ pkg_setup() { ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" fi + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + if use aufs; then CONFIG_CHECK+=" ~AUFS_FS