[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     6edd821aefef800ad5bb3aeccbc8e4fefe27bd20
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 28 05:25:48 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 22:50:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6edd821a

linux-info.eclass: Replace bit-shift arithmetic by ver_test

There are kernel versions like 4.9.280, therefore shifting version
components by 8 bits in kernel_is() may fail.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 eclass/linux-info.eclass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 124fb70e78a..8edd17c317d 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:-0}.${KV_MINOR:-0}.${KV_PATCH:-0}" \
+               "${operator}" \
+               "${1:-${KV_MAJOR:-0}}.${2:-${KV_MINOR:-0}}.${3:-${KV_PATCH:-0}}"
 }
 
 get_localversion() {