[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b6a711fc8b667a9c6f198b79268385e9d20423f3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 15:32:37 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 15:34:41 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b6a711fc

gen_compile.sh: compile_kernel(): Use global KV_NUMERIC variable

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_compile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index fb77e2b..c782f9b 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -274,7 +274,7 @@ compile_kernel() {
                compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
        fi
 
-       if isTrue "${FIRMWARE_INSTALL}" && [ $((${KV_MAJOR} * 1000 + 
${KV_MINOR})) -ge 4014 ]
+       if isTrue "${FIRMWARE_INSTALL}" && [ ${KV_NUMERIC} -ge 4014 ]
        then
                # Kernel v4.14 removed firmware from the kernel sources
                print_warning 1 "$(get_indent 1)>> Linux v4.14 removed 
in-kernel firmware, you MUST install the sys-kernel/linux-firmware package!"
@@ -290,7 +290,7 @@ compile_kernel() {
                        [ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH
                        MAKEOPTS="${MAKEOPTS} -j1" compile_generic 
"firmware_install" kernel
                fi
-       elif [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -lt 4014 ]
+       elif [ ${KV_NUMERIC} -lt 4014 ]
        then
                print_info 1 "$(get_indent 1)>> Skipping installation of 
bundled firmware due to --no-firmware-install ..."
        fi