Ignore:
Timestamp:
04/23/2006 10:43:05 AM (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:
3a321ea
Parents:
a167246
Message:

Changing how build time and disk usage is dumped to the logs. Fisrt set.
Removed an obsolete function.
Placed together wrt_run_as_* functions.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • common/common-functions

    ra167246 r0bdf6ed  
    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
    204205EOF
    205206) >> $MKFILE.tmp
    … …  
    271272(
    272273cat << EOF
    273         @echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$this_script && \\
    274         su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 && \\
    275         echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$this_script
     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
    276276EOF
    277277) >> $MKFILE.tmp
    … …  
    286286(
    287287cat << EOF
    288         @echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$this_script && \\
    289         export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 && \\
    290         echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$this_script
     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
    291290EOF
    292291) >> $MKFILE.tmp
    … …  
    301300(
    302301cat << EOF
    303         @echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \`\n" >logs/$this_script && \\
    304         source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 && \\
    305         echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \`\n" >>logs/$this_script
     302        @source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 && \\
     303        echo -e "\nKB: \`du -skx --exclude=jhalfs/* \`\n" >>logs/$this_script
     304EOF
     305) >> $MKFILE.tmp
     306}
     307
     308
     309
     310#----------------------------------#
     311wrt_run_as_chroot1() {             #
     312#----------------------------------#
     313  local this_script=$1
     314  local file=$2
     315(
     316    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}
     319EOF
     320) >> $MKFILE.tmp
     321}
     322
     323
     324#----------------------------------#
     325wrt_run_as_chroot2() {             #
     326#----------------------------------#
     327  local this_script=$1
     328  local file=$2
     329(
     330cat << 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}
     333EOF
     334) >> $MKFILE.tmp
     335}
     336
     337
     338#----------------------------------#
     339wrt_copy_fstab() {                 #
     340#----------------------------------#
     341  local i=$1
     342(
     343    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
     347EOF
     348) >> $MKFILE.tmp
     349}
     350
     351#----------------------------------#
     352wrt_copy_fstab2() {                 #
     353#----------------------------------#
     354  local i=$1
     355(
     356    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
    306360EOF
    307361) >> $MKFILE.tmp
    … …  
    336390                rm -r \$(SRC)/$name-build; \\
    337391        fi;
    338 EOF
    339 ) >> $MKFILE.tmp
    340 }
    341 
    342 
    343 
    344 #----------------------------------#
    345 wrt_run_as_chroot1() {             #
    346 #----------------------------------#
    347   local this_script=$1
    348   local file=$2
    349 (
    350     cat << EOF
    351         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/${this_script} && \\
    352         \$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' && \\
    353         echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/${this_script}
    354 EOF
    355 ) >> $MKFILE.tmp
    356 }
    357 
    358 
    359 #----------------------------------#
    360 wrt_run_as_chroot2() {             #
    361 #----------------------------------#
    362   local this_script=$1
    363   local file=$2
    364 (
    365 cat << EOF
    366         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/${this_script} && \\
    367         \$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' && \\
    368         echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/${this_script}
    369 EOF
    370 ) >> $MKFILE.tmp
    371 }
    372 
    373 
    374 #----------------------------------#
    375 wrt_copy_fstab() {                 #
    376 #----------------------------------#
    377   local i=$1
    378 (
    379     cat << EOF
    380         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$i && \\
    381         cp -v $FSTAB \$(MOUNT_PT)/etc/fstab >>logs/$i 2>&1 && \\
    382         echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$i
    383 EOF
    384 ) >> $MKFILE.tmp
    385 }
    386 
    387 #----------------------------------#
    388 wrt_copy_fstab2() {                 #
    389 #----------------------------------#
    390   local i=$1
    391 (
    392     cat << EOF
    393         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \`\n" >logs/$i && \\
    394         cp -v /sources/fstab /etc/fstab >>logs/$i 2>&1 && \\
    395         echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \`\n" >>logs/$i
    396 EOF
    397 ) >> $MKFILE.tmp
    398 }
    399 
    400 
    401 #----------------------------------#
    402 wrt_export_pkgdir() {              #
    403 #----------------------------------#
    404 (
    405     cat << EOF
    406         @echo "export PKGDIR=\$(SRC)/binutils-build" > envars
    407392EOF
    408393) >> $MKFILE.tmp
Note: See TracChangeset for help on using the changeset viewer.