svn commit: r299079 - in stable/10: . release

[Gleb Smirnoff]

Author: glebius
Date: Wed May  4 17:27:49 2016
New Revision: 299079
URL: https://svnweb.freebsd.org/changeset/base/299079

Log:
  Merge r299077, which provides ability to override NO_INSTALLEXTRAKERNELS.
  
  Override NO_INSTALLEXTRAKERNELS for the release build. Historically, in
  the stable/10 branch the regular 'installkernel' target DID NOT install
  extra kernels, while the release build DID. This change finally restores
  POLA, I hope.
  
  Reported by:	Fedor <f att.org.ru>
  Reviewed by:	gjb

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

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Wed May  4 17:22:35 2016	(r299078)
+++ stable/10/Makefile.inc1	Wed May  4 17:27:49 2016	(r299079)
@@ -1110,7 +1110,7 @@ reinstallkernel reinstallkernel.debug: _
 	    ${CROSSENV} PATH=${TMPPATH} \
 	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
 .endif
-.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
+.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing kernel ${_kernel}"
@@ -1141,7 +1141,7 @@ distributekernel distributekernel.debug:
 	    ${DESTDIR}/${DISTDIR}/kernel.meta
 .endif
 .endif
-.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
+.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
@@ -1167,7 +1167,7 @@ packagekernel:
 	    tar cvf - @${DESTDIR}/${DISTDIR}/kernel.meta | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
 .endif
-.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
+.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
@@ -1180,7 +1180,7 @@ packagekernel:
 	    tar cvf - . | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
 .endif
-.if ${BUILDKERNELS:[#]} > 1 && !defined(NO_INSTALLEXTRAKERNELS)
+.if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - . | \

Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile	Wed May  4 17:22:35 2016	(r299078)
+++ stable/10/release/Makefile	Wed May  4 17:27:49 2016	(r299079)
@@ -70,6 +70,8 @@ VOLUME_LABEL=	${REVISION:C/[.-]/_/g}_${B
 .endfor
 .endif
 
+NO_INSTALLEXTRAKERNELS=no
+
 .if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL)
 VOLUME_LABEL=	FreeBSD_Install
 .endif