Changeset 9199a13 for CLFS/master.sh


Ignore:
Timestamp:
06/10/2006 04:48:25 PM (18 years ago)
Author:
Manuel Canales Esparcia <manuel@…>
Branches:
experimental
Children:
966cb20
Parents:
e35e794
Message:

Merged r2754:2768 from trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    re35e794 r9199a13  
    2121023-creatingtoolsdir:
    2222        @\$(call echo_message, Building)
    23         @mkdir -v \$(MOUNT_PT)/tools && \\
    24         rm -fv /tools && \\
    25         ln -sv \$(MOUNT_PT)/tools /
     23        @mkdir \$(MOUNT_PT)/tools && \\
     24        rm -f /tools && \\
     25        ln -s \$(MOUNT_PT)/tools /
    2626        @if [ ! -d \$(MOUNT_PT)/sources ]; then \\
    2727                mkdir \$(MOUNT_PT)/sources; \\
    2828        fi;
    2929        @chmod a+wt \$(MOUNT_PT)/sources && \\
    30         touch \$@
     30        touch \$@ && \\
     31        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     32        echo --------------------------------------------------------------------------------\$(WHITE)
    3133
    3234024-creatingcrossdir: 023-creatingtoolsdir
    3335        @mkdir -v \$(MOUNT_PT)/cross-tools && \\
    34         rm -fv /cross-tools && \\
    35         ln -sv \$(MOUNT_PT)/cross-tools /
    36         @touch \$@
     36        rm -f /cross-tools && \\
     37        ln -s \$(MOUNT_PT)/cross-tools /
     38        @touch \$@ && \\
     39        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     40        echo --------------------------------------------------------------------------------\$(WHITE)
    3741
    3842025-addinguser:  024-creatingcrossdir
    … …  
    4852        chown lfs \$(MOUNT_PT)/cross-tools && \\
    4953        chown lfs \$(MOUNT_PT)/sources && \\
    50         touch \$@
     54        touch \$@ && \\
     55        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     56        echo --------------------------------------------------------------------------------\$(WHITE)
    5157
    5258026-settingenvironment:  025-addinguser
    5359        @\$(call echo_message, Building)
    5460        @if [ -f /home/lfs/.bashrc -a ! -f /home/lfs/.bashrc.XXX ]; then \\
    55                 mv -v /home/lfs/.bashrc /home/lfs/.bashrc.XXX; \\
     61                mv /home/lfs/.bashrc /home/lfs/.bashrc.XXX; \\
    5662        fi;
    5763        @if [ -f /home/lfs/.bash_profile  -a ! -f /home/lfs/.bash_profile.XXX ]; then \\
    58                 mv -v /home/lfs/.bash_profile /home/lfs/.bash_profile.XXX; \\
     64                mv /home/lfs/.bash_profile /home/lfs/.bash_profile.XXX; \\
    5965        fi;
    6066        @echo "set +h" > /home/lfs/.bashrc && \\
    … …  
    7480        @chown lfs:lfs /home/lfs/.bashrc && \\
    7581        touch envars && \\
    76         touch \$@
     82        touch \$@ && \\
     83        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     84        echo --------------------------------------------------------------------------------\$(WHITE)
    7785EOF
    7886) >> $MKFILE.tmp
    … …  
    139147    #
    140148    # Include a touch of the target name so make can check if it's already been made.
    141     echo -e '\t@touch $@' >> $MKFILE.tmp
     149    wrt_touch
    142150    #
    143151    #--------------------------------------------------------------------#
    … …  
    192200    #
    193201    # Include a touch of the target name so make can check if it's already been made.
    194     echo -e '\t@touch $@' >> $MKFILE.tmp
     202    wrt_touch
    195203    #
    196204    #--------------------------------------------------------------------#
    … …  
    276284    #
    277285    # Include a touch of the target name so make can check if it's already been made.
    278     echo -e '\t@touch $@' >> $MKFILE.tmp
     286    wrt_touch
    279287    #
    280288    #--------------------------------------------------------------------#
    … …  
    342350    #
    343351    # Include a touch of the target name so make can check if it's already been made.
    344     echo -e '\t@touch $@' >> $MKFILE.tmp
     352    wrt_touch
    345353    #
    346354    #--------------------------------------------------------------------#
    … …  
    396404    #
    397405    # Include a touch of the target name so make can check if it's already been made.
    398     echo -e '\t@touch $@' >> $MKFILE.tmp
     406    wrt_touch
    399407    #
    400408    #--------------------------------------------------------------------#
    … …  
    451459    #
    452460    # Include a touch of the target name so make can check if it's already been made.
    453     echo -e '\t@touch $@' >> $MKFILE.tmp
     461    wrt_touch
    454462    #
    455463    #--------------------------------------------------------------------#
    … …  
    561569    #
    562570    # Include a touch of the target name so make can check if it's already been made.
    563     echo -e '\t@touch $@' >> $MKFILE.tmp
     571    wrt_touch
    564572    #
    565573    #--------------------------------------------------------------------#
    … …  
    674682    #
    675683    # Include a touch of the target name so make can check if it's already been made.
    676     echo -e '\t@touch $@' >> $MKFILE.tmp
     684    wrt_touch
    677685    #
    678686    #--------------------------------------------------------------------#
    … …  
    736744    #
    737745    # Include a touch of the target name so make can check if it's already been made.
    738     echo -e '\t@touch $@' >> $MKFILE.tmp
     746    wrt_touch
    739747    #
    740748    #--------------------------------------------------------------------#
    … …  
    797805    #
    798806    # Include a touch of the target name so make can check if it's already been made.
    799     echo -e '\t@touch $@' >> $MKFILE.tmp
     807    wrt_touch
    800808    #
    801809    #--------------------------------------------------------------------#
    … …  
    871879    #
    872880    # Include a touch of the target name so make can check if it's already been made.
    873     echo -e '\t@touch $@' >> $MKFILE.tmp
     881    wrt_touch
    874882    #
    875883    #--------------------------------------------------------------------#
    … …  
    951959    #
    952960    # Include a touch of the target name so make can check if it's already been made.
    953     echo -e '\t@touch $@' >> $MKFILE.tmp
     961    wrt_touch
    954962    #
    955963    #--------------------------------------------------------------------#
    … …  
    10911099        @\$(call echo_message, Building)
    10921100        @if [ -f /home/lfs/.bashrc.XXX ]; then \\
    1093                 mv -fv /home/lfs/.bashrc.XXX /home/lfs/.bashrc; \\
     1101                mv -f /home/lfs/.bashrc.XXX /home/lfs/.bashrc; \\
    10941102        fi;
    10951103        @if [ -f /home/lfs/.bash_profile.XXX ]; then \\
    1096                 mv -v /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\
     1104                mv /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\
    10971105        fi;
    10981106        @chown lfs:lfs /home/lfs/.bash* && \\
    1099         touch \$@
     1107        touch \$@ && \\
     1108        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     1109        echo --------------------------------------------------------------------------------\$(WHITE)
    11001110
    11011111do-housekeeping:
    1102         -umount \$(MOUNT_PT)/dev/pts
    1103         -umount \$(MOUNT_PT)/dev/shm
    1104         -umount \$(MOUNT_PT)/dev
    1105         -umount \$(MOUNT_PT)/sys
    1106         -umount \$(MOUNT_PT)/proc
    1107         -if [ ! -f user-lfs-exist ]; then \\
     1112        @-umount \$(MOUNT_PT)/dev/pts
     1113        @-umount \$(MOUNT_PT)/dev/shm
     1114        @-umount \$(MOUNT_PT)/dev
     1115        @-umount \$(MOUNT_PT)/sys
     1116        @-umount \$(MOUNT_PT)/proc
     1117        @-if [ ! -f user-lfs-exist ]; then \\
    11081118                userdel lfs; \\
    11091119                rm -rf /home/lfs; \\
    … …  
    11771187        fi;
    11781188        @chown lfs:lfs /home/lfs/.bash* && \\
    1179         touch \$@
     1189        touch \$@ && \\
     1190        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
     1191        echo --------------------------------------------------------------------------------\$(WHITE)
    11801192
    11811193
Note: See TracChangeset for help on using the changeset viewer.