diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2015-05-08 17:26:21 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2015-05-08 17:26:21 +0000 |
| commit | a6a25316d827c990f9ad9509e22102a01d05d049 (patch) | |
| tree | d173416e3c4a9dce2b34231c6fc2c5b75ac95054 /app-emulation | |
| parent | ppc stable, bug #534692 (diff) | |
| download | gentoo-2-a6a25316d827c990f9ad9509e22102a01d05d049.tar.gz gentoo-2-a6a25316d827c990f9ad9509e22102a01d05d049.tar.bz2 gentoo-2-a6a25316d827c990f9ad9509e22102a01d05d049.zip | |
Version bump, drop old wrt #548884
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/docker/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emulation/docker/docker-1.6.1.ebuild (renamed from app-emulation/docker/docker-1.6.0.ebuild) | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog index 4817fa5db980..8e9de6aeb99a 100644 --- a/app-emulation/docker/ChangeLog +++ b/app-emulation/docker/ChangeLog @@ -1,6 +1,12 @@ # 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.44 2015/05/04 12:05:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.45 2015/05/08 17:26:21 xarthisius Exp $ + +*docker-1.6.1 (08 May 2015) + + 08 May 2015; Kacper Kowalik <xarthisius@gentoo.org> +docker-1.6.1.ebuild, + -docker-1.6.0.ebuild: + Version bump, drop old wrt #548884 04 May 2015; Justin Lecher <jlec@gentoo.org> docker-1.6.0.ebuild: Add missing dependency on aufs4, thanks jbergstroem for the report diff --git a/app-emulation/docker/docker-1.6.0.ebuild b/app-emulation/docker/docker-1.6.1.ebuild index c7adde000dca..5cb9905c4fd0 100644 --- a/app-emulation/docker/docker-1.6.0.ebuild +++ b/app-emulation/docker/docker-1.6.1.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.6.0.ebuild,v 1.3 2015/05/04 12:05:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.6.1.ebuild,v 1.1 2015/05/08 17:26:21 xarthisius Exp $ EAPI=5 @@ -18,7 +18,7 @@ else MY_P="${PN}-${MY_PV}" SRC_URI="https://${GITHUB_URI}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - DOCKER_GITCOMMIT="4749651" + DOCKER_GITCOMMIT="97cd073" KEYWORDS="~amd64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" fi @@ -85,13 +85,13 @@ CONFIG_CHECK=" ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED ~RESOURCE_COUNTERS ~CGROUP_PERF + ~CFS_BANDWIDTH " ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" -ERROR_MEMCG_SWAP_ENABLED="CONFIG_MEMCG_SWAP_ENABLED: you need to enable memcg_swap in order to - limit swap usage of containers" ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" pkg_setup() { if kernel_is lt 3 8; then |