svn commit: r293391 - stable/10

[Gleb Smirnoff]

Author: glebius
Date: Thu Jan  7 23:10:44 2016
New Revision: 293391
URL: https://svnweb.freebsd.org/changeset/base/293391

Log:
  Merge r293282 from head:
   Provide knob NO_INSTALLEXTRAKERNELS. If defined, extra kernels in KERNCONF
   won't be installed, only the first one would.
  
  Turn NO_INSTALLEXTRAKERNELS=yes on stable/10 to preserve original
  behaviour of not installing additional kernels built.
  
  Reported & tested by:	Trond Endrestøl <Trond.Endrestol fagskolen.gjovik.no>
  Reported & tested by:	dhw

Modified:
  stable/10/Makefile.inc1

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Thu Jan  7 23:02:15 2016	(r293390)
+++ stable/10/Makefile.inc1	Thu Jan  7 23:10:44 2016	(r293391)
@@ -1012,6 +1012,7 @@ KERNCONFDIR?=	${KRNLCONFDIR}
 
 BUILDKERNELS=
 INSTALLKERNEL=
+NO_INSTALLEXTRAKERNELS=yes
 .if defined(NO_INSTALLKERNEL)
 # All of the BUILDKERNELS loops start at index 1.
 BUILDKERNELS+= dummy
@@ -1109,7 +1110,7 @@ reinstallkernel reinstallkernel.debug: _
 	    ${CROSSENV} PATH=${TMPPATH} \
 	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
 .endif
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing kernel ${_kernel}"
@@ -1140,7 +1141,7 @@ distributekernel distributekernel.debug:
 	    ${DESTDIR}/${DISTDIR}/kernel.meta
 .endif
 .endif
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
@@ -1166,7 +1167,7 @@ packagekernel:
 	    tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
 .endif
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
@@ -1179,7 +1180,7 @@ packagekernel:
 	    tar cvf - . | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
 .endif
-.if ${BUILDKERNELS:[#]} > 1
+.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - . | \