commit: 7247751e4c5ad19786c40a7ed1c87ad0b836026e
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Aug 23 00:39:03 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 20:02:41 2023 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7247751e
Compile external modules with dist-kernel
If boot/kernel/${kernel}/packages is defined, force build external module
packages for dist-kernels.
Also don't unmerge kernel after merging as it may needed for building process,
just deselect. Later it will be unmerged by depclean process.
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
targets/support/kmerge.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index c5beddc9..7114ff91 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -152,6 +152,11 @@ if [[ -n ${clst_KERNCACHE} ]]; then
fi
if [[ ${distkernel} = "yes" ]] ; then
+ # Build external kernel modules
+ if [[ -n ${kernel_merge} ]]; then
+ run_merge ${kernel_merge}
+ fi
+
# Kernel already built, let's run dracut to make initramfs
distkernel_source_path=$(equery -Cq f ${ksource} | grep "/usr/src/linux-"
-m1)
distkernel_image_path=$(distkmerge_get_image_path)
@@ -201,6 +206,6 @@ if [[ -n ${clst_KERNCACHE} && ! ${cached_kernel_found} ]];
then
fi
if [[ ! ${cached_kernel_found} ]]; then
- run_merge -C "${ksource}"
+ run_merge --deselect "${ksource}"
rm /usr/src/linux
fi
