r3326 - in jhalfs/trunk: CLFS CLFS2 CLFS3 LFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Mar 3 04:18:07 PST 2007


Author: manuel
Date: 2007-03-03 05:18:07 -0700 (Sat, 03 Mar 2007)
New Revision: 3326

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/CLFS2/master.sh
   jhalfs/trunk/CLFS3/master.sh
   jhalfs/trunk/LFS/master.sh
Log:
Unified mk_CUSTOM_TOOLS and mk_BLFS_TOOL targets.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2007-03-03 11:58:40 UTC (rev 3325)
+++ jhalfs/trunk/CLFS/master.sh	2007-03-03 12:18:07 UTC (rev 3326)
@@ -908,16 +908,16 @@
 
 mk_CUSTOM_TOOLS: mk_FINAL
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  mkdir -p ${TRACKING_DIR}; \\
-	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  ( source /root/.bash_profile && make CUSTOM_TOOLS ); \\
 	fi;
 	@touch \$@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
 	  mkdir -p $TRACKING_DIR; \\
-	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
 	  ( source /root/.bash_profile && make BLFS_TOOL ); \\
 	fi
 	@touch \$@

Modified: jhalfs/trunk/CLFS2/master.sh
===================================================================
--- jhalfs/trunk/CLFS2/master.sh	2007-03-03 11:58:40 UTC (rev 3325)
+++ jhalfs/trunk/CLFS2/master.sh	2007-03-03 12:18:07 UTC (rev 3326)
@@ -422,7 +422,7 @@
 (
 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_BLFS_TOOL mk_ROOT
 	@sudo make restore-luser-env
 	@sudo make do-housekeeping
 	@\$(call echo_finished,$VERSION)
@@ -446,16 +446,16 @@
 	@touch \$@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
-	\$(call echo_PHASE,CUSTOM_TOOLS)
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
 	  (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
 	fi;
 	@touch \$@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
-	\$(call echo_PHASE,BLFS_TOOL)
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
 	  (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
 	  (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BLFS_TOOL"); \\
 	fi;

Modified: jhalfs/trunk/CLFS3/master.sh
===================================================================
--- jhalfs/trunk/CLFS3/master.sh	2007-03-03 11:58:40 UTC (rev 3325)
+++ jhalfs/trunk/CLFS3/master.sh	2007-03-03 12:18:07 UTC (rev 3326)
@@ -493,8 +493,8 @@
 	@touch \$@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
-	\$(call echo_PHASE,Building CUSTOM_TOOLS);
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  (sudo \$(SU_LUSER) "mkdir -p $BUILDDIR$TRACKING_DIR"); \\
 	  (sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
 	fi;

Modified: jhalfs/trunk/LFS/master.sh
===================================================================
--- jhalfs/trunk/LFS/master.sh	2007-03-03 11:58:40 UTC (rev 3325)
+++ jhalfs/trunk/LFS/master.sh	2007-03-03 12:18:07 UTC (rev 3326)
@@ -448,16 +448,16 @@
 	@touch \$@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
-	\$(call echo_PHASE,Building CUSTOM_TOOLS)
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
 	  (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
 	fi;
 	@touch \$@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
-	\$(call echo_PHASE,Building BLFS_TOOL)
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
 	  sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
 	  (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"); \\
 	fi;




More information about the alfs-log mailing list