From 215033f7d9396eb0f6ccf55d4850b6e9a0037f64 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 24 Apr 2017 16:06:08 -0700 Subject: [PATCH] app-emulation/containerd: build the Docker 1.12 branch with go1.7 This will only matter for future beta/stable releases that continue to hold back Docker >= 1.13. --- .../{containerd-0.2.5-r1.ebuild => containerd-0.2.5-r2.ebuild} | 2 +- .../docker/{docker-1.12.6-r1.ebuild => docker-1.12.6-r2.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-0.2.5-r1.ebuild => containerd-0.2.5-r2.ebuild} (96%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.12.6-r1.ebuild => docker-1.12.6-r2.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r2.ebuild similarity index 96% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r2.ebuild index d0f039b4e5..9174684016 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r2.ebuild @@ -6,7 +6,7 @@ EAPI=5 GITHUB_URI="github.com/docker/${PN}" COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.6" +COREOS_GO_VERSION="go1.7" MY_PV="${PV/_/-}" EGIT_COMMIT="v${MY_PV}" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r2.ebuild index 919d7fefb5..5c94c1532c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r2.ebuild @@ -61,7 +61,7 @@ RDEPEND=" >=app-arch/xz-utils-4.9 >=sys-apps/shadow-4.4 - =app-emulation/containerd-0.2.5-r1[seccomp?] + =app-emulation/containerd-0.2.5-r2[seccomp?] =app-emulation/runc-1.0.0_rc2_p9[apparmor?,seccomp?] "