[gentoo-dev] [PATCH] kernel-build.eclass: Read user configs from ESYSROOT

[gentoo-dev] [PATCH] kernel-build.eclass: Read user configs from ESYSROOT

[Michał Górny]

Closes: https://bugs.gentoo.org/771324
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 eclass/kernel-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 7a5c80cfd6a6..1589202e4fa1 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -698,7 +698,7 @@ kernel-build_pkg_postinst() {
 #    (if applicable).
 # 3. Config saved via USE=savedconfig (if applicable).
 # 4. Module signing key specified via MODULES_SIGN_KEY* variables.
-# 5. User-supplied configs from ${BROOT}/etc/kernel/config.d/*.config.
+# 5. User-supplied configs from ${ESYSROOT}/etc/kernel/config.d/*.config.
 #
 # This function must be called by the ebuild in the src_prepare phase.
 kernel-build_merge_configs() {
@@ -711,7 +711,7 @@ kernel-build_merge_configs() {
 
 	local shopt_save=$(shopt -p nullglob)
 	shopt -s nullglob
-	local user_configs=( "${BROOT}"/etc/kernel/config.d/*.config )
+	local user_configs=( "${ESYSROOT}"/etc/kernel/config.d/*.config )
 	shopt -u nullglob
 
 	local merge_configs=( "${@}" )

Re: [gentoo-dev] [PATCH] kernel-build.eclass: Read user configs from ESYSROOT

[James Le Cuirot]

[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]

On Wed, 2025-08-27 at 14:34 +0200, Michał Górny wrote:
> Closes: https://bugs.gentoo.org/771324
> Signed-off-by: Michał Górny <mgorny@gentoo.org>
> ---
>  eclass/kernel-build.eclass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
> index 7a5c80cfd6a6..1589202e4fa1 100644
> --- a/eclass/kernel-build.eclass
> +++ b/eclass/kernel-build.eclass
> @@ -698,7 +698,7 @@ kernel-build_pkg_postinst() {
>  #    (if applicable).
>  # 3. Config saved via USE=savedconfig (if applicable).
>  # 4. Module signing key specified via MODULES_SIGN_KEY* variables.
> -# 5. User-supplied configs from ${BROOT}/etc/kernel/config.d/*.config.
> +# 5. User-supplied configs from ${ESYSROOT}/etc/kernel/config.d/*.config.
>  #
>  # This function must be called by the ebuild in the src_prepare phase.
>  kernel-build_merge_configs() {
> @@ -711,7 +711,7 @@ kernel-build_merge_configs() {
>  
>  	local shopt_save=$(shopt -p nullglob)
>  	shopt -s nullglob
> -	local user_configs=( "${BROOT}"/etc/kernel/config.d/*.config )
> +	local user_configs=( "${ESYSROOT}"/etc/kernel/config.d/*.config )
>  	shopt -u nullglob
>  
>  	local merge_configs=( "${@}" )

Ack!

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 858 bytes --]