Changeset cd4466f for CLFS2

Timestamp:

12/11/2006 06:21:16 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

5932971

Parents:

de22e80

Message:

Added BLFS_TOOL support to CLFS2 and some bug fixes.

File:

• CLFS2/master.sh (modified) (4 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 a header, some variables and include the function file
@@ -419 +422 @@
 cat << EOF
 
-all:    ck_UID mk_SETUP mk_LUSER mk_ROOT create-sbu_du-report
+all:    ck_UID mk_SETUP mk_LUSER create-sbu_du-report mk_BLFS_TOOL mk_ROOT
+        @sudo make restore-luser-env
         @sudo make do-housekeeping
         @\$(call echo_finished,$VERSION)
@@ -442 +446 @@
         @touch \$@
 
+mk_BLFS_TOOL: create-sbu_du-report
+        @\$(call echo_PHASE,Building BLFS-TOOLS)
+        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+          (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
+          (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make SHELL=/bin/bash BLFS_TOOL"); \\
+        fi;
+        @touch \$@
+
 mk_ROOT:
         @echo "$VERSION-sysroot - jhalfs build" > clfs-release && \\
@@ -448 +460 @@
         @touch \$@
 
-SETUP:  $host_prep
-LUSER:  $cross_tools $basicsystem $bootscripttools $bootable
-ROOT:   $chowning
-
-
-create-sbu_du-report:  ROOT
+SETUP:     $host_prep
+LUSER:     $cross_tools $basicsystem $bootscripttools $bootable
+BLFS_TOOL: $blfs_tool
+ROOT:      $chowning
+
+
+create-sbu_du-report: mk_LUSER
         @\$(call echo_message, Building)
         @if [ "\$(ADD_REPORT)" = "y" ]; then \\