From 0c059da3e18ef75ddf39968f2034472406bb0ad5 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Wed, 4 Oct 2017 03:39:54 +0000
Subject: [PATCH] When building multiple kernels using KERNCONF, non-existent
 KERNCONF files will produce an error and buildkernel will fail. Previously
 missing KERNCONF files silently failed giving no indication as to why, only
 to subsequently discover during installkernel that the desired kernel was
 never built in the first place.

This is a rework of r302865.

This is the correct patch.

Reviewed by:	ngie (previous version, r302865)
MFC after:	2 months
Differential Revision:	D7167
---
 Makefile.inc1 | 4 ++++
 UPDATING      | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 1c6582d9d76d..2f4d2fd9ddac 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1359,6 +1359,10 @@ BUILDKERNELS+=	${_kernel}
 .if empty(INSTALLKERNEL) && !defined(NO_INSTALLKERNEL)
 INSTALLKERNEL= ${_kernel}
 .endif
+.else
+.if make(buildkernel)
+.error Missing KERNCONF ${KERNCONFDIR}/${_kernel}
+.endif
 .endif
 .endfor
 
diff --git a/UPDATING b/UPDATING
index 69f9c7cbfd17..02384ebb6af3 100644
--- a/UPDATING
+++ b/UPDATING
@@ -51,6 +51,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
++20160714:
+	When building multiple kernels using KERNCONF, non-existent KERNCONF
+	files will produce an error and buildkernel will fail. Previously
+	missing KERNCONF files silently failed giving no indication as to
+	why, only to subsequently discover during installkernel that the
+	desired kernel was never built in the first place.
+
 20170912:
 	The default serial number format for CTL LUNs has changed.  This will
 	affect users who use /dev/diskid/* device nodes, or whose FibreChannel