Changeset 3e7ceed for CLFS2

Timestamp:

12/15/2006 10:53:10 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:

fcb540b

Parents:

830f28d

Message:

Ported CUSTOM_TOOLS support to all books.

File:

• CLFS2/master.sh (modified) (5 diffs)

CLFS2/master.sh

@@ -409 +409 @@
   bootscripts_Makefiles            # $bootscripttools
   bootable_Makefiles               # $bootable
-  # Add the BLFS_TOOL targets, if needed. Clean PREV to prevent that
-  # the first dependency script will depend on *-chowning
-  [[ "$BLFS_TOOL" = "y" ]] && PREV="" && wrt_blfs_tool_targets
+  # Add the CUSTOM_TOOLS targets, if needed
+  [[ "$CUSTOM_TOOLS" = "y" ]] && wrt_CustomTools_target
+  # Add the BLFS_TOOL targets, if needed.
+  [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets
 
   # Add a header, some variables and include the function file
@@ -422 +423 @@
 cat << EOF
 
-all:    ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_BLFS_TOOL mk_ROOT
+all:    ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL mk_ROOT
         @sudo make restore-luser-env
         @sudo make do-housekeeping
@@ -445 +446 @@
         @touch \$@
 
-mk_BLFS_TOOL: create-sbu_du-report
-        @\$(call echo_PHASE,Building BLFS-TOOLS)
+mk_CUSTOM_TOOLS: create-sbu_du-report
         @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
+          \$(call echo_SULUSER_request); \\
+          (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
+          (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash CUSTOM_TOOLS"); \\
+        fi;
+        @touch \$@
+
+mk_BLFS_TOOL: mk_CUSTOM_TOOLS
+        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          \$(call echo_PHASE,Building BLFS_TOOL); \\
+          \$(call echo_SULUSER_request); \\
           (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
           (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash BLFS_TOOL"); \\
@@ -453 +464 @@
         @touch \$@
 
-mk_ROOT:
+mk_ROOT: mk_BLFS_TOOL
+        @\$(call echo_SU_request)
         @echo "$VERSION-sysroot - jhalfs build" > clfs-release && \\
         sudo mv clfs-release \$(MOUNT_PT)/etc
@@ -459 +471 @@
         @touch \$@
 
-SETUP:     $host_prep
-LUSER:     $cross_tools $basicsystem $bootscripttools $bootable
-BLFS_TOOL: $blfs_tool
-ROOT:      $chowning
+SETUP:        $host_prep
+LUSER:        $cross_tools $basicsystem $bootscripttools $bootable
+CUSTOM_TOOLS: $custom_list
+BLFS_TOOL:    $blfs_tool
+ROOT:         $chowning