From 938fdff71977318500a9ebe7a584521f685801c2 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 12 Apr 2018 09:25:25 +0000 Subject: [PATCH] app-emulation/rkt: downgrade toolchain to go1.9 This downgrades the golang toolchain used to build rkt, keeping it at go1.9. This is a temporary workaround for a go-1.10 regression in `archive/tar`. Ref: https://github.com/coreos/bugs/issues/2402 Ref: https://github.com/appc/docker2aci/issues/259 Ref: https://github.com/golang/go/issues/24821 --- .../rkt/{rkt-1.29.0-r1.ebuild => rkt-1.29.0-r2.ebuild} | 0 .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 3 +++ 2 files changed, 3 insertions(+) rename sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/{rkt-1.29.0-r1.ebuild => rkt-1.29.0-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.29.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.29.0-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.29.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.29.0-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild index 002217f920..e1424a8765 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-9999.ebuild @@ -6,6 +6,9 @@ EAPI=5 AUTOTOOLS_AUTORECONF=yes AUTOTOOLS_IN_SOURCE_BUILD=yes +# temporary downgrade for https://github.com/coreos/bugs/issues/2402 +COREOS_GO_VERSION="go1.9" + inherit autotools-utils flag-o-matic systemd toolchain-funcs multilib inherit cros-workon coreos-go-depend