From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86DE7138334 for ; Wed, 2 Oct 2019 22:45:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 713D9E0898; Wed, 2 Oct 2019 22:45:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51402E0891 for ; Wed, 2 Oct 2019 22:45:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EEF934B7C7 for ; Wed, 2 Oct 2019 22:45:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0049D804 for ; Wed, 2 Oct 2019 22:45:27 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1569771281.b6a711fc8b667a9c6f198b79268385e9d20423f3.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_compile.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: b6a711fc8b667a9c6f198b79268385e9d20423f3 X-VCS-Branch: master Date: Wed, 2 Oct 2019 22:45:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f4116f61-ac28-4d70-a650-b60a6a572fe6 X-Archives-Hash: bf7aa159a8610587cea47aaf8cbe08b2 commit: b6a711fc8b667a9c6f198b79268385e9d20423f3 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Sep 29 15:32:37 2019 +0000 Commit: Thomas Deutschmann gentoo 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 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