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 2AE9F1382C5 for ; Mon, 15 Mar 2021 21:02:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 810BCE086E; Mon, 15 Mar 2021 21:02:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6C1A2E086E for ; Mon, 15 Mar 2021 21:02:43 +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 70CDE33FE26 for ; Mon, 15 Mar 2021 21:02:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10454597 for ; Mon, 15 Mar 2021 21:02:41 +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: <1615842144.7436269f07727daf13eabef57c6cc936e4e294e2.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: genkernel X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 7436269f07727daf13eabef57c6cc936e4e294e2 X-VCS-Branch: master Date: Mon, 15 Mar 2021 21:02:41 +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: 72f70665-d71b-444f-bffa-306a4df947e0 X-Archives-Hash: 0055af3e6b2bdef808fc629cef0472a4 commit: 7436269f07727daf13eabef57c6cc936e4e294e2 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Mar 15 20:57:46 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Mar 15 21:02:24 2021 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7436269f genkernel: fix used kernel.config Signed-off-by: Thomas Deutschmann gentoo.org> genkernel | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/genkernel b/genkernel index 046e0e3..e6424ba 100755 --- a/genkernel +++ b/genkernel @@ -478,8 +478,10 @@ fi if isTrue "${BUILD_RAMDISK}" then + kconfig_file_used="${KERNEL_OUTPUTDIR}/.config" if ! isTrue "${BUILD_KERNEL}" then + kconfig_file_used="${KERNEL_CONFIG}" INITRAMFS_FILE="${TMPDIR}/${GK_FILENAME_TEMP_INITRAMFS}" isTrue "${CMD_INSTALL}" && INITRAMFS_FILE="${BOOTDIR}/${GK_FILENAME_INITRAMFS}" @@ -524,8 +526,8 @@ then print_warning 1 '"man genkernel" explains "dozfs" in detail.' fi - CONFGREP_CMD=$(get_grep_cmd_for_file "${KERNEL_CONFIG}") - if [ $("${CONFGREP_CMD}" 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l) -ge 2 ] + CONFGREP_CMD=$(get_grep_cmd_for_file "${kconfig_file_used}") + if [ $("${CONFGREP_CMD}" 'CONFIG_EXT[0-9]_FS=' "${kconfig_file_used}" | wc -l) -ge 2 ] then print_warning 1 '' print_warning 1 'With support for several ext* filesystems available, it may be needed to' @@ -533,17 +535,17 @@ then fi unset CONFGREP_CMD - cfg_CONFIG_CMDLINE_OVERRIDE=$(kconfig_get_opt "${KERNEL_CONFIG}" CONFIG_CMDLINE_OVERRIDE) + cfg_CONFIG_CMDLINE_OVERRIDE=$(kconfig_get_opt "${kconfig_file_used}" CONFIG_CMDLINE_OVERRIDE) if [ "${cfg_CONFIG_CMDLINE_OVERRIDE}" = "y" ] then - cfg_CONFIG_CMDLINE=$(kconfig_get_opt "${KERNEL_CONFIG}" CONFIG_CMDLINE) + cfg_CONFIG_CMDLINE=$(kconfig_get_opt "${kconfig_file_used}" CONFIG_CMDLINE) print_warning 1 '' print_warning 1 "${BOLD}Note:${NORMAL}" print_warning 1 'You have set CONFIG_CMDLINE_OVERRIDE=y.' print_warning 1 "You will be unable to alter set kernel parameters (${cfg_CONFIG_CMDLINE}) at runtime!" unset cfg_CONFIG_CMDLINE fi - unset cfg_CONFIG_CMDLINE_OVERRIDE + unset cfg_CONFIG_CMDLINE_OVERRIDE kconfig_file_used fi isTrue "${CMD_INSTALL}" && restore_boot_mount_state