Changeset 1838bc7 for CLFS/master.sh

Timestamp:

11/12/2006 01:50:34 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

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

Children:

d55a1a1

Parents:

1f81129

Message:

Changed how create-sbu_du-report target is created.
Added blfs-tool support to HLFS.

File:

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

CLFS/master.sh

@@ -1100 +1100 @@
         @touch \$@
 
-mk_BLFS_TOOL: mk_SYSTOOLS
-        @\$(call echo_PHASE,Building BLFS-TOOLS); \\
+mk_BLFS_TOOL: create-sbu_du-report
+        @\$(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
+        fi;
         @touch \$@
 
@@ -1113 +1113 @@
 CHROOT_JAIL: ${chroottools}${boottools} $testsuitetools $basicsystem  $bootscripttools  $bootabletools
 BLFS_TOOL:   $blfs_tool
+
+
+create-sbu_du-report:  mk_SYSTOOLS
+        @\$(call echo_message, Building)
+        @if [ "\$(ADD_REPORT)" = "y" ]; then \\
+          ./create-sbu_du-report.sh logs $VERSION; \\
+          \$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report); \\
+        fi;
+        @touch  \$@
 
 do-housekeeping:
@@ -1128 +1137 @@
 EOF
 ) >> $MKFILE
-
-  # Add SBU-disk_usage report target
-  echo "create-sbu_du-report:" >> $MKFILE
-  if [[ "$REPORT" = "y" ]] ; then
-(
-    cat << EOF
-        @\$(call echo_message, Building)
-        @./create-sbu_du-report.sh logs $VERSION
-        @\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
-        @touch  \$@
-
-EOF
-) >> $MKFILE
-  else echo -e "\t@true\n" >> $MKFILE; fi
-
 
 fi