• [gentoo-dev] [PATCH 3/3] linux-info.eclass: Replace bit-shift arith

    From Alice@21:1/5 to Alice on Thu Aug 26 15:50:01 2021
    To: ulm@gentoo.org (=?UTF-8?Q?Ulrich_M=c3=bcller?=)

    This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --kT1gsEvMRdADPpjyD5O1mJXJCVKClGLtb
    Content-Type: multipart/mixed;
    boundary="------------56700F702863390A2CE130A2"
    Content-Language: en-US

    This is a multi-part message in MIME format. --------------56700F702863390A2CE130A2
    Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable

    On 8/26/21 10:41 PM, Alice wrote:
    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 <ulm@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
          # 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() {


    patch 1 and patch 3 looks the same patch.

    ah just see that the file is different.
    Thanks looks good for me.

    --
    Thanks,
    Alicef

    --------------56700F702863390A2CE130A2
    Content-Type: application/pgp-keys;
    name="OpenPGP_0x1D6802D75C10FEF6.asc"
    Content-Transfer-Encoding: base64
    Content-Disposition: attachment;
    filename="OpenPGP_0x1D6802D75C10FEF6.asc"


    --------------56700F702863390A2CE130A2--

    --kT1gsEvMRdADPpjyD5O1mJXJCVKClGLtb--

    -----BEGIN PGP SIGNATURE-----

    iQIzBAEBCAAdFiEEKxPnsvZf+7NCDYpgQq+TvR6UnvMFAmEnmkQACgkQQq+TvR6U nvNuUg/8C8r4ygZa/EKmPkbDfcsl4jLDWfFmDjHEO1BFQt5xM4v9DamDa2tIBBQM SoYa0tVqfH53FA2/BOWIic7aQ9sSKwOm0qeOwYPj5N3ZAr/1aApEj1oSXse4eF9K uOtKLlIuYppWe65ktw76edyKYeq28ooYyQLoQ3et6sm2BsP6aWnAasA+TQoQwlcD lNEhFdHU/ePxPJtWKqzxcNBxO5vBmvrqGG7sEK8yGy+GeFWjqjX4bLxzsRoLnNSp Uak8KED+Nxt6CwivAoxjz5uHI629zsxI3oFeloYibqbCrEW/YGgrHmMentS5wxim pt15ypCNJbK7kJds8PIBQsGOU/vBOcvk1toHD/ViS5Y4H2Jn9oTGSdZzC4Z4VjN5 oFkMpV5KR98zHyMuaZAJUT6sHCykoT0rXlb1G9aihMgW3qCSsTPZDPKPqNZW7eyI 2HCXnuWC6fDmzoKNY0J3d/nKU148a298uQXvd7Imt7YmCGqVqh5aYYOBNTMveAPO IuILYnGIJSqX/lTMWYACbv4zuqWO4PJw06dlsCRFyVpB5RCFdbmxnD
  • From Alice@21:1/5 to All on Thu Aug 26 15:50:01 2021
    To: ulm@gentoo.org (=?UTF-8?Q?Ulrich_M=c3=bcller?=)

    This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --e0cwFhSkakSG5z6NOrUnsbRBoEmAbc1Ny
    Content-Type: multipart/mixed;
    boundary="------------C24C57332CF5932FE260A2CC"
    Content-Language: en-US

    This is a multi-part message in MIME format. --------------C24C57332CF5932FE260A2CC
    Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable

    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 <ulm@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

    # 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() {


    patch 1 and patch 3 looks the same patch.

    --
    Thanks,
    Alicef

    --------------C24C57332CF5932FE260A2CC
    Content-Type: application/pgp-keys;
    name="OpenPGP_0x1D6802D75C10FEF6.asc"
    Content-Transfer-Encoding: base64
    Content-Disposition: attachment;
    filename="OpenPGP_0x1D6802D75C10FEF6.asc"


    --------------C24C57332CF5932FE260A2CC--

    --e0cwFhSkakSG5z6NOrUnsbRBoEmAbc1Ny--

    -----BEGIN PGP SIGNATURE-----

    iQIzBAEBCAAdFiEEKxPnsvZf+7NCDYpgQq+TvR6UnvMFAmEnmfgACgkQQq+TvR6U nvOgsQ/+Ok2cis4TjuGYEFxsfDzAJnZYmj6oqTfAzYDVSolGbhSIkLNUK9eghfVG lfS5YAtwgIoY64/j+nlbXoXZceRnIM9qKHUT2+n0twquEeNUdRos6zeL3AWrZQqG qbzF0EYZwOX2uc0k5yCa11ekJqIEbi2pVoenFTabb/1pjuhNlTDGf8SCTbLwftCz 5Gkkmvh/adlOtxKEMeKywNdOcCMQPtKDpY0kqpcGkXy9972GfCKUw7hD2Zuf7FE2 5Y79vu85D79HBus4Ex7TGrjYhD6KmK78iDHYbNfhwCtKU1Pr5AP8SwtPTzaz1SkH yDUc9bhi4lqxpMLmc+NNbte/vDoX7EpGWx3/z4YJl04vseqMWGJTdJXApaA1gicF qhJmOKXPdoh7U1HOyNJPRs9jhTtlUKY5wdVbg/0cC8Hoh+TiDn+rH7OXK+I+Cifv dPwqXeSeJRAL+V9IPL8OiEcIDfgAFJs6uMlD3w1xMgkvQxaw8Xtj35ajlLfu4xCA PO44IhwkP68hT8afO4x+qqBqqzUKM/JXUWhZXdt5t0zi/+imobJLPM