From dabb056d178b0e7418cb4ea32298c36d2c230efc Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 7 Sep 2016 18:37:30 -0700 Subject: [PATCH 1/3] coreos-go-lang: always update default go version This will override anything someone selected manually with `eselect go` but in the context of the SDK that shouldn't really be an issue. --- .../coreos-overlay/eclass/coreos-go-lang.eclass | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-lang.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-lang.eclass index 8bd59666d2..3924462ee3 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-lang.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-lang.eclass @@ -106,18 +106,12 @@ coreos-go-lang_src_install() { dodoc AUTHORS CONTRIBUTORS PATENTS README.md } -eselect_go_update() { - if [[ -z "$(eselect go show)" || ! -f "${EROOT}usr/bin/$(eselect go show)" ]]; then - eselect go update - fi -} - coreos-go-lang_pkg_postinst() { - eselect_go_update + eselect go update } coreos-go-lang_pkg_postrm() { - eselect_go_update + eselect go update } EXPORT_FUNCTIONS pkg_pretend src_compile src_test src_install pkg_postinst pkg_postrm From 3c59aa05e07a7027df5b5209e290f64e4aaee7ca Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 7 Sep 2016 17:36:30 -0700 Subject: [PATCH 2/3] dev-lang/go: bump to 1.7.1, mark stable --- .../src/third_party/coreos-overlay/dev-lang/go/Manifest | 2 +- .../dev-lang/go/{go-1.7.ebuild => go-1.7.1.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/dev-lang/go/{go-1.7.ebuild => go-1.7.1.ebuild} (83%) 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 969b5423b8..71c84e0c60 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,3 +1,3 @@ DIST go1.5.4.src.tar.gz 12059752 SHA256 002acabce7ddc140d0d55891f9d4fcfbdd806b9332fb8b110c91bc91afb0bc93 SHA512 bff8ad4e792fb92c382327d080f2383e623d39d474317d9b3132167707ced99b7b4866c9ab315b6479eb75891d146b3d71dc0f5a4e81a509090b3205684409ed WHIRLPOOL cd14fc92e513a1ef0882c0dfb28526fa5f8044b99935c7e022b9ca0c10190c8f8a8fb3cb251db280168cfbc00a2a2f25761dfac9b274aa37d2d66bb03360da6f DIST go1.6.3.src.tar.gz 12617426 SHA256 6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 SHA512 43e9b01220788112a185500bd53f091e7a0023a790092f428e2f40fc1a334dd148558b99d2a1c871b8cc79ad7d2d87a092b93eee7b5a27c2ee675c494de35306 WHIRLPOOL 0a22dc08b89ddfaccf1e871037e7ad6cdbf36f914de527011813d57a2d857478278202314b185e26aa905cb135d13cbea490d03337b42148c6fc2ef93a8cd9fe -DIST go1.7.src.tar.gz 14091954 SHA256 72680c16ba0891fcf2ccf46d0f809e4ecf47bbf889f5d884ccb54c5e9a17e1c0 SHA512 a9cd1279927ca50e083dcf6d5a4bcb3bff6a156b3555608334a41be9613b5002dd71caafa472aae6210b01a6cdbd6aa6a55b8882a8e4bda68a5ffd10a3ae1d14 WHIRLPOOL 77121f84e04e7266f46934c9350f7fe216aa8376fb9ac06602a4b7bf16ed6b3595dbbffc7289b5223e47a9e52980f381183bdeddf34b858d21bb0918a94d7e4e +DIST go1.7.1.src.tar.gz 14098889 SHA256 2b843f133b81b7995f26d0cb64bbdbb9d0704b90c44df45f844d28881ad442d3 SHA512 eab2b44f44d05c62645756e05078c2a8b7e3c4d2413617a20a6659df22e4612bb2059cf4906ab81134421eb371903034c1b197bb5595c9af9901819b2b3330a3 WHIRLPOOL 0733985cece30858431f600af12f60c3ff2894a78f09900a64aac7d493d790679a75a7c878b461fc6548663cc0cd34481c6e62051fd55ea68e8fa1d3b19fcdb0 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.7.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.7.1.ebuild similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.7.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.7.1.ebuild index 7252b0aaa3..9e35e2c821 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.7.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-1.7.1.ebuild @@ -6,4 +6,4 @@ EAPI=6 inherit coreos-go-lang -KEYWORDS="-* ~amd64 ~arm64" +KEYWORDS="-* amd64 arm64" From 0b3bf1755c3506b84d5316315e6f13a5535d123c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 7 Sep 2016 17:38:57 -0700 Subject: [PATCH 3/3] coreos-go-depend: set go1.7 as the default version --- .../third_party/coreos-overlay/eclass/coreos-go-depend.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 47f071e3ff..29197450ff 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 @@ -14,7 +14,7 @@ # @CODE # COREOS_GO_VERSION=go1.5 # @CODE -export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.6}" +export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.7}" case "${EAPI:-0}" in 5|6) ;;