From 5b7f6475da27c05b30659a00ecb49636aca2bece Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 31 Aug 2024 12:01:05 +0100 Subject: gentoo auto-resync : 31:08:2024 - 12:01:05 --- eclass/kernel-build.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'eclass/kernel-build.eclass') diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index be02920162f4..10fd0cca2cc5 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -47,6 +47,7 @@ BDEPEND=" ${PYTHON_DEPS} app-alternatives/cpio app-alternatives/bc + dev-lang/perl sys-devel/bison sys-devel/flex virtual/libelf @@ -243,7 +244,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 +603,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_configs() { debug-print-function ${FUNCNAME} "${@}" - [[ -f .config ]] || die "${FUNCNAME}: .config does not exist" + [[ -f .config ]] || + die "${FUNCNAME}: No .config, please copy default config into .config" has .config "${@}" && die "${FUNCNAME}: do not specify .config as parameter" -- cgit v1.2.3