commit:     c5d4de5ed682ac0c70fa87c8cab6b35bed51c979
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 21:04:34 2023 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 21:04:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d4de5e

linux-info.eclass: Chk for existance of .config/config.gz when opts req

In the instance where CONFIG_* settings are required and not optional,
make sure there is either a .config or a config.gz to check

Closes: https://bugs.gentoo.org/890720

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 eclass/linux-info.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 16ef69ebccb8..a65d0c441ba2 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -805,8 +805,14 @@ check_extra_config() {
                        export 
LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
                        return 0
                fi
-       else
-               require_configured_kernel
+       elif ! linux_config_exists; then
+               qeerror "Could not find a neither a usable .config in the 
kernel source directory"
+               qeerror "nor a /proc/config.gz file,"
+               qeerror "Please ensure that ${KERNEL_DIR} points to a 
configured set of Linux sources."
+               qeerror "If you are using KBUILD_OUTPUT, please set the 
environment var so that"
+               qeerror "it points to the necessary object directory so that it 
might find .config"
+               qeerror "or have a properly configured kernel to produce a 
config.gz file. (CONFIG_IKCONFIG)."
+               die "Kernel not configured; no .config found in ${KV_OUT_DIR} 
or /proc/config.gz found"
        fi
 
        ebegin "Checking for suitable kernel configuration options"

Reply via email to