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 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 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" 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