Changeset 79da297

Timestamp:

03/02/2007 12:09:55 AM (17 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

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

Children:

a8ceefc

Parents:

b230bd6

Message:

added function to file makefile_functions and added call in HLFS and CLFS master.sh

Files:

• CLFS/master.sh (modified) (4 diffs)
• HLFS/master.sh (modified) (2 diffs)
• common/makefile-functions (modified) (1 diff)

CLFS/master.sh

@@ -806 +806 @@
 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"); \\
@@ -815 +815 @@
 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"; \\
@@ -912 +912 @@
         @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;
@@ -920 +920 @@
         @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

HLFS/master.sh

@@ -578 +578 @@
 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"); \\
@@ -587 +587 @@
 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"); \\

common/makefile-functions

@@ -23 +23 @@
   @echo $(BOLD)--------------------------------------------------------------------------------
   @echo $(WHITE)
+endef
+
+define sh_echo_PHASE
+  echo $(BOLD)--------------------------------------------------------------------------------;\
+  echo  $(tab_)$(tab_)Executing $(BLUE)$(1)$(WHITE) scripts; \
+  echo $(BOLD)--------------------------------------------------------------------------------echo $(WHITE)
 endef