From a49030e944f8e0a81fd5976435d4e6f08daaa01b Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 21 Dec 2015 14:04:02 -0800 Subject: [PATCH] app-emulation/docker: remove dirty marker --- .../docker/{docker-1.9.1.ebuild => docker-1.9.1-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 4 ++++ 2 files changed, 4 insertions(+) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.9.1.ebuild => docker-1.9.1-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.9.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.9.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.9.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.9.1-r1.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 256cc4b913..7f301476cb 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 @@ -172,6 +172,10 @@ pkg_setup() { src_prepare() { # allow user patches (use sparingly - upstream won't support them) epatch_user + + # remove the .git directory so that hack/make.sh uses DOCKER_GITCOMMIT + # for the commit hash. + rm --recursive --force .git } go_get_arch() {