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 B6375138334 for ; Mon, 15 Jul 2019 23:32:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE6FAE0827; Mon, 15 Jul 2019 23:32:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 A5C58E0827 for ; Mon, 15 Jul 2019 23:32:42 +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 55714347C52 for ; Mon, 15 Jul 2019 23:32:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 588ED55B for ; Mon, 15 Jul 2019 23:32:39 +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: <1563233436.95404d6b022f71c8017d5400e7c47d4a09845433.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: 95404d6b022f71c8017d5400e7c47d4a09845433 X-VCS-Branch: master Date: Mon, 15 Jul 2019 23:32:39 +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: 9c7995f5-4b67-496b-a920-25a0fbcbcf85 X-Archives-Hash: 382e4f22b3b9ef696e3aaca3212de007 commit: 95404d6b022f71c8017d5400e7c47d4a09845433 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Jul 15 23:30:36 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Jul 15 23:30:36 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=95404d6b gen_configkernel.sh: config_kernel(): No need to re-check required kernel options when config wasn't modified Signed-off-by: Thomas Deutschmann gentoo.org> gen_configkernel.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index ef88250..c37a9cb 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -724,20 +724,20 @@ config_kernel() { print_info 1 "$(get_indent 1)>> Running 'make olddefconfig' due to changed kernel options ..." compile_generic olddefconfig kernel 2>/dev/null fi + + print_info 2 "$(get_indent 1)>> Checking if required kernel options are still present ..." + local required_kernel_option= + for required_kernel_option in "${required_kernel_options[@]}" + do + local optval=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "${required_kernel_option}") + if [ -z "${optval}" ] + then + gen_die "Something went wrong: Required kernel option '${required_kernel_option}' which genkernel tried to set is missing!" + else + print_info 3 "$(get_indent 2) - '${required_kernel_option}' is set to '${optval}'" + fi + done else print_info 2 "$(get_indent 1)>> genkernel did not need to add/modify any kernel options." fi - - print_info 2 "$(get_indent 1)>> Checking if required kernel options are still present ..." - local required_kernel_option= - for required_kernel_option in "${required_kernel_options[@]}" - do - local optval=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "${required_kernel_option}") - if [ -z "${optval}" ] - then - gen_die "Something went wrong: Required kernel option '${required_kernel_option}' which genkernel tried to set is missing!" - else - print_info 3 "$(get_indent 2) - '${required_kernel_option}' is set to '${optval}'" - fi - done }