From 3cc96ad99e400b963e7a0104fd1db26e23a6d5b9 Mon Sep 17 00:00:00 2001 From: Kenny Strawn Date: Sat, 31 Jul 2021 13:06:31 -0700 Subject: [PATCH] Allow use of -dist kernels in .spec files --- targets/support/kmerge.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 20b471f1..3d28bd8a 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -129,7 +129,11 @@ if [[ -n ${clst_kextraversion} ]]; then /usr/src/linux/Makefile fi -genkernel_compile +if [[ "$clst_boot_kernel_${kname}_sources" == *"gentoo-kernel"* || "$clst_boot_kernel_${kname}_sources" == *"vanilla-kernel"* ]]; then + echo "Spec file points to -dist kernel package instead of sources; skipping kernel build" +else + genkernel_compile +fi # Write out CONFIG, USE, VERSION, and EXTRAVERSION files if [[ -n ${clst_KERNCACHE} && ! ${cached_kernel_found} ]]; then -- 2.32.0