View | Details | Raw Unified | Return to bug 173308
Collapse All | Expand All

(-)head/Makefile (-7 / +10 lines)
Lines 346-351 Link Here
346
.endif
346
.endif
347
KERNSRCDIR?=		${.CURDIR}/sys
347
KERNSRCDIR?=		${.CURDIR}/sys
348
348
349
# Directory for writing logs etc
350
LOGDIR?=${.CURDIR}
351
349
targets:
352
targets:
350
	@echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets"
353
	@echo "Supported TARGET/TARGET_ARCH pairs for world and kernel targets"
351
.for target in ${TARGETS}
354
.for target in ${TARGETS}
Lines 355-361 Link Here
355
.endfor
358
.endfor
356
359
357
.if defined(DOING_TINDERBOX)
360
.if defined(DOING_TINDERBOX)
358
FAILFILE=${.CURDIR}/_.tinderbox.failed
361
FAILFILE=${LOGDIR}/_.tinderbox.failed
359
MAKEFAIL=tee -a ${FAILFILE}
362
MAKEFAIL=tee -a ${FAILFILE}
360
.else
363
.else
361
MAKEFAIL=cat
364
MAKEFAIL=cat
Lines 384-392 Link Here
384
	    ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
387
	    ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
385
	    TARGET=${target} \
388
	    TARGET=${target} \
386
	    TARGET_ARCH=${target_arch} \
389
	    TARGET_ARCH=${target_arch} \
387
	    > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \
390
	    > ${LOGDIR}/_.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \
388
	    (echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \
391
	    (echo "${target}.${target_arch} ${UNIVERSE_TARGET} failed," \
389
	    "check _.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \
392
	    "check ${LOGDIR}/_.${target}.${target_arch}.${UNIVERSE_TARGET} for details" | \
390
	    ${MAKEFAIL}))
393
	    ${MAKEFAIL}))
391
	@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`"
394
	@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} completed on `LC_ALL=C date`"
392
.endfor
395
.endfor
Lines 394-402 Link Here
394
.if !defined(MAKE_JUST_WORLDS)
397
.if !defined(MAKE_JUST_WORLDS)
395
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
398
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
396
	@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
399
	@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
397
	    ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
400
	    ${MAKE} LINT > ${LOGDIR}/_.${target}.makeLINT 2>&1 || \
398
	    (echo "${target} 'make LINT' failed," \
401
	    (echo "${target} 'make LINT' failed," \
399
	    "check _.${target}.makeLINT for details"| ${MAKEFAIL}))
402
	    "check ${LOGDIR}/_.${target}.makeLINT for details"| ${MAKEFAIL}))
400
.endif
403
.endif
401
	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
404
	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
402
	    universe_kernels
405
	    universe_kernels
Lines 425-433 Link Here
425
	    TARGET=${TARGET} \
428
	    TARGET=${TARGET} \
426
	    TARGET_ARCH=${TARGET_ARCH_${kernel}} \
429
	    TARGET_ARCH=${TARGET_ARCH_${kernel}} \
427
	    KERNCONF=${kernel} \
430
	    KERNCONF=${kernel} \
428
	    > _.${TARGET}.${kernel} 2>&1 || \
431
	    > ${LOGDIR}/_.${TARGET}.${kernel} 2>&1 || \
429
	    (echo "${TARGET} ${kernel} kernel failed," \
432
	    (echo "${TARGET} ${kernel} kernel failed," \
430
	    "check _.${TARGET}.${kernel} for details"| ${MAKEFAIL}))
433
	    "check ${LOGDIR}/_.${TARGET}.${kernel} for details"| ${MAKEFAIL}))
431
.endfor
434
.endfor
432
universe: universe_epilogue
435
universe: universe_epilogue
433
universe_epilogue:
436
universe_epilogue:

Return to bug 173308