Changeset 17cde98 for CLFS/master.sh


Ignore:
Timestamp:
09/15/2006 12:50:51 AM (18 years ago)
Author:
George Boudreau <georgeb@…>
Branches:
experimental
Children:
4da8c36
Parents:
ae08ff1
Message:

consolidate a number of Makefile functions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • CLFS/master.sh

    rae08ff1 r17cde98  
    11831183cat << EOF
    11841184
    1185 all: ck_UID mk_SETUP mk_CROSS mk_TEMP mk_SUDO mk_SYSTOOLS mk_FINAL mk_BOOTSCRIPT mk_BOOTABLE
     1185all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS
    11861186        @sudo make do-housekeeping
    11871187        @\$(call echo_finished,$VERSION)
    … …  
    11891189ck_UID:
    11901190        @if [ \`id -u\` = "0" ]; then \\
    1191           echo "--------------------------------------------------"; \\
    1192           echo "You cannot run this makefile from the root account"; \\
    1193           echo "--------------------------------------------------"; \\
     1191          echo "+--------------------------------------------------+"; \\
     1192          echo "|You cannot run this makefile from the root account|"; \\
     1193          echo "+--------------------------------------------------+"; \\
    11941194          exit 1; \\
    11951195        fi
    … …  
    12031203#---------------AS LUSER
    12041204mk_CROSS: mk_SETUP
    1205         @\$(call echo_PHASE,Cross Tool)
    1206         @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CROSS" )
     1205        @\$(call echo_PHASE,Cross and Temporary Tools)
     1206        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make AS_LUSER" )
    12071207        @touch \$@
    12081208
    1209 mk_TEMP: mk_CROSS
    1210         @\$(call echo_PHASE,Temporary Tools)
    1211         @(sudo  \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make TEMP" )
    1212         @sudo make restore-luser-env
    1213         @touch \$@
    1214 
    1215 mk_SUDO: mk_TEMP
     1209mk_SUDO: mk_CROSS
    12161210        @sudo make SUDO
    12171211        @touch \$@
    … …  
    12321226        @sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chroot/082-createfiles
    12331227        @\$(call echo_CHROOT_request)
    1234         @\$(call echo_PHASE, Chroot systools)
    1235         @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make SYSTOOLS")
     1228        @\$(call echo_PHASE, CHROOT JAIL )
     1229        @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT_JAIL")
    12361230        @touch \$@
    12371231
    1238 mk_FINAL: mk_SYSTOOLS
    1239         @\$(call echo_PHASE,Final System)
    1240         @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make FINAL")
    1241         @touch \$@
    1242 
    1243 mk_BOOTSCRIPT: mk_FINAL
    1244         @\$(call echo_PHASE,Bootscript)
    1245         @\$(call echo_CHROOT_request)
    1246         @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BOOTSCRIPT")
    1247         @touch \$@
    1248 
    1249 mk_BOOTABLE: mk_BOOTSCRIPT
    1250         @\$(call echo_PHASE, Make bootable )
    1251         @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BOOTABLE")
    1252         @touch \$@
     1232
     1233
     1234SETUP:       $host_prep
     1235AS_LUSER:    $cross_tools $temptools
     1236SUDO:        $orphan_scripts
     1237CHROOT_JAIL: ${chroottools}${boottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
    12531238
    12541239EOF
    … …  
    12621247cat << EOF
    12631248
    1264 all:    ck_UID mk_SETUP mk_CROSS mk_TEMP mk_SYSTOOLS mk_SUDO
     1249all:    ck_UID mk_SETUP mk_CROSS mk_SUDO
    12651250        @sudo make restore-luser-env
    12661251        @\$(call echo_boot_finished,$VERSION)
    12671252
    1268 makesys: mk_FINAL mk_BOOTSCRIPT mk_BOOTABLE
     1253makesys: mk_FINAL
    12691254        @\$(call echo_finished,$VERSION)
    12701255
    … …  
    12721257ck_UID:
    12731258        @if [ \`id -u\` = "0" ]; then \\
    1274           echo "--------------------------------------------------"; \\
    1275           echo "You cannot run this makefile from the root account"; \\
    1276           echo "--------------------------------------------------"; \\
     1259          echo "+--------------------------------------------------+"; \\
     1260          echo "|You cannot run this makefile from the root account|"; \\
     1261          echo "|However, if this is the boot environment          |"; \\
     1262          echo "| the command you are looking for is               |"; \\
     1263          echo "|   make makesys                                   |"; \\
     1264          echo "| to finish off the build                          |"; \\
     1265          echo "+--------------------------------------------------+"; \\
    12771266          exit 1; \\
    12781267        fi
    … …  
    12891278mk_CROSS: mk_SETUP
    12901279        @\$(call echo_PHASE,Cross Tool)
    1291         @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CROSS" )
    1292         @touch \$@
    1293 
    1294 mk_TEMP: mk_CROSS
    1295         @\$(call echo_PHASE,Temporary Tools)
    1296         @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make TEMP" )
    1297         @touch \$@
    1298 
    1299 mk_SYSTOOLS: mk_TEMP
    1300         @\$(call echo_PHASE,Minimal Boot system)
    1301         @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SYSTOOLS" )
     1280        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make AS_LUSER" )
    13021281        @touch \$@
    13031282
    … …  
    13101289mk_FINAL:
    13111290        @\$(call echo_PHASE,Final System)
    1312         @( make FINAL )
     1291        @( make AS_ROOT )
    13131292        @touch \$@
    13141293
    1315 mk_BOOTSCRIPT: mk_FINAL
    1316         @\$(call echo_PHASE,Bootscript)
    1317         @( make BOOTSCRIPT )
    1318         @touch \$@
    1319 
    1320 mk_BOOTABLE: mk_BOOTSCRIPT
    1321         @\$(call echo_PHASE,Making Bootable)
    1322         @( make BOOTABLE )
    1323         @touch \$@
     1294SETUP:      $host_prep
     1295AS_LUSER:   $cross_tools $temptools ${chroottools}${boottools}
     1296SUDO:       $orphan_scripts
     1297AS_ROOT:    $testsuitetools $basicsystem $bootscripttools $bootabletools
    13241298
    13251299EOF
    … …  
    13301304 cat << EOF
    13311305
    1332 SETUP:      $host_prep
    1333 CROSS:      $cross_tools
    1334 TEMP:       $temptools
    1335 SUDO:       $orphan_scripts
    1336 SYSTOOLS:   ${chroottools}${boottools}
    1337 FINAL:      $testsuitetools $basicsystem
    1338 BOOTSCRIPT: $bootscripttools
    1339 BOOTABLE:   $bootabletools
    13401306
    13411307restart:
Note: See TracChangeset for help on using the changeset viewer.