From 78e097ecaf5fae4fbb31865a8a421d7f422b9cd0 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 21 Dec 2021 11:04:38 +0100 Subject: [PATCH] eclass: Update to support newer EAPI versions --- .../third_party/coreos-overlay/eclass/coreos-go-depend.eclass | 2 +- .../third_party/coreos-overlay/eclass/coreos-go-lang.eclass | 2 +- .../third_party/coreos-overlay/eclass/coreos-go-utils.eclass | 2 +- .../src/third_party/coreos-overlay/eclass/coreos-go.eclass | 4 ++-- .../third_party/coreos-overlay/eclass/coreos-kernel.eclass | 2 +- 5 files changed, 6 insertions(+), 6 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 1fc55c2b51..da8fced4d5 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 @@ -17,7 +17,7 @@ export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.17}" case "${EAPI:-0}" in 5|6) DEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;; - 7) BDEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;; + 7|8) BDEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;; *) die "Unsupported EAPI=${EAPI} for ${ECLASS}" esac 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 74c6e5665c..b416e486de 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 @@ -10,7 +10,7 @@ # case "${EAPI:-0}" in - 6) ;; + 6|7|8) ;; *) die "Unsupported EAPI=${EAPI} for ${ECLASS}" esac diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass index 3bdfeef711..b5d07016de 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass @@ -8,7 +8,7 @@ # and packages that depend on it. It does not set any metadata. case "${EAPI:-0}" in - 5|6|7) ;; + 5|6|7|8) ;; *) die "Unsupported EAPI=${EAPI} for ${ECLASS}" esac 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 4d0df35249..fc86fda037 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 @@ -34,7 +34,7 @@ # @CODE case "${EAPI:-0}" in - 5|6|7) ;; + 5|6|7|8) ;; *) die "Unsupported EAPI=${EAPI} for ${ECLASS}" esac @@ -68,7 +68,7 @@ go_build() { coreos-go_src_prepare() { debug-print-function ${FUNCNAME} "$@" - has ${EAPI:-0} 6 7 && default + has ${EAPI:-0} 6 7 8 && default go_export export GOPATH="${WORKDIR}/gopath" diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass index ca62377c96..72aed4414f 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass @@ -25,7 +25,7 @@ COREOS_SOURCE_VERSION="${PV}${COREOS_SOURCE_REVISION}" COREOS_KERNEL_SOURCE_NAME="linux-${PV/_rc/-rc}-coreos${COREOS_SOURCE_REVISION}" COREOS_SOURCE_NAME="linux-${PV/_rc/-rc}-flatcar" -[[ ${EAPI} != "7" ]] && die "Only EAPI=7 is supported" +[[ ${EAPI} != [78] ]] && die "Only EAPI 7 and 8 are supported" inherit linux-info toolchain-funcs