r3323 - in jhalfs/trunk: CLFS HLFS common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Thu Mar 1 16:09:56 PST 2007


Author: georgeb
Date: 2007-03-01 17:09:55 -0700 (Thu, 01 Mar 2007)
New Revision: 3323

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/HLFS/master.sh
   jhalfs/trunk/common/makefile-functions
Log:
added function to file makefile_functions and added call in HLFS and CLFS master.sh 

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2007-02-26 20:35:33 UTC (rev 3322)
+++ jhalfs/trunk/CLFS/master.sh	2007-03-02 00:09:55 UTC (rev 3323)
@@ -805,8 +805,8 @@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
-	  \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
-	  \$(call echo_CHROOT_request); \\
+	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
+	  \$(call sh_echo_CHROOT_request); \\
 	  sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
 	  (sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
 	fi;
@@ -814,8 +814,8 @@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-	  \$(call echo_PHASE,Building BLFS_TOOL); \\
-	  \$(call echo_CHROOT_request); \\
+	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
+	  \$(call sh_echo_CHROOT_request); \\
 	  sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
 	  sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"; \\
 	fi;
@@ -911,7 +911,7 @@
 mk_CUSTOM_TOOLS: mk_FINAL
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
 	  mkdir -p ${TRACKING_DIR}; \\
-	  \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
+	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
 	  ( source /root/.bash_profile && make CUSTOM_TOOLS ); \\
 	fi;
 	@touch \$@
@@ -919,7 +919,7 @@
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
 	  mkdir -p $TRACKING_DIR; \\
-	  \$(call echo_PHASE,Building BLFS_TOOL); \\
+	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
 	  ( source /root/.bash_profile && make BLFS_TOOL ); \\
 	fi
 	@touch \$@

Modified: jhalfs/trunk/HLFS/master.sh
===================================================================
--- jhalfs/trunk/HLFS/master.sh	2007-02-26 20:35:33 UTC (rev 3322)
+++ jhalfs/trunk/HLFS/master.sh	2007-03-02 00:09:55 UTC (rev 3323)
@@ -577,8 +577,8 @@
 
 mk_CUSTOM_TOOLS: create-sbu_du-report
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
-	  \$(call echo_PHASE,Building CUSTOM_TOOLS); \\
-	  \$(call echo_CHROOT_request); \\
+	  \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
+	  \$(call sh_echo_CHROOT_request); \\
 	  sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
 	  (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make CUSTOM_TOOLS"); \\
 	fi;
@@ -586,8 +586,8 @@
 
 mk_BLFS_TOOL: mk_CUSTOM_TOOLS
 	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-	  \$(call echo_PHASE,Building BLFS_TOOL); \\
-	  \$(call echo_CHROOT_request); \\
+	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
+	  \$(call sh_echo_CHROOT_request); \\
 	  sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
 	  (sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL"); \\
 	fi;

Modified: jhalfs/trunk/common/makefile-functions
===================================================================
--- jhalfs/trunk/common/makefile-functions	2007-02-26 20:35:33 UTC (rev 3322)
+++ jhalfs/trunk/common/makefile-functions	2007-03-02 00:09:55 UTC (rev 3323)
@@ -24,6 +24,12 @@
   @echo $(WHITE)
 endef
 
+define sh_echo_PHASE
+  echo $(BOLD)--------------------------------------------------------------------------------;\
+  echo  $(tab_)$(tab_)Executing $(BLUE)$(1)$(WHITE) scripts; \
+  echo $(BOLD)--------------------------------------------------------------------------------echo $(WHITE)
+endef
+
 define echo_SU_request
   @echo $(BOLD)--------------------------------------------------------------------------------
   @echo $(BLUE)$@




More information about the alfs-log mailing list