From a2065d8a7dd6aa7fa947a06cbf07f019afece2b7 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sat, 7 May 2011 03:16:13 -0500 Subject: [PATCH] script/makeworld: indicate steps that will be built; also defer chroot-cmd error until after stdout is restored --- script/makeworld | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/script/makeworld b/script/makeworld index 3076f82..47fd140 100755 --- a/script/makeworld +++ b/script/makeworld @@ -173,6 +173,8 @@ fi meh "Making world for ${ARCH}/${CONF}" +meh "Targets: ${sequence}" + prepare meh "Seed: ${seed}" @@ -188,8 +190,10 @@ do meh "==> Step: ${step} -> ${build_log}" [ "${BUILD_VERBOSE}" ] || exec 3>&1 > /dev/null script "${build_log}" env -i ${env} chroot "${build}" sh -c \ - "cd /usr/src; time make ${MAKEOPTS} ${step} TARGET=${ARCH} KERNCONF=${CONF} DESTDIR=/mnt" || wtf "chroot-cmd ${step}" + "cd /usr/src; time make ${MAKEOPTS} ${step} TARGET=${ARCH} KERNCONF=${CONF} DESTDIR=/mnt" + res=$? [ "${BUILD_VERBOSE}" ] || exec 1>&3 + [ "${res}" -gt 0 ] && wtf "chroot-cmd ${step} failed; check log" done # Copy the config files into the target, to keep a record of the build options -- 2.42.0