| 1 |
commit: 5675f908d614aa5fa7e1b6bb6385df63aa142738 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 28 19:58:17 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 28 20:00:41 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5675f908 |
| 7 |
|
| 8 |
Call get_KV in genkernel main script only |
| 9 |
|
| 10 |
$KV must be set for determine_config_file. However, for clarity, |
| 11 |
call get_KV in main script only and don't rely on other functions. |
| 12 |
|
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
gen_determineargs.sh | 2 -- |
| 16 |
genkernel | 7 ++++++- |
| 17 |
2 files changed, 6 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 20 |
index e955540..c88bb4f 100755 |
| 21 |
--- a/gen_determineargs.sh |
| 22 |
+++ b/gen_determineargs.sh |
| 23 |
@@ -259,6 +259,4 @@ determine_real_args() { |
| 24 |
|
| 25 |
[[ "${FIRMWARE_FILES}" = *,* ]] && gen_die "FIRMWARE_FILES should be a space-separated list." |
| 26 |
fi |
| 27 |
- |
| 28 |
- get_KV |
| 29 |
} |
| 30 |
|
| 31 |
diff --git a/genkernel b/genkernel |
| 32 |
index 0e716b5..44c34ba 100755 |
| 33 |
--- a/genkernel |
| 34 |
+++ b/genkernel |
| 35 |
@@ -139,8 +139,13 @@ done |
| 36 |
|
| 37 |
# Based on genkernel.conf, arch-specific configs, and commandline options, |
| 38 |
# get the real arguments for usage... |
| 39 |
- |
| 40 |
determine_real_args |
| 41 |
+ |
| 42 |
+get_KV |
| 43 |
+# $KV is now either set to the version from previous compilation, |
| 44 |
+# which would include LOCALVERSION suffix, or initialized with |
| 45 |
+# unmodified KERNEL_SOURCE version (which normally has no LOCALVERSION set). |
| 46 |
+ |
| 47 |
determine_config_file |
| 48 |
|
| 49 |
set_kernel_arch |
Archives