diff options
| author |   Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2023-08-23 03:39:03 +0300 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2023-09-03 22:02:41 +0200 |
| commit | 7247751e4c5ad19786c40a7ed1c87ad0b836026e (patch) | |
| tree | 29be5c7dd36e19c51a7ddc45898e25403a26554d | |
| parent | Implementing distkernel installation (diff) | |
| download | catalyst-7247751e4c5ad19786c40a7ed1c87ad0b836026e.tar.gz catalyst-7247751e4c5ad19786c40a7ed1c87ad0b836026e.tar.bz2 catalyst-7247751e4c5ad19786c40a7ed1c87ad0b836026e.zip | |
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@gentoo.org>
| -rwxr-xr-x | targets/support/kmerge.sh | 7 |
1 files changed, 6 insertions, 1 deletions
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 |