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 70B0F138334 for ; Tue, 26 Mar 2019 08:07:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C4BEE0893; Tue, 26 Mar 2019 08:07:18 +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 38314E0893 for ; Tue, 26 Mar 2019 08:07:18 +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 1C0FE335CFF for ; Tue, 26 Mar 2019 08:07:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5173E58D for ; Tue, 26 Mar 2019 08:07:14 +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: <1553587438.bae8d8db8d8a49279f214c90c36ea5b64a982622.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_configkernel.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: bae8d8db8d8a49279f214c90c36ea5b64a982622 X-VCS-Branch: master Date: Tue, 26 Mar 2019 08:07:14 +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: ccf31de9-55ae-402e-9533-f72f527a2d09 X-Archives-Hash: eec07e0787d374a80ee69322180d06c0 commit: bae8d8db8d8a49279f214c90c36ea5b64a982622 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Mar 26 05:22:42 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Mar 26 08:03:58 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bae8d8db config_kernel(): run def/oldconfig when we have modified .config This is needed to avoid a prompt if a newly added/modified kernel config option adds additional option(s) not yet found in .config. Signed-off-by: Thomas Deutschmann gentoo.org> gen_configkernel.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index a5266e4..016d5b2 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -124,6 +124,8 @@ config_kernel() { [ "$?" ] || gen_die "Error: ${add_config} failed!" fi + [ -f "${TEMP}/.kconfig_modified" ] && rm "${TEMP}/.kconfig_modified" + # Force this on if we are using --genzimage if isTrue "${CMD_GENZIMAGE}" then @@ -555,4 +557,18 @@ config_kernel() { kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "${cfg}" done fi + + if [ -f "${TEMP}/.kconfig_modified" ] + then + if isTrue "${OLDCONFIG}" + then + print_info 1 "$(getIndent 1)>> Re-running oldconfig due to changed kernel options..." + yes '' 2>/dev/null | compile_generic oldconfig kernel 2>/dev/null + else + print_info 1 "$(getIndent 1)>> Running olddefconfig due to changed kernel options..." + compile_generic olddefconfig kernel 2>/dev/null + fi + else + print_info 2 "$(getIndent 1)>> genkernel did not need to add/modify any kernel options." + fi }