Merged r2630 and r2631 from trunk.
This commit is contained in:
parent
17c7894389
commit
b4145493b0
3 changed files with 7 additions and 4 deletions
|
@ -203,12 +203,16 @@ wrt_target() { # Create target and initialize log file
|
|||
#----------------------------------#
|
||||
local i=$1
|
||||
local PREV=$2
|
||||
case $i in
|
||||
iteration* ) local LOGFILE=$this_script.log ;;
|
||||
* ) local LOGFILE=$this_script ;;
|
||||
esac
|
||||
(
|
||||
cat << EOF
|
||||
|
||||
$i: $PREV
|
||||
@\$(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
|
||||
) >> $MKFILE.tmp
|
||||
}
|
||||
|
|
|
@ -25,8 +25,8 @@ GETPKG=0
|
|||
# if the user has the right priviledges.
|
||||
SRC_ARCHIVE=$SRC_ARCHIVE
|
||||
|
||||
# --- Server used as fallback if the file isn't found in
|
||||
# SRC_ARCHIVE and/or can't be dowloaded from upstream
|
||||
# --- Server used if the file isn't found in SRC_ARCHIVE.
|
||||
# As a last resort, the file will dowloaded from upstream, if possible.
|
||||
SERVER=ftp://ftp.lfs-matrix.net
|
||||
|
||||
#=== Build options ===
|
||||
|
|
|
@ -108,7 +108,6 @@ wrt_logs() { #
|
|||
(
|
||||
cat << EOF
|
||||
@pushd logs 1> /dev/null && \\
|
||||
rm $ITERATION && \\
|
||||
mkdir $ITERATION && \\
|
||||
mv ${LOGS} $ITERATION && \\
|
||||
popd 1> /dev/null
|
||||
|
|
Reference in a new issue