• [gentoo-dev] [PATCH] kernel-build.eclass: adjust missing .config error

    From Andrew Ammerlaan@21:1/5 to All on Fri Aug 30 21:10:02 2024
    kernel-build_merge_configs should always be called first nowadays
    because it applies the savedconfig.

    Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
    Closes: https://github.com/gentoo/gentoo/pull/38345
    Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
    ---
    eclass/kernel-build.eclass | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
    index be02920162f4..d92076d61c04 100644
    --- a/eclass/kernel-build.eclass
    +++ b/eclass/kernel-build.eclass
    @@ -243,7 +243,7 @@ kernel-build_src_configure() {
    MAKEARGS+=( KBZIP2="lbzip2" )
    fi

    - [[ -f .config ]] || die "Ebuild error: please copy default config into .config"
    + [[ -f .config ]] || die "Ebuild error: No .config, kernel-build_merge_configs was not called."

    if [[ -z "${KV_LOCALVERSION}" ]]; then
    KV_LOCALVERSION=$(sed -n -e 's#^CONFIG_LOCALVERSION="\(.*\)"$#\1#p' \
    @@ -602,10 +602,13 @@ kernel-build_pkg_postinst() {
    # 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.
    +#
    +# This function must be called by the ebuild in the src_prepare phase.
    kernel-build_merge_confi