From 183dd0c86377121f9cc5ed043862473d9609cf3d Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 15:37:38 -0500 Subject: [PATCH] app-emulation/docker: Upstream changed the tagged 17.12 commit... --- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../coreos-overlay/app-emulation/docker/docker-17.12.0.ebuild | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest index 1705bba838..c495fdd5a6 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest @@ -1,2 +1,2 @@ -DIST docker-17.12.0.tar.gz 11011208 SHA256 945e3eb62e35e9399983a956299bbbf878442c5a164262ed82b7aa7366731a83 SHA512 1a4dfc86dc6c85c78d2abf4f559e5efe0fb22d915997f047fa6641e2aefb3e2fc6cb0124b6a0fc69abfc09ac8b261ebbd4d80b380cf9eb4304d3e1a423957b67 WHIRLPOOL 07df0042eeeaac87ca2ffed7c37a6add5826d37cd20b1cb081b00f6ae30d6e310923492b6369f738ef55233b8a15a8e20250aeb402fb3f5865336a70f30ae91e +DIST docker-17.12.0.tar.gz 11008332 SHA256 1303483c878ded1c0e19f323f04316cef6d4c0c895f85c412af6468647d18ef9 SHA512 7381bddf4b2538b2b76229d962925eee74a38ddbb18a6f988ccff2a2ce0ef334148ea76d9697e89acc6c9018cb6f785b59c27450dfb930ead01fa5684c6a90b1 WHIRLPOOL 1d9ee9131fc2a9dc53369a67d83a29d1f9f6dec3d66942ae17a5fabd455e5de24456aaaf2d21458854532174d5623c9116c8478f7c0af1447fa8d89653854fc6 DIST docker-18.02.0.tar.gz 12659242 SHA256 fb2b9db5ec1a7e9eb80913fb7790377bbbb0fe5aad033f498d09bcd15a51a5c2 SHA512 4d1bd0ffc893e70fc524f46cacdc4ab035d8b7e0fd7e8de9faf6d9c30b9920b68a99764101e47a8375425b774fe93c317213509b2d1ace87c7598b2b939b849b WHIRLPOOL 6e09cb54bde84c9d901b63c36c1a130badb8d23cd28930b636e7321302bf2e9765763c7f2e76faad5fc170f6ea6210de47c5c70d01e5cd224d4978cfe55cbee9 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.0.ebuild index b232a611cb..eabf24664b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.0.ebuild @@ -19,7 +19,7 @@ else else MY_PV="$PV-ce" fi - DOCKER_GITCOMMIT="486a48d" + DOCKER_GITCOMMIT="c97c6d6" SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" @@ -211,8 +211,6 @@ src_unpack() { DOCKER_BUILD_DATE=$(git -C "${S}" log -1 --format="%ct") fi [ "${#ENGINE_PATCHES[@]}" -gt 0 ] && eapply -d"${S}"/components/engine "${ENGINE_PATCHES[@]}" - # XXX: fix the insane version in the 17.12.0 tag -- DELETE THIS ON UPDATE - [ "x${PV}-ce" = "x$(<${S}/VERSION)" ] && die || echo "${PV}-ce" > "${S}/VERSION" } src_compile() {