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 DABA6138334 for ; Sun, 11 Aug 2019 19:55:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2201EE0835; Sun, 11 Aug 2019 19:55:39 +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 04BC7E0835 for ; Sun, 11 Aug 2019 19:55:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 E1B4A3498D1 for ; Sun, 11 Aug 2019 19:55:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95AD2738 for ; Sun, 11 Aug 2019 19:55:36 +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: <1565547302.79b66d82bdfa4ade09336a54865633c69eeaf154.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_determineargs.sh gen_funcs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 79b66d82bdfa4ade09336a54865633c69eeaf154 X-VCS-Branch: master Date: Sun, 11 Aug 2019 19:55:36 +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: 1aada7cb-efe1-4b70-b2ac-de2b81a507ca X-Archives-Hash: 09c1104c990cac60c78907b33bc76d80 commit: 79b66d82bdfa4ade09336a54865633c69eeaf154 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Aug 11 18:15:02 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Aug 11 18:15:02 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=79b66d82 gen_funcs.sh: Move KCONFIG_MODIFIED_MARKER declaration to determine_real_args() Since we moved $TEMP declaration to determine_real_args(), we also need to move KCONFIG_MODIFIED_MARKER to determine_real_args(). Fixes 2cefc27 ("genkernel: Move --tempdir handling to determine_real_args()") Signed-off-by: Thomas Deutschmann gentoo.org> gen_determineargs.sh | 2 ++ gen_funcs.sh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gen_determineargs.sh b/gen_determineargs.sh index d3669b8..8f1efb6 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -396,6 +396,8 @@ determine_real_args() { declare -gr GK_V_CACHEDIR="${CACHE_DIR}/${GK_V}" + declare -gr KCONFIG_MODIFIED_MARKER="${TEMP}/.kconfig_modified" + if [ -n "${CMD_CROSS_COMPILE}" ] then if ! isTrue "$(is_valid_triplet "${CMD_CROSS_COMPILE}")" diff --git a/gen_funcs.sh b/gen_funcs.sh index da9bc08..3f285e3 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -1704,8 +1704,6 @@ kconfig_get_opt() { -e "/^#\? \?${optname}[ =].*/{ s/.*${optname}[ =]//g; s/is not set\| +//g; p; q }" } -KCONFIG_MODIFIED_MARKER="${TEMP}/.kconfig_modified" - kconfig_set_opt() { [[ ${#} -lt 3 ]] \ && gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes at least three arguments (${#} given)!"