From b29e64cc90feeafd61cf26728f1bd1fa86cabfda Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 10 Dec 2014 21:43:06 -0800 Subject: [PATCH] docker: require btrfs-progs >= 3.16.1 for master branch Current master (future 1.4 release) requires btrfs/version.h which is only available as-of 3.16.1 and later. --- .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 75d61e263d..eb091b55d6 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -13,9 +13,13 @@ CROS_WORKON_REPO="git://github.com" GITHUB_URI="github.com/crosbymichael/docker" +# TODO: Remove this logic once we cross the 1.4.0 threshold +BTRFS_VER="0.20" + if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="deadbee" KEYWORDS="~amd64" + BTRFS_VER="3.16.1" else CROS_WORKON_COMMIT="39fa2faad2f3d6fa5133de4eb740677202f53ef4" # v1.3.2 DOCKER_GITCOMMIT="39fa2fa" @@ -38,7 +42,7 @@ DEPEND=" ${CDEPEND} >=dev-lang/go-1.2 btrfs? ( - >=sys-fs/btrfs-progs-0.20 + >=sys-fs/btrfs-progs-${BTRFS_VER} ) dev-vcs/git dev-vcs/mercurial