[gentoo-catalyst] [PATCH] Compile external modules with dist-kernel

[gentoo-catalyst] [PATCH] Compile external modules with dist-kernel

[Azamat H. Hackimov]

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.
---
 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
-- 
2.41.0

Re: [gentoo-catalyst] [PATCH] Compile external modules with dist-kernel

[Andreas K. Huettel]

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

Thanks, pushed! -a

Am Mittwoch, 23. August 2023, 02:39:03 CEST schrieb Azamat H. Hackimov:
> 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.
> ---
>  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
> 


-- 
Andreas K. Hüttel
dilfridge@gentoo.org
Gentoo Linux developer
(council, toolchain, base-system, perl, libreoffice)

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