r2817 - in jhalfs/trunk: CLFS common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Mon Jul 3 19:02:49 PDT 2006


Author: georgeb
Date: 2006-07-03 20:02:48 -0600 (Mon, 03 Jul 2006)
New Revision: 2817

Modified:
   jhalfs/trunk/CLFS/master.sh
   jhalfs/trunk/common/common-functions
Log:
The never ending story of cleaning up CLFS scripts..

Modified: jhalfs/trunk/CLFS/master.sh
===================================================================
--- jhalfs/trunk/CLFS/master.sh	2006-07-04 00:17:33 UTC (rev 2816)
+++ jhalfs/trunk/CLFS/master.sh	2006-07-04 02:02:48 UTC (rev 2817)
@@ -442,7 +442,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    wrt_target "${this_script}" "$PREV"
+    wrt_target_boot "${this_script}" "$PREV"
     #
     wrt_unpack3 "$pkg_tarball"
     [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
@@ -647,7 +647,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    wrt_target "${this_script}${N}" "$PREV"
+    wrt_target_boot "${this_script}${N}" "$PREV"
 
     # If $pkg_tarball isn't empty, we've got a package...
     if [ "$pkg_tarball" != "" ] ; then
@@ -785,7 +785,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    wrt_target "${this_script}" "$PREV"
+    wrt_target_boot "${this_script}" "$PREV"
     #
     # If $pkg_tarball isn't empty, we've got a package...
     #
@@ -926,7 +926,7 @@
     #
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    wrt_target "${this_script}" "$PREV"
+    wrt_target_boot "${this_script}" "$PREV"
     #
     # If $pkg_tarball isn't empty, we've got a package...
     # Insert instructions for unpacking the package and changing directories

Modified: jhalfs/trunk/common/common-functions
===================================================================
--- jhalfs/trunk/common/common-functions	2006-07-04 00:17:33 UTC (rev 2816)
+++ jhalfs/trunk/common/common-functions	2006-07-04 02:02:48 UTC (rev 2817)
@@ -207,6 +207,27 @@
 ) >> $MKFILE.tmp
 }
 
+
+#----------------------------------#
+wrt_target_boot() {                # Create target and initialize log file
+#----------------------------------#
+  local i=$1
+  local PREV=$2
+  case $i in
+    iteration* ) local LOGFILE=$this_script.log ;;
+             * ) local LOGFILE=$this_script ;;
+  esac
+(
+cat << EOF
+
+$i:  $PREV
+	@\$(call echo_message, Building)
+	@./progress_bar.sh \$@ &
+	@echo -e "\n\`date\`\n\nKB: \`du -skx --exclude=${SCRIPT_ROOT}\`\n" >logs/$LOGFILE
+EOF
+) >> $MKFILE.tmp
+}
+
 #----------------------------#
 get_package_tarball_name() { #
 #----------------------------#




More information about the alfs-log mailing list