diff options
| author | glebius <glebius@FreeBSD.org> | 2016-05-04 17:27:49 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2016-05-04 17:27:49 +0000 |
| commit | efe552cfd5200a06d149077c06df1b4d226b8930 (patch) | |
| tree | 4ff96a44d842413ba602fdfb357457a6c249a368 /Makefile.inc1 | |
| parent | ecc2c61c9002a9159aba3f4c8215b793d08b91a4 (diff) | |
| download | FreeBSD-src-efe552cfd5200a06d149077c06df1b4d226b8930.zip FreeBSD-src-efe552cfd5200a06d149077c06df1b4d226b8930.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 78a149e..e98a90e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1110,7 +1110,7 @@ reinstallkernel reinstallkernel.debug: _installcheck_kernel ${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 - . | \ |
