Changeset 2ee1d11 for CLFS

Timestamp:

10/07/2006 07:14:47 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

42e1b38

Parents:

f5791f0

Message:

Merged r3147:3173 from trunk.

File:

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

CLFS/master.sh

@@ -1117 +1117 @@
   $bootable_cmds             # mk_BOOTABLE   (CHROOT) $bootabletools
 
+  # Add the BLFS_TOOL targets, if needed
+  [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets
+
   # Add a header, some variables and include the function file
   # to the top of the real Makefile.
@@ -1123 +1126 @@
 $HEADER
 
-SRC          = /sources
-MOUNT_PT     = $BUILDDIR
-PKG_LST      = $PKG_LST
-LUSER        = $LUSER
-LGROUP       = $LGROUP
-SCRIPT_ROOT  = $SCRIPT_ROOT
+SRC            = /sources
+MOUNT_PT       = $BUILDDIR
+PKG_LST        = $PKG_LST
+LUSER          = $LUSER
+LGROUP         = $LGROUP
+SCRIPT_ROOT    = $SCRIPT_ROOT
+ADD_BLFS_TOOLS = $BLFS_TOOL
 
 BASEDIR      = \$(MOUNT_PT)
@@ -1178 +1182 @@
 cat << EOF
 
-all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report
+all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report mk_BLFS_TOOL
         @sudo make do-housekeeping
         @\$(call echo_finished,$VERSION)
@@ -1227 +1231 @@
         @touch \$@
 
-
+mk_BLFS_TOOL: mk_SYSTOOLS
+        @\$(call echo_PHASE,Building BLFS-TOOLS); \\
+        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
+          sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
+        fi
+        @touch \$@
 
 SETUP:       $host_prep
@@ -1233 +1243 @@
 SUDO:        $orphan_scripts
 CHROOT_JAIL: ${chroottools}${boottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
+BLFS_TOOL:   $blfs_tool
 
 do-housekeeping:
@@ -1263 +1274 @@
   else echo -e "\t@true\n" >> $MKFILE; fi
 
+
 fi
 
@@ -1276 +1288 @@
         @\$(call echo_boot_finished,$VERSION)
 
-makesys: mk_FINAL
+makesys: mk_FINAL mk_BLFS_TOOL
         @\$(call echo_finished,$VERSION)
 
@@ -1306 +1318 @@
         @touch \$@
 
-mk_SUDO: mk_SYSTOOLS
+mk_SUDO: mk_CROSS
         @sudo make SUDO
         @touch \$@
@@ -1317 +1329 @@
         @touch \$@
 
+mk_BLFS_TOOL: mk_FINAL
+        @\$(call echo_PHASE,Building BLFS-TOOLS)
+        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          mkdir -p $TRACKING_DIR; \\
+          make BLFS_TOOL; \\
+        fi
+        @touch \$@
+
 SETUP:      $host_prep
 AS_LUSER:   $cross_tools $temptools ${chroottools}${boottools}
 SUDO:       $orphan_scripts
 AS_ROOT:    $testsuitetools $basicsystem $bootscripttools $bootabletools
+BLFS_TOOL:  $blfs_tool
 
 do-housekeeping:
@@ -1335 +1356 @@
 (
  cat << EOF
-
-
-restart:
-        @echo "This feature does not exist for the CLFS makefile. (yet)"
 
 restore-luser-env: