From 7247751e4c5ad19786c40a7ed1c87ad0b836026e Mon Sep 17 00:00:00 2001 From: "Azamat H. Hackimov" Date: Wed, 23 Aug 2023 03:39:03 +0300 Subject: Compile external modules with dist-kernel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- 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 -- cgit v1.2.3-65-gdbad