Changeset 5359c48 for common


Ignore:
Timestamp:
04/24/2006 04:41:29 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
4edbc92
Parents:
944d69d
Message:

Merged r2570 and r2571 from trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • common/common-functions

    r944d69d r5359c48  
    202202
    203203#----------------------------------#
    204 wrt_target() {                     #
     204wrt_target() {                     # Create target and initialize log file
    205205#----------------------------------#
    206206  local i=$1
    … …  
    211211$i:  $PREV
    212212        @\$(call echo_message, Building)
     213        @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >logs/$this_script
    213214EOF
    214215) >> $MKFILE.tmp
    … …  
    274275
    275276#----------------------------------#
    276 wrt_run_as_su() {                  # header to log file, execute script, footer to log file
     277wrt_run_as_su() {                  # Execute script inside time { }, footer to log file
    277278#----------------------------------#
    278279  local this_script=$1
    … …  
    280281(
    281282cat << EOF
    282         @echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$this_script && \\
    283         su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 && \\
    284         echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$this_script
    285 EOF
    286 ) >> $MKFILE.tmp
    287 }
    288 
    289 
    290 #----------------------------------#
    291 wrt_run_as_root() {                #
     283        @( time { su - lfs -c "source /home/lfs/.bashrc && $JHALFSDIR/${PROGNAME}-commands/$file" >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
     284        echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
     285EOF
     286) >> $MKFILE.tmp
     287}
     288
     289
     290#----------------------------------#
     291wrt_run_as_root() {                # Some scripts must be run as root..
    292292#----------------------------------#
    293293  local this_script=$1
    … …  
    295295(
    296296cat << EOF
    297         @echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$this_script && \\
    298         export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 && \\
    299         echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$this_script
     297        @( time { export LFS=\$(MOUNT_PT) && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
     298        echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/$this_script
    300299EOF
    301300) >> $MKFILE.tmp
    … …  
    304303
    305304#=============================#
    306 wrt_run_as_root2() {          # Some scripts must be run as root..
     305wrt_run_as_root2() {          #
    307306#=============================#
    308307  local this_script=$1
    … …  
    310309(
    311310cat << EOF
    312         @echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \`\n" >logs/$this_script && \\
    313         source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 && \\
    314         echo -e "\n\`date\`\n\nKB: \`du -sk --exclude={0,1}??-* \`\n" >>logs/$this_script
     311        @( time { source envars && ${PROGNAME}-commands/$file >>logs/$this_script 2>&1 ; } ) 2>>logs/$this_script && \\
     312        echo -e "\nKB: \`du -skx --exclude=jhalfs \`\n" >>logs/$this_script
     313EOF
     314) >> $MKFILE.tmp
     315}
     316
     317
     318
     319#----------------------------------#
     320wrt_run_as_chroot1() {             #
     321#----------------------------------#
     322  local this_script=$1
     323  local file=$2
     324(
     325    cat << EOF
     326        @( time { \$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
     327        echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
     328EOF
     329) >> $MKFILE.tmp
     330}
     331
     332
     333#----------------------------------#
     334wrt_run_as_chroot2() {             #
     335#----------------------------------#
     336  local this_script=$1
     337  local file=$2
     338(
     339cat << EOF
     340        @( time { \$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' ; } ) 2>>logs/$this_script && \\
     341        echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" >>logs/${this_script}
     342EOF
     343) >> $MKFILE.tmp
     344}
     345
     346
     347#----------------------------------#
     348wrt_copy_fstab() {                 #
     349#----------------------------------#
     350  local i=$1
     351(
     352    cat << EOF
     353        @cp -v $FSTAB \$(MOUNT_PT)/etc/fstab >>logs/$i 2>&1
     354EOF
     355) >> $MKFILE.tmp
     356}
     357
     358#----------------------------------#
     359wrt_copy_fstab2() {                #
     360#----------------------------------#
     361  local i=$1
     362(
     363    cat << EOF
     364        @cp -v /sources/fstab /etc/fstab >>logs/$i 2>&1
    315365EOF
    316366) >> $MKFILE.tmp
    … …  
    345395                rm -r \$(SRC)/$name-build; \\
    346396        fi;
    347 EOF
    348 ) >> $MKFILE.tmp
    349 }
    350 
    351 
    352 
    353 #----------------------------------#
    354 wrt_run_as_chroot1() {             #
    355 #----------------------------------#
    356   local this_script=$1
    357   local file=$2
    358 (
    359     cat << EOF
    360         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/${this_script} && \\
    361         \$(CHROOT1) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' && \\
    362         echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/${this_script}
    363 EOF
    364 ) >> $MKFILE.tmp
    365 }
    366 
    367 
    368 #----------------------------------#
    369 wrt_run_as_chroot2() {             #
    370 #----------------------------------#
    371   local this_script=$1
    372   local file=$2
    373 (
    374 cat << EOF
    375         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/${this_script} && \\
    376         \$(CHROOT2) 'cd /jhalfs && source envars && /jhalfs/${PROGNAME}-commands/$file >>/jhalfs/logs/${this_script} 2>&1' && \\
    377         echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/${this_script}
    378 EOF
    379 ) >> $MKFILE.tmp
    380 }
    381 
    382 
    383 #----------------------------------#
    384 wrt_copy_fstab() {                 #
    385 #----------------------------------#
    386   local i=$1
    387 (
    388     cat << EOF
    389         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >logs/$i && \\
    390         cp -v $FSTAB \$(MOUNT_PT)/etc/fstab >>logs/$i 2>&1 && \\
    391         echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \$(MOUNT_PT)\`\n" >>logs/$i
    392 EOF
    393 ) >> $MKFILE.tmp
    394 }
    395 
    396 #----------------------------------#
    397 wrt_copy_fstab2() {                 #
    398 #----------------------------------#
    399   local i=$1
    400 (
    401     cat << EOF
    402         @echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \`\n" >logs/$i && \\
    403         cp -v /sources/fstab /etc/fstab >>logs/$i 2>&1 && \\
    404         echo -e "\n\`date\`\n\nKB: \`du -skx --exclude={0,1}??-* \`\n" >>logs/$i
    405 EOF
    406 ) >> $MKFILE.tmp
    407 }
    408 
    409 
    410 #----------------------------------#
    411 wrt_export_pkgdir() {              #
    412 #----------------------------------#
    413 (
    414     cat << EOF
    415         @echo "export PKGDIR=\$(SRC)/binutils-build" > envars
    416397EOF
    417398) >> $MKFILE.tmp
Note: See TracChangeset for help on using the changeset viewer.