svn commit: r189985 - stable/7
Bjoern A. Zeeb
bz at FreeBSD.org
Wed Mar 18 13:22:24 PDT 2009
Author: bz
Date: Wed Mar 18 20:22:21 2009
New Revision: 189985
URL: http://svn.freebsd.org/changeset/base/189985
Log:
MFC r179232 by jb:
Add a knob to allow just the kernels to be built during a 'make universe'.
MFC r185250 by des:
Change the universe target to warn the user for every world or kernel that
fails. The error message includes a reference to the relevant log file.
Modified:
stable/7/Makefile (contents, props changed)
Modified: stable/7/Makefile
==============================================================================
--- stable/7/Makefile Wed Mar 18 20:18:23 2009 (r189984)
+++ stable/7/Makefile Wed Mar 18 20:22:21 2009 (r189985)
@@ -285,22 +285,30 @@ KERNCONFS:= ${KERNCONFS:S/^NOTES$/LINT/}
universe: universe_${target}
.ORDER: universe_prologue universe_${target} universe_epilogue
universe_${target}:
+.if !defined(MAKE_JUST_KERNELS)
@echo ">> ${target} started on `LC_ALL=C date`"
- -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \
+ @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+ ${MAKE} ${JFLAG} buildworld \
TARGET=${target} \
- __MAKE_CONF=/dev/null \
- > _.${target}.buildworld 2>&1
+ > _.${target}.buildworld 2>&1 || \
+ echo "${target} world failed," \
+ "check _.${target}.buildworld for details")
@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
+.endif
.if exists(${.CURDIR}/sys/${target}/conf/NOTES)
- -cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \
- > ${.CURDIR}/_.${target}.makeLINT 2>&1
+ @(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \
+ ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
+ echo "${target} 'make LINT' failed," \
+ "check _.${target}.makeLINT for details")
.endif
.for kernel in ${KERNCONFS}
- -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
+ @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+ ${MAKE} ${JFLAG} buildkernel \
TARGET=${target} \
KERNCONF=${kernel} \
- __MAKE_CONF=/dev/null \
- > _.${target}.${kernel} 2>&1
+ > _.${target}.${kernel} 2>&1 || \
+ echo "${target} ${kernel} kernel failed," \
+ "check _.${target}.${kernel} for details")
.endfor
@echo ">> ${target} completed on `LC_ALL=C date`"
.endfor
More information about the svn-src-stable
mailing list