From c13e3b92948228310b2036a1cfe410bedb304064 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 31 Jan 2017 13:09:39 -0800 Subject: [PATCH 1/3] app-emulation/runc: sync with Docker 1.13 commits --- .../{runc-1.0.0_rc2-r3.ebuild => runc-1.0.0_rc2-r4.ebuild} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/runc/{runc-1.0.0_rc2-r3.ebuild => runc-1.0.0_rc2-r4.ebuild} (87%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r4.ebuild similarity index 87% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r4.ebuild index 56b1affa84..fc22aff638 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r4.ebuild @@ -8,9 +8,9 @@ GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_VERSION="go1.6" # the commit of runc that docker uses. -# see https://github.com/docker/docker/blob/v1.12.6/Dockerfile#L245 -# Note: this commit is only really present in `docker/runc` in the 'docker/1.12.x' branch -COMMIT_ID="50a19c6ff828c58e5dab13830bd3dacde268afe5" +# see https://github.com/docker/docker/blob/v1.13.0/hack/dockerfile/binaries-commits#L4 +# Note: this commit is only really present in `docker/runc` in the 'docker/1.13.x' branch +COMMIT_ID="2f7393a47307a16f8cee44a37b262e8b81021e3e" inherit eutils flag-o-matic coreos-go-depend vcs-snapshot From b1db1b1b9faa3f9fbd2c988a39beaa161128ff85 Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 31 Jan 2017 13:14:24 -0800 Subject: [PATCH 2/3] app-emulation/docker-proxy: sync with Docker 1.13 commits --- .../coreos-overlay/app-emulation/docker-proxy/Manifest | 2 +- ...8.0_p20161111.ebuild => docker-proxy-0.8.0_p20170131.ebuild} | 0 .../app-emulation/docker-proxy/docker-proxy-9999.ebuild | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/{docker-proxy-0.8.0_p20161111.ebuild => docker-proxy-0.8.0_p20170131.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest index 1e23544154..f81a0cea3e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest @@ -1 +1 @@ -DIST docker-proxy-0.8.0_p20161111.tar.gz 2150464 SHA256 204e723a3cb740173af3a0d4b0d00996507d3230da4f348a38b417a215de0959 SHA512 86293b9cafc3c468760266b47412040f21309baad27765f584cfa1e93bc2ad88068832ed55f2ae8e4f16825e9f44619e89985fd36d98b3d47eaf1d1160f76c8e WHIRLPOOL 2b885bf3865a396219af7b32fc20477b15dffa1ac7b8a26602ff1b131d9f7cb31d5f997045bfac5ddf8b75016ca083c31ed345dfe1d9023a8d68b712a72d5979 +DIST docker-proxy-0.8.0_p20170131.tar.gz 2112038 SHA256 823f6601361b02ae6a00bfc416b0286629dbf794d36fb65ba1d88eaa379f397b SHA512 754cf6489968f3a83392c52b9445f71e8d5faca96e23ffc3ee2c6e8644bf065b64c7497395cf8fac9cc083ce9c7668260e319d01a8f10613e67db2d8254f6b06 WHIRLPOOL 095c32dec47806e142e345b21bc9e9bb5ce0b8c3f8f6e821f783dc8c2a080ac304aebe57ce56408481a0fa4c3becf10dd8991d57489ae27f1046cde75b659f6d diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20161111.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170131.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20161111.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20170131.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild index 2ebdf7abb8..53f496eb9b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then KEYWORDS="~amd64 ~arm64" inherit golang-vcs else - EGIT_COMMIT="57be722e077059d1ee0539be31743a3642ccbeb3" + EGIT_COMMIT="0f534354b813003a754606689722fe253101bc4e" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" inherit golang-vcs-snapshot From 1275e42126e1fb51a36e4f5db68891481d21de3c Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 31 Jan 2017 13:17:56 -0800 Subject: [PATCH 3/3] app-emulation/containerd: sync with Docker 1.13 commits --- .../{containerd-0.2.5.ebuild => containerd-0.2.5-r1.ebuild} | 0 .../app-emulation/containerd/containerd-9999.ebuild | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-0.2.5.ebuild => containerd-0.2.5-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-0.2.5-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index 0b8be2a330..2fad21da7a 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -12,8 +12,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://${GITHUB_URI}.git" inherit git-r3 else - MY_PV="${PV/_/-}" - EGIT_COMMIT="v${MY_PV}" + EGIT_COMMIT="03e5862ec0d8d3b3f750e19fca3ee367e13c090e" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" inherit vcs-snapshot