Changeset dbcdfd7 for CLFS/master.sh

Timestamp:

03/18/2007 10:14:04 AM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

ace8142

Parents:

b0ba1f0

Message:

Reimplemented support for partial builds.

File:

• CLFS/master.sh (modified) (14 diffs)

CLFS/master.sh

@@ -21 +21 @@
         @mkdir \$(MOUNT_PT)/tools && \\
         rm -f /tools && \\
-        ln -s \$(MOUNT_PT)/tools / && \\
-        touch \$@ && \\
-        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
-        echo --------------------------------------------------------------------------------\$(WHITE)
+        ln -s \$(MOUNT_PT)/tools /
+        @\$(call housekeeping)
 
 024-creatingcrossdir: 023-creatingtoolsdir
@@ -30 +28 @@
         @mkdir -v \$(MOUNT_PT)/cross-tools && \\
         rm -f /cross-tools && \\
-        ln -s \$(MOUNT_PT)/cross-tools / && \\
-        touch \$@ && \\
-        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
-        echo --------------------------------------------------------------------------------\$(WHITE)
+        ln -s \$(MOUNT_PT)/cross-tools /
+        @\$(call housekeeping)
 
 025-addinguser:  024-creatingcrossdir
@@ -46 +42 @@
         chown \$(LUSER) \$(MOUNT_PT)/cross-tools && \\
         chmod -R a+wt \$(MOUNT_PT)/\$(SCRIPT_ROOT) && \\
-        chmod a+wt \$(SRCSDIR) && \\
-        touch \$@ && \\
-        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
-        echo --------------------------------------------------------------------------------\$(WHITE)
+        chmod a+wt \$(SRCSDIR)
+        @\$(call housekeeping)
 
 026-settingenvironment:  025-addinguser
@@ -76 +70 @@
         touch envars && \\
         chmod -R a+wt \$(MOUNT_PT) && \\
-        chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT) && \\
-        touch \$@ && \\
-        echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
-        echo --------------------------------------------------------------------------------\$(WHITE)
+        chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT)
+        @\$(call housekeeping)
 EOF
 ) >> $MKFILE.tmp
@@ -783 +775 @@
 mk_SETUP:
         @\$(call echo_SU_request)
-        @sudo make SETUP
+        @sudo make make BREAKPOINT=\$(BREAKPOINT) SETUP
         @touch \$@
 
@@ -789 +781 @@
 mk_CROSS: mk_SETUP
         @\$(call echo_PHASE,Cross and Temporary Tools)
-        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make AS_LUSER" )
+        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make make BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
         @sudo make restore-luser-env
         @touch \$@
 
 mk_SUDO: mk_CROSS
-        @sudo make SUDO
+        @sudo make make BREAKPOINT=\$(BREAKPOINT) SUDO
         @touch \$@
 
@@ -801 +793 @@
         @\$(call echo_CHROOT_request)
         @\$(call echo_PHASE, CHROOT JAIL )
-        @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT_JAIL")
+        @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make make BREAKPOINT=\$(BREAKPOINT) CHROOT_JAIL")
         @touch \$@
 
@@ -808 +800 @@
           \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
           sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
-          (sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
+          (sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make make BREAKPOINT=\$(BREAKPOINT) CUSTOM_TOOLS"); \\
         fi;
         @touch \$@
@@ -816 +808 @@
           \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
           sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
-          sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
+          sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL"; \\
         fi;
         @touch \$@
@@ -886 +878 @@
 mk_SETUP:
         @\$(call echo_SU_request)
-        @sudo make SETUP
+        @sudo make make BREAKPOINT=\$(BREAKPOINT) SETUP
         @touch \$@
 
@@ -893 +885 @@
 mk_CROSS: mk_SETUP
         @\$(call echo_PHASE,Cross Tool)
-        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make AS_LUSER" )
+        @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make make BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
         @touch \$@
 
 mk_SUDO: mk_CROSS
-        @sudo make SUDO
+        @sudo make make BREAKPOINT=\$(BREAKPOINT) SUDO
         @touch \$@
 
@@ -904 +896 @@
 mk_FINAL:
         @\$(call echo_PHASE,Final System)
-        @( source /root/.bash_profile && make AS_ROOT )
+        @( source /root/.bash_profile && make make BREAKPOINT=\$(BREAKPOINT) AS_ROOT )
         @touch \$@
 
@@ -911 +903 @@
           \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
           mkdir -p ${TRACKING_DIR}; \\
-          ( source /root/.bash_profile && make CUSTOM_TOOLS ); \\
+          ( source /root/.bash_profile && make make BREAKPOINT=\$(BREAKPOINT) CUSTOM_TOOLS ); \\
         fi;
         @touch \$@
@@ -919 +911 @@
           \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
           mkdir -p $TRACKING_DIR; \\
-          ( source /root/.bash_profile && make BLFS_TOOL ); \\
+          ( source /root/.bash_profile && make make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL ); \\
         fi
         @touch \$@