aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-03-28 20:58:17 +0100
committerThomas Deutschmann <whissi@gentoo.org>2019-03-28 21:00:41 +0100
commit5675f908d614aa5fa7e1b6bb6385df63aa142738 (patch)
tree0cb5bea169bf93638be3914b3d41ee8fc06825bb
parentgenkernel: remove dead code which checked for multiple running genkernel inst... (diff)
downloadgenkernel-5675f908.tar.gz
genkernel-5675f908.tar.bz2
genkernel-5675f908.zip
Call get_KV in genkernel main script only
$KV must be set for determine_config_file. However, for clarity, call get_KV in main script only and don't rely on other functions. Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rwxr-xr-xgen_determineargs.sh2
-rwxr-xr-xgenkernel7
2 files changed, 6 insertions, 3 deletions
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index e955540..c88bb4f 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -259,6 +259,4 @@ determine_real_args() {
[[ "${FIRMWARE_FILES}" = *,* ]] && gen_die "FIRMWARE_FILES should be a space-separated list."
fi
-
- get_KV
}
diff --git a/genkernel b/genkernel
index 0e716b5..44c34ba 100755
--- a/genkernel
+++ b/genkernel
@@ -139,8 +139,13 @@ done
# Based on genkernel.conf, arch-specific configs, and commandline options,
# get the real arguments for usage...
-
determine_real_args
+
+get_KV
+# $KV is now either set to the version from previous compilation,
+# which would include LOCALVERSION suffix, or initialized with
+# unmodified KERNEL_SOURCE version (which normally has no LOCALVERSION set).
+
determine_config_file
set_kernel_arch