Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 785754 | Differences between
and this patch

Collapse All | Expand All

(-)a/targets/support/kmerge.sh (-3 / +10 lines)
Lines 60-69 genkernel_compile() { Link Here
60
	fi
60
	fi
61
61
62
	if [[ -n ${kernel_merge} ]]; then
62
	if [[ -n ${kernel_merge} ]]; then
63
		genkernel --callback="emerge ${gk_callback_opts[@]} ${kernel_merge}" \
63
	    if [[ -n "$(ls /lib/modules)" && "$(ls /lib/modules)" == "*-dist" ]]; then
64
	        elog "Kernel already compiled as either sys-kernel/gentoo-kernel or sys-kernel/vanilla-kernel; skipping"
65
        else
66
            genkernel --callback="emerge ${gk_callback_opts[@]} ${kernel_merge}" \
64
			"${GK_ARGS[@]}" || exit 1
67
			"${GK_ARGS[@]}" || exit 1
68
        fi
65
	else
69
	else
66
		genkernel "${GK_ARGS[@]}" || exit 1
70
	    if [[ -n "$(ls /lib/modules)" && "$(ls /lib/modules)" == "*-dist" ]]; then
71
	        elog "Kernel already compiled as either sys-kernel/gentoo-kernel or sys-kernel/vanilla-kernel; skipping"
72
        else
73
            genkernel "${GK_ARGS[@]}" || exit 1
74
        fi
67
	fi
75
	fi
68
}
76
}
69
77
70
- 

Return to bug 785754