commit: 79b66d82bdfa4ade09336a54865633c69eeaf154 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sun Aug 11 18:15:02 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> 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 <whissi <AT> 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)!"