From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8CC8458975 for ; Sun, 7 Feb 2016 12:53:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFC0921C001; Sun, 7 Feb 2016 12:53:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86B2621C001 for ; Sun, 7 Feb 2016 12:53:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 550AF34095A for ; Sun, 7 Feb 2016 12:53:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C32188F7 for ; Sun, 7 Feb 2016 12:53:27 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1454847591.aa3fd1cd490c0e2ad1088a28d325701c2cebcdf1.robbat2@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: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: aa3fd1cd490c0e2ad1088a28d325701c2cebcdf1 X-VCS-Branch: master Date: Sun, 7 Feb 2016 12:53: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-Archives-Salt: fdc5dc44-ec10-42e1-9e1b-7c518b4f4933 X-Archives-Hash: c95e868e164ee98b4ebf7108b361216e commit: aa3fd1cd490c0e2ad1088a28d325701c2cebcdf1 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Feb 7 12:19:51 2016 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Feb 7 12:19:51 2016 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=aa3fd1cd Be stricter with module path for firmware. Signed-off-by: Robin H. Johnson gentoo.org> gen_compile.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gen_compile.sh b/gen_compile.sh index 8d8f04a..9b9dc5b 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -338,6 +338,8 @@ compile_kernel() { if [ -n "${firmware_in_kernel_line}" -a "${firmware_in_kernel_line}" != CONFIG_FIRMWARE_IN_KERNEL=y ] then print_info 1 " >> Installing firmware ('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..." + [ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH + [ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH MAKEOPTS="${MAKEOPTS} -j1" compile_generic "firmware_install" kernel else print_info 1 " >> Not installing firmware as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."