From e267231ea94da8c93f75305abfafaf3efe8f6f9f Mon Sep 17 00:00:00 2001 From: "Kenneth G. Strawn" Date: Sun, 25 Apr 2021 18:26:52 -0700 Subject: [PATCH] Detect whether or not a -dist kernel has already been built before attempting to compile --- targets/support/kmerge.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index fb67aba6..621a9a24 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -60,10 +60,18 @@ genkernel_compile() { fi if [[ -n ${kernel_merge} ]]; then - genkernel --callback="emerge ${gk_callback_opts[@]} ${kernel_merge}" \ + if [[ -n "$(ls /lib/modules)" && "$(ls /lib/modules)" == "*-dist" ]]; then + elog "Kernel already compiled as either sys-kernel/gentoo-kernel or sys-kernel/vanilla-kernel; skipping" + else + genkernel --callback="emerge ${gk_callback_opts[@]} ${kernel_merge}" \ "${GK_ARGS[@]}" || exit 1 + fi else - genkernel "${GK_ARGS[@]}" || exit 1 + if [[ -n "$(ls /lib/modules)" && "$(ls /lib/modules)" == "*-dist" ]]; then + elog "Kernel already compiled as either sys-kernel/gentoo-kernel or sys-kernel/vanilla-kernel; skipping" + else + genkernel "${GK_ARGS[@]}" || exit 1 + fi fi } -- 2.31.1