Changeset 3a321ea for common


Ignore:
Timestamp:
04/24/2006 04:36:08 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
4a4e260
Parents:
0bdf6ed
Message:

Changed how build time and disk usage is dumped to the logs.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • common/common-functions

    r0bdf6ed r3a321ea  
    193193
    194194#----------------------------------#
    195 wrt_target() {                     #
     195wrt_target() {                     # Create target and initialize log file
    196196#----------------------------------#
    197197  local i=$1
    … …  
    202202$i:  $PREV
    203203        @\$(call echo_message, Building)
    204         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs/* \$(MOUNT_PT)\`\n" >logs/$this_script
     204        @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$this_script
    205205EOF
    206206) >> $MKFILE.tmp
    … …  
    266266
    267267#----------------------------------#
    268 wrt_run_as_su() {                  # header to log file, execute script, footer to log file
     268wrt_run_as_su() {                  # Execute script inside time { }, footer to log file
    269269#----------------------------------#
    270270  local this_script=$1
    … …  
    272272(
    273273cat << EOF
    274         @su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 && \\
    275         echo -e "\nKB: \`du -skx --exclude=jhalfs/* \$(MOUNT_PT)\`\n" >>logs/$this_script
    276 EOF
    277 ) >> $MKFILE.tmp
    278 }
    279 
    280 
    281 #----------------------------------#
    282 wrt_run_as_root() {                #
     274        @( time { su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
     275        echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
     276EOF
     277) >> $MKFILE.tmp
     278}
     279
     280
     281#----------------------------------#
     282wrt_run_as_root() {                # Some scripts must be run as root..
    283283#----------------------------------#
    284284  local this_script=$1
    … …  
    286286(
    287287cat << EOF
    288         @export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 && \\
    289         echo -e "\nKB: \`du -skx --exclude=jhalfs/* \$(MOUNT_PT)\`\n" >>logs/$this_script
     288        @( time { export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
     289        echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
    290290EOF
    291291) >> $MKFILE.tmp
    … …  
    294294
    295295#=============================#
    296 wrt_run_as_root2() {          # Some scripts must be run as root..
     296wrt_run_as_root2() {          #
    297297#=============================#
    298298  local this_script=$1
    … …  
    300300(
    301301cat << EOF
    302         @source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 && \\
    303         echo -e "\nKB: \`du -skx --exclude=jhalfs/* \`\n" >>logs/$this_script
     302        @( time { source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
     303        echo -e "\nKB: \`du -skx --exclude=jhalfs \`\n" >>logs/$this_script
    304304EOF
    305305) >> $MKFILE.tmp
    … …  
    315315(
    316316    cat << EOF
    317         @\$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' && \\
    318         echo -e "\nKB: \`du -skx --exclude=jhalfs/* \$(MOUNT_PT)\`\n" >>logs/${this_script}
     317        @( time { \$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
     318        echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
    319319EOF
    320320) >> $MKFILE.tmp
    … …  
    329329(
    330330cat << EOF
    331         @\$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' && \\
    332         echo -e "\nKB: \`du -skx --exclude=jhalfs/* \$(MOUNT_PT)\`\n" >>logs/${this_script}
     331        @( time { \$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
     332        echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
    333333EOF
    334334) >> $MKFILE.tmp
    … …  
    342342(
    343343    cat << EOF
    344         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$i && \\
    345         cp -v $FSTAB \$(MOUNT_PT)/etc/fstab >>logs/$i 2>&1 && \\
    346         echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$i
    347 EOF
    348 ) >> $MKFILE.tmp
    349 }
    350 
    351 #----------------------------------#
    352 wrt_copy_fstab2() {                 #
     344        @cp -v $FSTAB \$(MOUNT_PT)/etc/fstab >>logs/$i 2>&1
     345EOF
     346) >> $MKFILE.tmp
     347}
     348
     349#----------------------------------#
     350wrt_copy_fstab2() {                #
    353351#----------------------------------#
    354352  local i=$1
    355353(
    356354    cat << EOF
    357         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \`\n" >logs/$i && \\
    358         cp -v /sources/fstab /etc/fstab >>logs/$i 2>&1 && \\
    359         echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \`\n" >>logs/$i
     355        @cp -v /sources/fstab /etc/fstab >>logs/$i 2>&1
    360356EOF
    361357) >> $MKFILE.tmp
Note: See TracChangeset for help on using the changeset viewer.