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 786A2138334 for ; Thu, 28 Mar 2019 23:43:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16D00E0AC4; Thu, 28 Mar 2019 23:43:17 +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 E6156E0AC4 for ; Thu, 28 Mar 2019 23:43:16 +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 DFB65335D07 for ; Thu, 28 Mar 2019 23:43:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBABD584 for ; Thu, 28 Mar 2019 23:43:12 +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: <1553803241.5675f908d614aa5fa7e1b6bb6385df63aa142738.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_determineargs.sh genkernel X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 5675f908d614aa5fa7e1b6bb6385df63aa142738 X-VCS-Branch: master Date: Thu, 28 Mar 2019 23:43:12 +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: 360c8eaa-1601-4a92-83f5-aa71994e508b X-Archives-Hash: 81788c506042579736b213d1b244b258 commit: 5675f908d614aa5fa7e1b6bb6385df63aa142738 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Mar 28 19:58:17 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Mar 28 20:00:41 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=5675f908 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 gentoo.org> gen_determineargs.sh | 2 -- genkernel | 7 ++++++- 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