svn commit: r326833 - in stable: 10 11

[Cy Schubert]

Author: cy
Date: Wed Dec 13 20:15:23 2017
New Revision: 326833
URL: https://svnweb.freebsd.org/changeset/base/326833

Log:
  MFC r324248:
  
  hen 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)
  Differential Revision:	https://reviews.freebsd.org/D7167

Modified:
  stable/10/Makefile.inc1
  stable/10/UPDATING
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/Makefile.inc1
  stable/11/UPDATING
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Wed Dec 13 19:36:29 2017	(r326832)
+++ stable/10/Makefile.inc1	Wed Dec 13 20:15:23 2017	(r326833)
@@ -1030,6 +1030,10 @@ BUILDKERNELS+=	${_kernel}
 .if empty(INSTALLKERNEL) && !defined(NO_INSTALLKERNEL)
 INSTALLKERNEL= ${_kernel}
 .endif
+.else
+.if make(buildkernel)
+.error Missing KERNCONF ${KERNCONFDIR}/${_kernel}
+.endif
 .endif
 .endfor
 

Modified: stable/10/UPDATING
==============================================================================
--- stable/10/UPDATING	Wed Dec 13 19:36:29 2017	(r326832)
+++ stable/10/UPDATING	Wed Dec 13 20:15:23 2017	(r326833)
@@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20171003:
+	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.
+
 20170824:
 	Since the switch to GPT disk labels, fsck for UFS/FFS has been
 	unable to automatically find alternate superblocks. As of r322860,