r2765 - in jhalfs/trunk: CLFS HLFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Jun 10 08:58:07 PDT 2006


Author: manuel
Date: 2006-06-10 09:58:06 -0600 (Sat, 10 Jun 2006)
New Revision: 2765

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/HLFS/master.sh
   jhalfs/trunk/common/func_compare.sh
Log:
Ported new Makefile output look to HLFS and CLFS modules.

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-06-10 15:41:52 UTC (rev 2764)
+++ jhalfs/trunk/CLFS/master.sh	2006-06-10 15:58:06 UTC (rev 2765)
@@ -27,13 +27,17 @@
 		mkdir \$(MOUNT_PT)/sources; \\
 	fi;
 	@chmod a+wt \$(MOUNT_PT)/sources && \\
-	touch \$@
+	touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 
 024-creatingcrossdir: 023-creatingtoolsdir
 	@mkdir -v \$(MOUNT_PT)/cross-tools && \\
 	rm -f /cross-tools && \\
 	ln -s \$(MOUNT_PT)/cross-tools /
-	@touch \$@
+	@touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 
 025-addinguser:  024-creatingcrossdir
 	@\$(call echo_message, Building)
@@ -47,7 +51,9 @@
 	chown lfs \$(MOUNT_PT)/tools && \\
 	chown lfs \$(MOUNT_PT)/cross-tools && \\
 	chown lfs \$(MOUNT_PT)/sources && \\
-	touch \$@
+	touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 
 026-settingenvironment:  025-addinguser
 	@\$(call echo_message, Building)
@@ -73,7 +79,9 @@
 	echo "source $JHALFSDIR/envars" >> /home/lfs/.bashrc
 	@chown lfs:lfs /home/lfs/.bashrc && \\
 	touch envars && \\
-	touch \$@
+	touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 EOF
 ) >> $MKFILE.tmp
 
@@ -138,7 +146,7 @@
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -191,7 +199,7 @@
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -275,7 +283,7 @@
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -341,7 +349,7 @@
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -395,7 +403,7 @@
     wrt_remove_build_dirs "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -450,7 +458,7 @@
     wrt_remove_build_dirs2 "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -560,7 +568,7 @@
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -673,7 +681,7 @@
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs2 "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -735,7 +743,7 @@
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -796,7 +804,7 @@
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs2 "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -870,7 +878,7 @@
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -950,7 +958,7 @@
     [[ "$vrs" != "" ]] && wrt_remove_build_dirs2 "${name}"
     #
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -1096,7 +1104,9 @@
 		mv /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\
 	fi;
 	@chown lfs:lfs /home/lfs/.bash* && \\
-	touch \$@
+	touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 
 do-housekeeping:
 	-umount \$(MOUNT_PT)/dev/pts
@@ -1176,7 +1186,9 @@
 		mv -v /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\
 	fi;
 	@chown lfs:lfs /home/lfs/.bash* && \\
-	touch \$@
+	touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 
 
 EOF

Modified: jhalfs/trunk/HLFS/master.sh
===================================================================
--- jhalfs/trunk/HLFS/master.sh	2006-06-10 15:41:52 UTC (rev 2764)
+++ jhalfs/trunk/HLFS/master.sh	2006-06-10 15:58:06 UTC (rev 2765)
@@ -37,7 +37,9 @@
 		mkdir \$(MOUNT_PT)/sources; \\
 	fi;
 	@chmod a+wt \$(MOUNT_PT)/sources && \\
-	touch \$@
+	touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 
 021-addinguser:  020-creatingtoolsdir
 	@\$(call echo_message, Building)
@@ -49,7 +51,9 @@
 	fi;
 	@chown lfs \$(MOUNT_PT)/tools && \\
 	chown lfs \$(MOUNT_PT)/sources && \\
-	touch \$@
+	touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 
 022-settingenvironment:  021-addinguser
 	@\$(call echo_message, Building)
@@ -72,7 +76,9 @@
 	echo "source $JHALFSDIR/envars" >> /home/lfs/.bashrc && \\
 	chown lfs:lfs /home/lfs/.bashrc && \\
 	touch envars && \\
-	touch \$@
+	touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 EOF
 ) >> $MKFILE.tmp
 
@@ -197,7 +203,7 @@
     esac
 
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -365,7 +371,7 @@
     esac
 
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -457,7 +463,7 @@
     esac
 
     # Include a touch of the target name so make can check if it's already been made.
-    echo -e '\t at touch $@' >> $MKFILE.tmp
+    wrt_touch
     #
     #--------------------------------------------------------------------#
     #              >>>>>>>> END OF Makefile ENTRY <<<<<<<<               #
@@ -578,7 +584,9 @@
 		mv /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\
 	fi;
 	@chown lfs:lfs /home/lfs/.bash* && \\
-	touch \$@
+	touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 
 do-housekeeping:
 	-umount \$(MOUNT_PT)/dev/pts

Modified: jhalfs/trunk/common/func_compare.sh
===================================================================
--- jhalfs/trunk/common/func_compare.sh	2006-06-10 15:41:52 UTC (rev 2764)
+++ jhalfs/trunk/common/func_compare.sh	2006-06-10 15:58:06 UTC (rev 2765)
@@ -101,7 +101,7 @@
 }
 
 #----------------------------------#
-wrt_logs() {             #
+wrt_logs() {                       #
 #----------------------------------#
   local ITERATION=iteration-$1
 
@@ -111,7 +111,9 @@
 	mkdir $ITERATION && \\
 	mv ${LOGS} $ITERATION && \\
 	popd 1> /dev/null
-	@touch \$@
+	@touch \$@ && \\
+	echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
+	echo --------------------------------------------------------------------------------\$(WHITE)
 EOF
 ) >> $MKFILE.tmp
 }




More information about the alfs-log mailing list