Changeset 3e7ceed for CLFS3

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:

• CLFS3/master.sh (modified) (4 diffs)

CLFS3/master.sh

@@ -412 +412 @@
   bootscripts_Makefiles            # $bootscripttools
   bootable_Makefiles               # $bootable
+  # Add the CUSTOM_TOOLS targets, if needed
+  [[ "$CUSTOM_TOOLS" = "y" ]] && wrt_CustomTools_target
 
   # Add a header, some variables and include the function file
@@ -422 +424 @@
 cat << EOF
 
-all:    ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_ROOT
+all:    ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_CUSTOM_TOOLS mk_ROOT
         @sudo make restore-luser-env
         @sudo make do-housekeeping
@@ -445 +447 @@
         @touch \$@
 
-mk_ROOT:
+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_ROOT: mk_CUSTOM_TOOLS
+        @\$(call echo_SU_request)
         @echo "$VERSION-embedded - jhalfs build" > clfs-release && \\
         sudo mv clfs-release \$(MOUNT_PT)/etc
@@ -452 +464 @@
 
 
-SETUP:  $host_prep
-LUSER:  $cross_tools $basicsystem $bootscripttools $bootable
-ROOT:   $chowning
+SETUP:        $host_prep
+LUSER:        $cross_tools $basicsystem $bootscripttools $bootable
+CUSTOM_TOOLS: $custom_list
+ROOT:         $chowning