| 1 |
On 1/15/23 18:22, Mike Pagano wrote: |
| 2 |
> In the instance where CONFIG_* settings are required and not optional, |
| 3 |
> make sure there is either a .config or a config.gz to check |
| 4 |
> |
| 5 |
> Signed-off-by: Mike Pagano <mpagano@g.o> |
| 6 |
> --- |
| 7 |
> eclass/linux-info.eclass | 10 ++++++++-- |
| 8 |
> 1 file changed, 8 insertions(+), 2 deletions(-) |
| 9 |
> |
| 10 |
> diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass |
| 11 |
> index 16ef69ebc..a65d0c441 100644 |
| 12 |
> --- a/eclass/linux-info.eclass |
| 13 |
> +++ b/eclass/linux-info.eclass |
| 14 |
> @@ -805,8 +805,14 @@ check_extra_config() { |
| 15 |
> export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}" |
| 16 |
> return 0 |
| 17 |
> fi |
| 18 |
> - else |
| 19 |
> - require_configured_kernel |
| 20 |
> + elif ! linux_config_exists; then |
| 21 |
> + qeerror "Could not find a neither a usable .config in the kernel source directory" |
| 22 |
> + qeerror "nor a /proc/config.gz file," |
| 23 |
> + qeerror "Please ensure that ${KERNEL_DIR} points to a configured set of Linux sources." |
| 24 |
> + qeerror "If you are using KBUILD_OUTPUT, please set the environment var so that" |
| 25 |
> + qeerror "it points to the necessary object directory so that it might find .config" |
| 26 |
> + qeerror "or have a properly configured kernel to produce a config.gz file. (CONFIG_IKCONFIG)." |
| 27 |
> + die "Kernel not configured; no .config found in ${KV_OUT_DIR} or /proc/config.gz found" |
| 28 |
> fi |
| 29 |
> |
| 30 |
> ebegin "Checking for suitable kernel configuration options" |
| 31 |
|
| 32 |
Committed |
| 33 |
|
| 34 |
-- |
| 35 |
Mike Pagano |
| 36 |
Gentoo Developer - Kernel Project |
| 37 |
Gentoo Sources - Lead |
| 38 |
E-Mail : mpagano@g.o |
| 39 |
GnuPG FP : 52CC A0B0 F631 0B17 0142 F83F 92A6 DBEC 81F2 B137 |
| 40 |
Public Key : http://http://pgp.mit.edu/pks/lookup?search=0x92A6DBEC81F2B137&op=index |
Archives