From e3866ddc982462b6a37a0fa4e148d30eff2fddb9 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 8 Feb 2017 18:15:00 -0800 Subject: [PATCH 1/3] app-emulation/runc: sync with Docker 1.13.1 commits --- .../{runc-1.0.0_rc2-r4.ebuild => runc-1.0.0_rc2-r5.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/runc/{runc-1.0.0_rc2-r4.ebuild => runc-1.0.0_rc2-r5.ebuild} (89%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r5.ebuild similarity index 89% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r5.ebuild index fc22aff638..93ff9447b3 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/runc/runc-1.0.0_rc2-r5.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.13.0/hack/dockerfile/binaries-commits#L4 +# see https://github.com/docker/docker/blob/v1.13.1/hack/dockerfile/binaries-commits#L6 # Note: this commit is only really present in `docker/runc` in the 'docker/1.13.x' branch -COMMIT_ID="2f7393a47307a16f8cee44a37b262e8b81021e3e" +COMMIT_ID="9df8b306d01f59d3a8029be411de015b7304dd8f" inherit eutils flag-o-matic coreos-go-depend vcs-snapshot From 3b11b06960a4deac51f17eeb09f5ca2c7381ff14 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 8 Feb 2017 18:16:57 -0800 Subject: [PATCH 2/3] app-emulation/containerd: sync with Docker 1.13.1 commits --- .../{containerd-0.2.5-r1.ebuild => containerd-0.2.5-r2.ebuild} | 0 .../app-emulation/containerd/containerd-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-0.2.5-r1.ebuild => containerd-0.2.5-r2.ebuild} (100%) 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 100% 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 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 2fad21da7a..6b572bb66c 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,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://${GITHUB_URI}.git" inherit git-r3 else - EGIT_COMMIT="03e5862ec0d8d3b3f750e19fca3ee367e13c090e" + EGIT_COMMIT="aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" inherit vcs-snapshot From f8a473962b0daa99003c478f9263cbe3c2ad589c Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 8 Feb 2017 18:20:03 -0800 Subject: [PATCH 3/3] app-emulation/docker: upgrade to unpatched 1.13.1 --- .../docker/{docker-1.13.0-r1.ebuild => docker-1.13.1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.13.0-r1.ebuild => docker-1.13.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.1.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 5cb4f9d9ea..b139c62518 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 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="unknown" KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="bd248c13a16ae08b9c3fa871a361c4177c9840ea" # coreos-1.13.0 + CROS_WORKON_COMMIT="092cba3727bb9b4a2f0e922cd6c0f93ea270e363" # coreos-1.13.1 DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" KEYWORDS="amd64 arm64" fi