From 61141a8955d3cc8c136ff11c30dee1c5020176ec Mon Sep 17 00:00:00 2001 From: Patrick Baxter Date: Fri, 31 Jul 2015 15:12:40 -0700 Subject: [PATCH] app-emulation/docker: backport libcontainer fix See https://github.com/coreos/bugs/issues/420 for more details. --- .../docker/{docker-1.7.1-r1.ebuild => docker-1.7.1-r2.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.7.1-r1.ebuild => docker-1.7.1-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.7.1-r2.ebuild 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 40905ef61f..62a289fbb6 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 @@ -7,7 +7,7 @@ EAPI=5 DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level" HOMEPAGE="https://www.docker.com" -CROS_WORKON_PROJECT="docker/docker" +CROS_WORKON_PROJECT="coreos/docker" CROS_WORKON_LOCALNAME="docker" CROS_WORKON_REPO="git://github.com" @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="unknown" KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="786b29d4db80a6175e72b47a794ee044918ba734" # v1.7.1 + CROS_WORKON_COMMIT="2c2c52bff8d17a68d6a6dbfdcf99d9c1e2e41541" # v1.7.1 with backport DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" KEYWORDS="amd64 arm64" fi