From 6b83baa45fe390b1c2be344000201c44047de8a4 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 19 Apr 2021 12:14:10 +0200 Subject: [PATCH 1/4] eclass: update COREOS_GO_VERSION to 1.16 We need to update COREOS_GO_VERSION in eclass files to 1.16, to make builds work with Go 1.16 by default. --- .../third_party/coreos-overlay/eclass/coreos-go-depend.eclass | 4 ++-- .../src/third_party/coreos-overlay/eclass/coreos-go.eclass | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 283941afbb..67bbdab763 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.15 +# COREOS_GO_VERSION=go1.16 # @CODE -export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.15}" +export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.16}" 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 ee40677777..c8becf51e4 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.15 +# COREOS_GO_VERSION=go1.16 # @CODE case "${EAPI:-0}" in From 9541ac9210d4e4749171c1f1d5e0a0a30ca6423f Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 19 Apr 2021 12:15:00 +0200 Subject: [PATCH 2/4] app-emulation/cri-tools: default to the default COREOS_GO_VERSION We do not need to set COREOS_GO_VERSION to a specific version, unless it is necessary to avoid build issues in certain cases like Docker. Simply remove COREOS_GO_VERSION from the ebuild of cri-tools. --- .../app-emulation/cri-tools/cri-tools-1.19.0.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.19.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.19.0.ebuild index fd52edd1cb..07e5cf53db 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.19.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/cri-tools/cri-tools-1.19.0.ebuild @@ -5,7 +5,6 @@ EAPI=7 inherit coreos-go -COREOS_GO_VERSION="go1.15" COREOS_GO_PACKAGE="github.com/kubernetes-sigs/cri-tools" COREOS_GO_MOD="vendor" From f9ff6599a9d0370d2a82fac8e06e2340a08493be Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 19 Apr 2021 14:17:29 +0200 Subject: [PATCH 3/4] app-emulation/acbuild: set COREOS_GO111MODULE to off app-emulation/acbuild also belongs to the cases where Go module is not supported due to its old source code. --- .../coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild index 0cfe7a2a2e..d6c0138561 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/acbuild/acbuild-9999.ebuild @@ -6,6 +6,7 @@ CROS_WORKON_PROJECT="appc/acbuild" CROS_WORKON_REPO="git://github.com" CROS_WORKON_LOCALNAME="appc-acbuild" COREOS_GO_PACKAGE="github.com/appc/acbuild" +COREOS_GO_GO111MODULE="off" inherit coreos-go toolchain-funcs cros-workon if [[ "${PV}" == 9999 ]]; then From 3fb5511b306537167e9225e0aa3dd4451780cdf7 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 19 Apr 2021 14:41:13 +0200 Subject: [PATCH 4/4] app-admin/updateservicectl: set COREOS_GO111MODULE to off app-admin/updateservicectl also belongs to the cases where Go module is not supported due to its old source code. --- .../app-admin/updateservicectl/updateservicectl-9999.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild index b5dcba0e9e..865d398c18 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/updateservicectl/updateservicectl-9999.ebuild @@ -6,6 +6,7 @@ CROS_WORKON_PROJECT="flatcar-linux/updateservicectl" CROS_WORKON_LOCALNAME="updateservicectl" CROS_WORKON_REPO="git://github.com" COREOS_GO_PACKAGE="github.com/coreos/updateservicectl" +COREOS_GO_GO111MODULE="off" inherit cros-workon coreos-go if [[ "${PV}" == 9999 ]]; then