diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.1-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.12.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.11.1-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-0.12.0.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 9dcc4e6654..72d3069bee 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 @@ -17,8 +17,8 @@ if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="deadbee" KEYWORDS="~amd64" else - CROS_WORKON_COMMIT="fb99f992c081a1d433c97c99ffb46d12693eeb76" # v0.11.1 - DOCKER_GITCOMMIT="fb99f99" # hack(philips): delete when an epatch isn't in use + CROS_WORKON_COMMIT="14680bf724161785d164fd99de36e3eb03a823ef" # v0.12.0 + DOCKER_GITCOMMIT="14680bf" KEYWORDS="amd64" fi @@ -131,11 +131,6 @@ pkg_setup() { check_extra_config } -src_prepare() { - epatch "${FILESDIR}"/daemon-ensure-the-var-lib-docker-dir-exists.patch - epatch "${FILESDIR}"/fix-daemon-prepend-host-etc-hosts-instead-of-bind-mo.patch -} - src_compile() { # hack(philips): to keep the git commit from being dirty mv .git .git.old