Merged r2630 and r2631 from trunk.

This commit is contained in:
Manuel Canales Esparcia 2006-05-04 18:30:06 +00:00
parent 17c7894389
commit b4145493b0
3 changed files with 7 additions and 4 deletions

View file

@ -203,12 +203,16 @@ wrt_target() { # Create target and initialize log file
#----------------------------------# #----------------------------------#
local i=$1 local i=$1
local PREV=$2 local PREV=$2
case $i in
iteration* ) local LOGFILE=$this_script.log ;;
* ) local LOGFILE=$this_script ;;
esac
( (
cat << EOF cat << EOF
$i: $PREV $i: $PREV
@\$(call echo_message, Building) @\$(call echo_message, Building)
@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$this_script @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$LOGFILE
EOF EOF
) >> $MKFILE.tmp ) >> $MKFILE.tmp
} }

View file

@ -25,8 +25,8 @@ GETPKG=0
# if the user has the right priviledges. # if the user has the right priviledges.
SRC_ARCHIVE=$SRC_ARCHIVE SRC_ARCHIVE=$SRC_ARCHIVE
# --- Server used as fallback if the file isn't found in # --- Server used if the file isn't found in SRC_ARCHIVE.
# SRC_ARCHIVE and/or can't be dowloaded from upstream # As a last resort, the file will dowloaded from upstream, if possible.
SERVER=ftp://ftp.lfs-matrix.net SERVER=ftp://ftp.lfs-matrix.net
#=== Build options === #=== Build options ===

View file

@ -108,7 +108,6 @@ wrt_logs() { #
( (
cat << EOF cat << EOF
@pushd logs 1> /dev/null && \\ @pushd logs 1> /dev/null && \\
rm $ITERATION && \\
mkdir $ITERATION && \\ mkdir $ITERATION && \\
mv ${LOGS} $ITERATION && \\ mv ${LOGS} $ITERATION && \\
popd 1> /dev/null popd 1> /dev/null