diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2015-03-14 02:47:43 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2015-03-14 02:47:43 +0000 |
| commit | 3517f3b1997b16f650472b1195548ec5ba042a36 (patch) | |
| tree | 329e71632d6d2202bc18d4aa9c43f7b72b53db06 /app-emulation/docker | |
| parent | version bump (bug #503846) (diff) | |
| download | gentoo-2-3517f3b1997b16f650472b1195548ec5ba042a36.tar.gz gentoo-2-3517f3b1997b16f650472b1195548ec5ba042a36.tar.bz2 gentoo-2-3517f3b1997b16f650472b1195548ec5ba042a36.zip | |
Check if CPUSETS are enabled in kernel wrt bug #536546 by Dirk Best <mail@dirk-best.de>. Thanks to Tianon <admwiggin@gmail.com> for reporting and fixing it upstream
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)
Diffstat (limited to 'app-emulation/docker')
| -rw-r--r-- | app-emulation/docker/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/docker/docker-1.5.0.ebuild | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog index 6251df242e41..f998fbf238ad 100644 --- a/app-emulation/docker/ChangeLog +++ b/app-emulation/docker/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/docker # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.40 2015/03/03 14:21:35 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.41 2015/03/14 02:47:43 xarthisius Exp $ + + 14 Mar 2015; Kacper Kowalik <xarthisius@gentoo.org> docker-1.5.0.ebuild: + Check if CPUSETS are enabled in kernel wrt bug #536546 by Dirk Best <mail + @dirk-best.de>. Thanks to Tianon <admwiggin@gmail.com> for reporting and + fixing it upstream 03 Mar 2015; Kacper Kowalik <xarthisius@gentoo.org> docker-1.5.0.ebuild, metadata.xml: diff --git a/app-emulation/docker/docker-1.5.0.ebuild b/app-emulation/docker/docker-1.5.0.ebuild index c54d46fee7f8..825a067df03c 100644 --- a/app-emulation/docker/docker-1.5.0.ebuild +++ b/app-emulation/docker/docker-1.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.5.0.ebuild,v 1.3 2015/03/03 14:21:35 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.5.0.ebuild,v 1.4 2015/03/14 02:47:43 xarthisius Exp $ EAPI=5 @@ -73,7 +73,7 @@ RESTRICT="installsources strip" CONFIG_CHECK=" ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS ~DEVPTS_MULTIPLE_INSTANCES - ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER CGROUP_SCHED + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER CGROUP_SCHED CPUSETS ~MACVLAN ~VETH ~BRIDGE ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK |