| 1 |
commit: 79b66d82bdfa4ade09336a54865633c69eeaf154 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 11 18:15:02 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 11 18:15:02 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=79b66d82 |
| 7 |
|
| 8 |
gen_funcs.sh: Move KCONFIG_MODIFIED_MARKER declaration to determine_real_args() |
| 9 |
|
| 10 |
Since we moved $TEMP declaration to determine_real_args(), we also |
| 11 |
need to move KCONFIG_MODIFIED_MARKER to determine_real_args(). |
| 12 |
|
| 13 |
Fixes 2cefc27 ("genkernel: Move --tempdir handling to determine_real_args()") |
| 14 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 15 |
|
| 16 |
gen_determineargs.sh | 2 ++ |
| 17 |
gen_funcs.sh | 2 -- |
| 18 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 21 |
index d3669b8..8f1efb6 100755 |
| 22 |
--- a/gen_determineargs.sh |
| 23 |
+++ b/gen_determineargs.sh |
| 24 |
@@ -396,6 +396,8 @@ determine_real_args() { |
| 25 |
|
| 26 |
declare -gr GK_V_CACHEDIR="${CACHE_DIR}/${GK_V}" |
| 27 |
|
| 28 |
+ declare -gr KCONFIG_MODIFIED_MARKER="${TEMP}/.kconfig_modified" |
| 29 |
+ |
| 30 |
if [ -n "${CMD_CROSS_COMPILE}" ] |
| 31 |
then |
| 32 |
if ! isTrue "$(is_valid_triplet "${CMD_CROSS_COMPILE}")" |
| 33 |
|
| 34 |
diff --git a/gen_funcs.sh b/gen_funcs.sh |
| 35 |
index da9bc08..3f285e3 100755 |
| 36 |
--- a/gen_funcs.sh |
| 37 |
+++ b/gen_funcs.sh |
| 38 |
@@ -1704,8 +1704,6 @@ kconfig_get_opt() { |
| 39 |
-e "/^#\? \?${optname}[ =].*/{ s/.*${optname}[ =]//g; s/is not set\| +//g; p; q }" |
| 40 |
} |
| 41 |
|
| 42 |
-KCONFIG_MODIFIED_MARKER="${TEMP}/.kconfig_modified" |
| 43 |
- |
| 44 |
kconfig_set_opt() { |
| 45 |
[[ ${#} -lt 3 ]] \ |
| 46 |
&& gen_die "$(get_useful_function_stack "${FUNCNAME}")Invalid usage of ${FUNCNAME}(): Function takes at least three arguments (${#} given)!" |
Archives