Changeset 6bb080e
- Timestamp:
- 12/04/2006 08:58:09 PM (18 years ago)
- Branches:
- 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 10c8b78
- Parents:
- ac35c8e
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
CLFS/master.sh
rac35c8e r6bb080e 448 448 #--------------------------------------# 449 449 # Set envars and scripts for iteration targets 450 LOGS="" # Start with an empty global LOGS envar451 450 if [[ -z "$1" ]] ; then 452 451 local N="" … … 511 510 basicsystem="$basicsystem ${this_script}${N}" 512 511 513 # Append each name of the script files to a list (this will become514 # the names of the logs to be moved for each iteration)515 LOGS="$LOGS ${this_script}"516 517 512 #--------------------------------------------------------------------# 518 513 # >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< # … … 529 524 case $name in 530 525 binutils | gcc | glibc ) 531 [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script} "526 [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}${N}" 532 527 ;; 533 528 * ) 534 [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script} "529 [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script}${N}" 535 530 ;; 536 531 esac -
HLFS/master.sh
rac35c8e r6bb080e 259 259 local this_script 260 260 # Set envars and scripts for iteration targets 261 LOGS="" # Start with an empty global LOGS envar262 261 if [[ -z "$1" ]] ; then 263 262 local N="" … … 319 318 chapter6="$chapter6 ${this_script}${N}" 320 319 321 # Append each name of the script files to a list (this will become322 # the names of the logs to be moved for each iteration)323 LOGS="$LOGS ${this_script}"324 325 320 326 321 #--------------------------------------------------------------------# … … 347 342 # butterfly-toolchain tests are enabled in 'process_tookchain' function 348 343 case $name in 349 glibc ) [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script} "344 glibc ) [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}${N}" 350 345 ;; 351 * ) [[ "$TEST" > "1" ]] && CHROOT_wrt_test_log "${this_script} "346 * ) [[ "$TEST" > "1" ]] && CHROOT_wrt_test_log "${this_script}${N}" 352 347 ;; 353 348 esac -
LFS/master.sh
rac35c8e r6bb080e 166 166 167 167 # Set envars and scripts for iteration targets 168 LOGS="" # Start with an empty global LOGS envar169 168 if [[ -z "$1" ]] ; then 170 169 local N="" … … 220 219 esac 221 220 222 # Append each name of the script files to a list (this will become223 # the names of the logs to be moved for each iteration)224 LOGS="$LOGS ${this_script}"225 226 221 #--------------------------------------------------------------------# 227 222 # >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< # … … 244 239 case $name in 245 240 binutils | gcc | glibc ) 246 [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script} "241 [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}${N}" 247 242 ;; 248 243 * ) 249 [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script} "244 [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && CHROOT_wrt_test_log "${this_script}${N}" 250 245 ;; 251 246 esac -
common/libs/func_compare.sh
rac35c8e r6bb080e 14 14 CHROOT_wrt_target "$ITERATION" "$PREV" 15 15 wrt_compare_work "$ITERATION" "$PREV_IT" 16 wrt_ logs "$N"16 wrt_touch 17 17 PREV_IT=$ITERATION 18 18 PREV=$ITERATION … … 68 68 ( 69 69 cat << EOF 70 @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION >>logs/ $ITERATION.log2>&1 && \\71 extras/do_ica_prep $DEST_ICA/$ITERATION >>logs/ $ITERATION.log2>&170 @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION >>logs/\$@ 2>&1 && \\ 71 extras/do_ica_prep $DEST_ICA/$ITERATION >>logs/\$@ 2>&1 72 72 EOF 73 73 ) >> $MKFILE.tmp … … 81 81 ( 82 82 cat << EOF 83 @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION >>logs/ $ITERATION.log2>&1 && \\84 extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/filelist-$ITERATION >>logs/ $ITERATION.log2>&183 @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION >>logs/\$@ 2>&1 && \\ 84 extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/filelist-$ITERATION >>logs/\$@ 2>&1 85 85 EOF 86 86 ) >> $MKFILE.tmp … … 94 94 wrt_do_ica_work() { # 95 95 #----------------------------------# 96 echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >>logs/ $ITERATION.log2>&1" >> $MKFILE.tmp96 echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >>logs/\$@ 2>&1" >> $MKFILE.tmp 97 97 } 98 98 … … 105 105 local ITEDIR=$3/$2 106 106 local ITEFILE=$3/filelist-$2 107 echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >>logs/ $ITERATION.log2>&1" >> $MKFILE.tmp107 echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >>logs/\$@ 2>&1" >> $MKFILE.tmp 108 108 } 109 110 #----------------------------------#111 wrt_logs() { #112 #----------------------------------#113 local ITERATION=iteration-$1114 115 (116 cat << EOF117 @pushd logs 1> /dev/null && \\118 mkdir $ITERATION && \\119 mv ${LOGS} $ITERATION && \\120 popd 1> /dev/null121 @touch \$@ && \\122 sleep .25 && \\123 echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\124 echo --------------------------------------------------------------------------------\$(WHITE)125 EOF126 ) >> $MKFILE.tmp127 } -
common/libs/func_wrt_Makefile
rac35c8e r6bb080e 115 115 local i=$1 116 116 local PREV=$2 117 case $i in118 iteration* ) local LOGFILE="${this_script}.log" ;;119 * ) local LOGFILE="\$@" ;;120 esac121 117 ( 122 118 cat << EOF … … 125 121 @\$(call echo_message, Building) 126 122 @./progress_bar.sh \$@ \$\$PPID & 127 @echo "\$(nl_)\`date\`\$(nl_)" >logs/ $LOGFILE128 @\$(PRT_DU_CR) >>logs/ $LOGFILE123 @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@ 124 @\$(PRT_DU_CR) >>logs/\$@ 129 125 EOF 130 126 ) >> $MKFILE.tmp … … 190 186 ( 191 187 cat << EOF 192 @echo "export TEST_LOG= $TESTLOGDIR/$TESTLOGFILE" >> envars && \\193 echo '\$(nl_)\`date\`\$(nl_)' > $TESTLOGDIR/$TESTLOGFILE188 @echo "export TEST_LOG=\$(TESTLOGDIR)/$TESTLOGFILE" >> envars && \\ 189 echo '\$(nl_)\`date\`\$(nl_)' >\$(TESTLOGDIR)/\$@ 194 190 EOF 195 191 ) >> $MKFILE.tmp … … 203 199 cat << EOF 204 200 @echo "export TEST_LOG=\$(crTESTLOGDIR)/$TESTLOGFILE" >> envars && \\ 205 echo "\$(nl_)\`date\`\$(nl_)" >test-logs/ $TESTLOGFILE201 echo "\$(nl_)\`date\`\$(nl_)" >test-logs/\$@ 206 202 EOF 207 203 ) >> $MKFILE.tmp
Note:
See TracChangeset
for help on using the changeset viewer.