diff options
| -rw-r--r-- | eclass/kernel-2.eclass | 10 | ||||
| -rw-r--r-- | eclass/linux-info.eclass | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 58e0bae94eee..4597da4c96bc 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -558,10 +558,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 +572,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}.${KV_MINOR}.${KV_PATCH}" \ + "${operator}" \ + "${1:-${KV_MAJOR}}.${2:-${KV_MINOR}}.${3:-${KV_PATCH}}" } # Capture the sources type and set DEPENDs diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 124fb70e78ad..5456d6be02eb 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -395,7 +395,7 @@ kernel_is() { linux-info_get_any_version # Now we can continue - local operator test value + local operator case ${1#-} in lt) operator="-lt"; shift;; @@ -407,9 +407,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}.${KV_MINOR}.${KV_PATCH}" \ + "${operator}" \ + "${1:-${KV_MAJOR}}.${2:-${KV_MINOR}}.${3:-${KV_PATCH}}" } get_localversion() { |