From b2e6ce8b6510cb18c53e81011d15aa099f8db986 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Thu, 17 Oct 2019 22:38:01 +0000 Subject: [PATCH] app-emulation/rkt: pin to go 1.12 Our go 1.12 has a commit reverted to not break rkt, but we don't want it reverted for everything else. Pin rkt to 1.12 so other packages can use newer versions. --- .../rkt/{rkt-1.30.0-r1.ebuild => rkt-1.30.0-r2.ebuild} | 0 .../coreos-overlay/app-emulation/rkt/rkt-9999.ebuild | 2 ++ 2 files changed, 2 insertions(+) rename sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/{rkt-1.30.0-r1.ebuild => rkt-1.30.0-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.30.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.30.0-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.30.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/rkt/rkt-1.30.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 7b6e678f85..0f21e8c487 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,8 @@ EAPI=7 AUTOTOOLS_AUTORECONF=yes AUTOTOOLS_IN_SOURCE_BUILD=yes +COREOS_GO_VERSION=go1.12 + inherit autotools flag-o-matic systemd toolchain-funcs multilib inherit cros-workon coreos-go-depend