| 1 |
commit: b6a711fc8b667a9c6f198b79268385e9d20423f3 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 29 15:32:37 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 29 15:34:41 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b6a711fc |
| 7 |
|
| 8 |
gen_compile.sh: compile_kernel(): Use global KV_NUMERIC variable |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
gen_compile.sh | 4 ++-- |
| 13 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gen_compile.sh b/gen_compile.sh |
| 16 |
index fb77e2b..c782f9b 100755 |
| 17 |
--- a/gen_compile.sh |
| 18 |
+++ b/gen_compile.sh |
| 19 |
@@ -274,7 +274,7 @@ compile_kernel() { |
| 20 |
compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel |
| 21 |
fi |
| 22 |
|
| 23 |
- if isTrue "${FIRMWARE_INSTALL}" && [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -ge 4014 ] |
| 24 |
+ if isTrue "${FIRMWARE_INSTALL}" && [ ${KV_NUMERIC} -ge 4014 ] |
| 25 |
then |
| 26 |
# Kernel v4.14 removed firmware from the kernel sources |
| 27 |
print_warning 1 "$(get_indent 1)>> Linux v4.14 removed in-kernel firmware, you MUST install the sys-kernel/linux-firmware package!" |
| 28 |
@@ -290,7 +290,7 @@ compile_kernel() { |
| 29 |
[ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH |
| 30 |
MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel |
| 31 |
fi |
| 32 |
- elif [ $((${KV_MAJOR} * 1000 + ${KV_MINOR})) -lt 4014 ] |
| 33 |
+ elif [ ${KV_NUMERIC} -lt 4014 ] |
| 34 |
then |
| 35 |
print_info 1 "$(get_indent 1)>> Skipping installation of bundled firmware due to --no-firmware-install ..." |
| 36 |
fi |
Archives