diff options
Diffstat (limited to 'eclass/kernel-2.eclass')
| -rw-r--r-- | eclass/kernel-2.eclass | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 58e0bae94eee..c2f1e93dca68 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -220,11 +220,6 @@ fi HOMEPAGE="https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel ${HOMEPAGE}" : ${LICENSE:="GPL-2"} -# This is the latest KV_PATCH of the deblob tool available from the -# libre-sources upstream. If you bump this, you MUST regenerate the Manifests -# for ALL kernel-2 consumer packages where deblob is available. -: ${DEBLOB_MAX_VERSION:=38} - # No need to run scanelf/strip on kernel sources/headers (bug #134453). RESTRICT="binchecks strip" @@ -558,10 +553,9 @@ kernel_is() { local v n=0 for v in OKV KV_{MAJOR,MINOR,PATCH} ; do [[ -z ${!v} ]] && n=1 ; done [[ ${n} -eq 1 ]] && detect_version - unset v n # Now we can continue - local operator test value + local operator case ${1#-} in lt) operator="-lt"; shift;; @@ -573,9 +567,10 @@ kernel_is() { esac [[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many parameters" - : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH )) - : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} )) - [ ${test} ${operator} ${value} ] + ver_test \ + "${KV_MAJOR:-0}.${KV_MINOR:-0}.${KV_PATCH:-0}" \ + "${operator}" \ + "${1:-${KV_MAJOR:-0}}.${2:-${KV_MINOR:-0}}.${3:-${KV_PATCH:-0}}" } # Capture the sources type and set DEPENDs @@ -600,11 +595,6 @@ if [[ ${ETYPE} == sources ]]; then # Bug #266157, deblob for libre support if [[ -z ${K_PREDEBLOBBED} ]]; then - # Bug #359865, force a call to detect_version if needed - kernel_is ge 2 6 27 && \ - [[ -z ${K_DEBLOB_AVAILABLE} ]] && \ - kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \ - K_DEBLOB_AVAILABLE=1 # deblob less than 5.10 require python 2.7 if kernel_is lt 5 10; then K_DEBLOB_AVAILABLE=0 @@ -621,7 +611,6 @@ if [[ ${ETYPE} == sources ]]; then # tree has been dropped from the kernel. kernel_is lt 4 14 && LICENSE+=" !deblob? ( linux-firmware )" - [[ ${EAPI} == 6 ]] && DEPEND+=" deblob? ( ${PYTHON_DEPS} )" || BDEPEND+=" deblob? ( ${PYTHON_DEPS} )" if [[ -n KV_MINOR ]]; then |