Re: [gentoo-dev] [PATCH 3/3] linux-info.eclass: Replace bit-shift arithmetic by ver_test

[Alice]

On 8/26/21 6:40 PM, Ulrich Müller wrote:

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 <u...@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 6da13cc0b2f5..9a112199f4b5 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -395,7 +395,7 @@ kernel_is() {
        linux-info_get_any_version

-       local operator test value
+       local operator

          lt) operator="-lt"; shift;;
@@ -407,9 +407,10 @@ kernel_is() {
        esac
        [[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many 
parameters"

-       : $(( 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}}"
  }

# Now we can continue case ${1#-} in - : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH )) get_localversion() {

patch 1 and patch 3 looks the same patch.

--
Thanks,
Alicef

OpenPGP_0x1D6802D75C10FEF6.asc
Description: application/pgp-keys

OpenPGP_signature
Description: OpenPGP digital signature