From c174819731ea32877277571fa744d7f7f29b1d8c Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 28 Aug 2020 12:53:07 +0200 Subject: [PATCH] dev-lang/go: Update the default Go version to 1.15 Now that Go [1.15](Go://go.googlesource.com/go/+/refs/tags/go1.15) has been released, we should update the default Go version to 1.15. Since the [EINTR issue](https://github.com/golang/go/issues/38033) was fixed in 1.15, we can simply move from 1.13 to 1.15. On the other hand, we should not add 1.14, as the [EINTR bug fix](https://go-review.googlesource.com/c/go/+/232862/) was not backported to 1.14. --- .../app-emulation/containerd/containerd-9999.ebuild | 2 +- .../app-emulation/docker-proxy/docker-proxy-9999.ebuild | 2 +- .../app-emulation/docker-runc/docker-runc-1.0.0_rc90.ebuild | 2 +- .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- .../src/third_party/coreos-overlay/dev-lang/go/Manifest | 2 +- .../dev-lang/go/{go-1.13.15.ebuild => go-1.15.ebuild} | 0 .../third_party/coreos-overlay/eclass/coreos-go-depend.eclass | 4 ++-- .../src/third_party/coreos-overlay/eclass/coreos-go.eclass | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/dev-lang/go/{go-1.13.15.ebuild => go-1.15.ebuild} (100%) 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 fac7e3e802..8e1d09b422 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 @@ -5,7 +5,7 @@ EAPI=6 GITHUB_URI="github.com/containerd/containerd" COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.13" +COREOS_GO_VERSION="go1.15" if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://${GITHUB_URI}.git" 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 6705098ff5..4de3659762 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 @@ -5,7 +5,7 @@ EAPI=6 EGO_PN="github.com/docker/libnetwork" COREOS_GO_PACKAGE="${EGO_PN}" -COREOS_GO_VERSION="go1.13" +COREOS_GO_VERSION="go1.15" if [[ ${PV} == *9999 ]]; then KEYWORDS="~amd64 ~arm64" diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc90.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc90.ebuild index 4dd03bb620..19bf2589f8 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc90.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc90.ebuild @@ -5,7 +5,7 @@ EAPI=6 GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" -COREOS_GO_VERSION="go1.13" +COREOS_GO_VERSION="go1.15" # the commit of runc that docker uses. # see https://github.com/docker/docker-ce/blob/v19.03.12/components/engine/hack/dockerfile/install/runc.installer#L4 # Update the patch number when this commit is changed (i.e. the _p in the 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 32d18646a7..cbbefe9f94 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 @@ -4,7 +4,7 @@ EAPI=6 COREOS_GO_PACKAGE="github.com/docker/docker-ce" -COREOS_GO_VERSION="go1.13" +COREOS_GO_VERSION="go1.15" if [[ ${PV} = *9999* ]]; then # Docker cannot be fetched via "go get", thanks to autogenerated code diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest index 67b0992e8a..0c020d256a 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/Manifest @@ -1,6 +1,6 @@ DIST go1.10.8.src.tar.gz 18333813 BLAKE2B 69fd0e7c3e265162e48b2ed90c8f560071322a093e09ca926d3cb94f4f9b44548652066d0c2f44696f0da5e7342f3afa894b71116f9451a0b2438eb0e0df42df SHA512 c274b99e39b78dfdf6b6b1c4fd6a5a54bff1b3eba55a879413692586ac7f0d30772416dcb5f715213c650946ade649bd424981f77508d92510c717d1845e3ede DIST go1.12.12.src.tar.gz 21980254 BLAKE2B b5d241d584339c999f5fffad427b70c04e431220fd68272f45deef3cf27b4d8039f9161ab64fd7338056978ff3e5e42bbb49aa1cf71e6a8a3aaf7700d5c02e8a SHA512 f173adbe1ad1c5c422a3374aa15d49881059b67cdca61b56ddc477a1b178cf418853aff78c3acec46194e60726805e53d8ac8466780343eb205a2a7285960995 -DIST go1.13.15.src.tar.gz 21705183 BLAKE2B eac8c6113dd6cef164cc5368732c2dce26f200e309c728ca71b4c312ace465382b8cc1dd8fb216bdf927211d6cb26c21090a9ac9c9ef2d7ac1b16c85feac0e0c SHA512 35d3e7aaef1b0fc6ab684bb7352da3a23194115331ba7d1543225c35939cafcd437f454519aac38182cb8f222723ed9a297f9da566075b5e4079be26952a21e3 +DIST go1.15.src.tar.gz 23002901 BLAKE2B a04bfb5d8bb6377e92d5d8c96f11d39b9bb878f4f9a3221baa5f42bcc822b562a209fd5d2d2a643f3b72df2db494899b2f7a446f1a9a8e25bf0df56ef87f3b7f SHA512 7d85382bcc6a0625dfa3d07196ab364860846367ed67697a7b1516b0af551a72bc4873882141fc3c7a60d39f2e27b33f6693e8b18b608de76fc9a55b5eac55ea DIST go1.6.3.src.tar.gz 12617426 BLAKE2B 4d51c4f848d29176282e61396ea8a6ae580e743cc4a21deb3b0fc1f417ed50ff33bec4f3712f4d0c89d33ce1ec34638d5fc1b356ff0b88a6cb290d5aae789d15 SHA512 43e9b01220788112a185500bd53f091e7a0023a790092f428e2f40fc1a334dd148558b99d2a1c871b8cc79ad7d2d87a092b93eee7b5a27c2ee675c494de35306 DIST go1.7.6.src.tar.gz 14173249 BLAKE2B 5202382c293213f02909c52c8057776abf1104bba3443db4956d9ab2aa37cfc0661eafb6f56d539384fd425c86aff4f6a756ecd09688d5be0086d761b2865b77 SHA512 b01846bfb17bf91a9c493c4d6c43bbe7e17270b9e8a229a2be4032b78ef9395f5512917ea9faab74a120c755bbd53bbd816b033caadcbb7679e91702b37f8c7f DIST go1.8.7.src.tar.gz 15359792 BLAKE2B b645964d99c0e04f56bd81db820b6cc07bbea608ec5497469a14e99ba42153bd1b2653b182ec27a76b9327eb386ccd5e901871bce62f2f719f35a96594969cbb SHA512 bbe78ab240ce66f0e7c0ba0d5c8915699db1538087cbcd22fa1566c62cb2e4658f467cbbde107f254e84e5744a1db578fc1a6f1784586937cba3d0942e2e6532 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.13.15.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.15.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.13.15.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.15.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass index ccfd6eb723..283941afbb 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass @@ -11,9 +11,9 @@ # # Example: # @CODE -# COREOS_GO_VERSION=go1.13 +# COREOS_GO_VERSION=go1.15 # @CODE -export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.13}" +export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.15}" case "${EAPI:-0}" in 5|6) DEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;; diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass index 0a760ab1c6..ee40677777 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass @@ -30,7 +30,7 @@ # # Example: # @CODE -# COREOS_GO_VERSION=go1.13 +# COREOS_GO_VERSION=go1.15 # @CODE case "${EAPI:-0}" in