diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2015-03-03 14:21:35 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2015-03-03 14:21:35 +0000 |
| commit | f07da40ae4946c74eb96ed52f26cf7d48e0f32c4 (patch) | |
| tree | b742d0857a37be107120d0918189b0d4ef8fc108 /app-emulation/docker | |
| parent | Version Bump, #531864; fix testfailure, #478216; backport security fix, #541912 (diff) | |
| download | gentoo-2-f07da40ae4946c74eb96ed52f26cf7d48e0f32c4.tar.gz gentoo-2-f07da40ae4946c74eb96ed52f26cf7d48e0f32c4.tar.bz2 gentoo-2-f07da40ae4946c74eb96ed52f26cf7d48e0f32c4.zip | |
Port changes from Tianon's overlay. Fixes bug #541742 by Thomas Capricelli <orzel@freehackers.org>
(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 | 12 | ||||
| -rw-r--r-- | app-emulation/docker/metadata.xml | 4 |
3 files changed, 19 insertions, 4 deletions
diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog index 82ddf11de524..6251df242e41 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.39 2015/02/19 00:43:30 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.40 2015/03/03 14:21:35 xarthisius Exp $ + + 03 Mar 2015; Kacper Kowalik <xarthisius@gentoo.org> docker-1.5.0.ebuild, + metadata.xml: + Port changes from Tianon's overlay. Fixes bug #541742 by Thomas Capricelli + <orzel@freehackers.org> 19 Feb 2015; Patrick Lauer <patrick@gentoo.org> -docker-1.3.3-r1.ebuild, -docker-1.4.1.ebuild: diff --git a/app-emulation/docker/docker-1.5.0.ebuild b/app-emulation/docker/docker-1.5.0.ebuild index 23a93a429e2f..c54d46fee7f8 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.2 2015/02/15 02:08:25 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.5.0.ebuild,v 1.3 2015/03/03 14:21:35 xarthisius Exp $ EAPI=5 @@ -27,7 +27,7 @@ inherit bash-completion-r1 linux-info multilib systemd udev user LICENSE="Apache-2.0" SLOT="0" -IUSE="aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion" +IUSE="aufs btrfs +contrib +device-mapper doc lxc overlay vim-syntax zsh-completion" # https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies CDEPEND=" @@ -132,6 +132,12 @@ pkg_setup() { " fi + if use overlay; then + CONFIG_CHECK+=" + ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL + " + fi + linux-info_pkg_setup } @@ -163,7 +169,7 @@ src_compile() { # let's set up some optional features :) export DOCKER_BUILDTAGS='' - for gd in aufs btrfs device-mapper; do + for gd in aufs btrfs device-mapper overlay; do if ! use $gd; then DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" fi diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml index 7ded66c65520..aea61549240b 100644 --- a/app-emulation/docker/metadata.xml +++ b/app-emulation/docker/metadata.xml @@ -33,6 +33,10 @@ Enables dependencies for the "devicemapper" graph driver, including necessary kernel flags. </flag> + <flag name="overlay"> + Enables dependencies for the "overlay" graph driver, including + necessary kernel flags. + </flag> <flag name="lxc"> Enables dependencies for the "lxc" execution driver. </flag> |