[gentoo-dev] [PATCH 1/1] linux-info.eclass: Chk for .config/config.gz when CONFIG_* req

[gentoo-dev] [PATCH 1/1] linux-info.eclass: Chk for .config/config.gz when CONFIG_* req

[Mike Pagano]

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

Signed-off-by: Mike Pagano <mpagano@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 16ef69ebc..a65d0c441 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"
-- 
2.38.2


-- 
Mike Pagano
Gentoo Developer - Kernel Project
Gentoo Sources - Lead
E-Mail     : mpagano@gentoo.org
GnuPG FP   : 52CC A0B0 F631 0B17 0142 F83F 92A6 DBEC 81F2 B137
Public Key : http://http://pgp.mit.edu/pks/lookup?search=0x92A6DBEC81F2B137&op=index

Re: [gentoo-dev] [PATCH 1/1] linux-info.eclass: Chk for .config/config.gz when CONFIG_* req

[Mike Pagano]

On 1/15/23 18:22, Mike Pagano wrote:
> In the instance where CONFIG_* settings are required and not optional,
> make sure there is either a .config or a config.gz to check
> 
> Signed-off-by: Mike Pagano <mpagano@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 16ef69ebc..a65d0c441 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"

Committed

-- 
Mike Pagano
Gentoo Developer - Kernel Project
Gentoo Sources - Lead
E-Mail     : mpagano@gentoo.org
GnuPG FP   : 52CC A0B0 F631 0B17 0142 F83F 92A6 DBEC 81F2 B137
Public Key : http://http://pgp.mit.edu/pks/lookup?search=0x92A6DBEC81F2B137&op=index