Changeset 3e7ceed for HLFS

Timestamp:

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

• HLFS/master.sh (modified) (3 diffs)

HLFS/master.sh

@@ -495 +495 @@
   [[ "$COMPARE" = "y" ]] && wrt_compare_targets
   chapter7_Makefiles
+  # 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
@@ -527 +531 @@
   cat << EOF
 
-all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL
+all:    ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL
         @sudo make do-housekeeping
         @echo "$VERSION - jhalfs build" > hlfs-release && \\
@@ -579 +583 @@
         @touch \$@
 
-mk_BLFS_TOOL: create-sbu_du-report
-        @\$(call echo_PHASE,Building BLFS-TOOLS)
+mk_CUSTOM_TOOLS: create-sbu_du-report
+        @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
+          \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
+          \$(call echo_CHROOT_request); \\
+          sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
+          (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
+        fi;
+        @touch \$@
+
+mk_BLFS_TOOL: mk_CUSTOM_TOOLS
         @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          \$(call echo_PHASE,Building BLFS_TOOL); \\
+          \$(call echo_CHROOT_request); \\
           sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
-          sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
+          (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"); \\
         fi;
         @touch \$@
 
 
-SETUP:     $chapter3
-LUSER:     $chapter5
-SUDO:      $runasroot
-CHROOT:    $chapter6
-BOOT:      $chapter7
-BLFS_TOOL: $blfs_tool
+SETUP:        $chapter3
+LUSER:        $chapter5
+SUDO:         $runasroot
+CHROOT:       $chapter6
+BOOT:         $chapter7
+CUSTOM_TOOLS: $custom_list
+BLFS_TOOL:    $blfs_tool