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

[Ulrich Müller]

commit:     f3772cf131333575eb40a527181a9f7e2760217b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 27 18:05:46 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 18:05:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3772cf1

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

This reverts commit 4b48b038fa23b5580fa2b916b34c646c155db93a.

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

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

diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 5456d6be02e..124fb70e78a 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
+       local operator test value
 
        case ${1#-} in
          lt) operator="-lt"; shift;;
@@ -407,10 +407,9 @@ kernel_is() {
        esac
        [[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many 
parameters"
 
-       ver_test \
-               "${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" \
-               "${operator}" \
-               "${1:-${KV_MAJOR}}.${2:-${KV_MINOR}}.${3:-${KV_PATCH}}"
+       : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH ))
+       : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + 
${3:-${KV_PATCH}} ))
+       [ ${test} ${operator} ${value} ]
 }
 
 get_localversion() {