aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-09-29 17:32:37 +0200
committerThomas Deutschmann <whissi@gentoo.org>2019-09-29 17:34:41 +0200
commitb6a711fc8b667a9c6f198b79268385e9d20423f3 (patch)
tree3da3f7e9409c14a16d2eb1a89f9f883da3a35681
parentgen_determineargs.sh: determine_KV(): Define global KV_NUMERIC variable (diff)
downloadgenkernel-b6a711fc.tar.gz
genkernel-b6a711fc.tar.bz2
genkernel-b6a711fc.zip
gen_compile.sh: compile_kernel(): Use global KV_NUMERIC variable
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rwxr-xr-xgen_compile.sh4
1 files 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