diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2009-06-03 21:22:44 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2009-06-03 21:22:44 +0000 |
| commit | f9cd729dcc43f08544af5e6260e51aa200772390 (patch) | |
| tree | b95e3a0d3219b4c0c071ca4c122c9b9252607512 | |
| parent | 6c8851b88386c51f0e599968274d45dc885da920 (diff) | |
better logging related to chroots and attempt to separate log files
svn path=/trunk/; revision=11663
| -rwxr-xr-x | scripts/auto-build/run-automated-builder | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/auto-build/run-automated-builder b/scripts/auto-build/run-automated-builder index e6499bf7..e53122b2 100755 --- a/scripts/auto-build/run-automated-builder +++ b/scripts/auto-build/run-automated-builder @@ -39,12 +39,18 @@ run_build_script () BUILDSCRIPT="${HOME}/auto-build/${distro}/scripts/auto-build/${distro}-auto-builder.sh" ## LATER: make the uploaded ${LOGFILE} (name) be consistent with the uploaded package-file (name) - LOGFILE="${HOME}/logs/${DATE}_${TIME}_${SYSTEM}_${HOSTNAME}_${distro}_${SCRIPT}.txt" + LOGFILE="${HOME}/logs/${DATE}_${TIME}_${SYSTEM}_${HOSTNAME}_${distro}.txt" touch "${LOGFILE}" if [ -d /var/chroot/$chroot ]; then + echo "----------------------------------------" >> "$LOGFILE" 2>&1 + echo "Building in dchroot $chroot" >> "$LOGFILE" 2>&1 + echo "----------------------------------------" >> "$LOGFILE" 2>&1 dchroot -c $chroot -d "$BUILDSCRIPT" >> "$LOGFILE" 2>&1 else + echo "----------------------------------------" >> "$LOGFILE" 2>&1 + echo "Building on native system" >> "$LOGFILE" 2>&1 + echo "----------------------------------------" >> "$LOGFILE" 2>&1 sh "$BUILDSCRIPT" >> "$LOGFILE" 2>&1 fi @@ -75,7 +81,7 @@ for distrodir in ${HOME}/auto-build/*; do if [ -e /var/chroot ]; then for chrootdir in /var/chroot/*; do chroot=$(echo $chrootdir | sed 's|.*/\(.*\)|\1|') - HOSTNAME=`cat /etc/hostname` + HOSTNAME=`cat /var/chroot/$chroot/etc/hostname` run_build_script $distro $chroot done fi |