r2045 - jhalfs/trunk

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Oct 2 11:03:13 PDT 2005


Author: manuel
Date: 2005-10-02 12:03:13 -0600 (Sun, 02 Oct 2005)
New Revision: 2045

Modified:
   jhalfs/trunk/jhalfs
Log:
Simplified logs path.
Addressed 057-kernfs.

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2005-10-02 16:34:41 UTC (rev 2044)
+++ jhalfs/trunk/jhalfs	2005-10-02 18:03:13 UTC (rev 2045)
@@ -367,13 +367,13 @@
     fi
 
     # Inser date and disk usage at the top of the log file.
-    echo -e "\techo -e \"\\\n\`date\`\\\n\\\nKB: \`du -sk --exclude=0??-* \$(LFS)\`\\\n\" >\$(LFS)\$(LOGDIR)/$i && \\" >> $MKFILE.tmp
+    echo -e "\techo -e \"\\\n\`date\`\\\n\\\nKB: \`du -sk --exclude=0??-* \$(LFS)\`\\\n\" >logs/$i && \\" >> $MKFILE.tmp
 
     # Insert the script run
-    echo -e "\tsu - lfs -c \". /home/lfs/.bashrc && $JHALFSDIR/commands/$file\" >>\$(LFS)\$(LOGDIR)/$i 2>&1 && \\" >> $MKFILE.tmp
+    echo -e "\tsu - lfs -c \". /home/lfs/.bashrc && $JHALFSDIR/commands/$file\" >>logs/$i 2>&1 && \\" >> $MKFILE.tmp
 
     # Inser date and disk usage at the bottom of the log file.
-    echo -e "\techo -e \"\\\n\`date\`\\\n\\\nKB: \`du -sk --exclude=0??-* \$(LFS)\`\\\n\" >>\$(LFS)\$(LOGDIR)/$i && \\" >> $MKFILE.tmp
+    echo -e "\techo -e \"\\\n\`date\`\\\n\\\nKB: \`du -sk --exclude=0??-* \$(LFS)\`\\\n\" >>logs/$i && \\" >> $MKFILE.tmp
 
     # Include a touch of the target name so make can check
     # if it's already been made.
@@ -464,27 +464,30 @@
       echo -e "\techo \"export PKGDIR\" >> envars && \\" >> $MKFILE.tmp
     fi
 
-    # For the mount of kernel filesystems we need to set LFS.
-    if [ "$i" = "057-kernfs" ] ; then
-      echo -e "\techo \"LFS=\$(LFS)\" > envars && \\" >> $MKFILE.tmp
-      echo -e "\techo \"export LFS\" >> envars && \\" >> $MKFILE.tmp
-    fi
-
     # For the Re-Adjusting phase we must to cd to the binutils-build directory.
     if [ "$i" = "067-readjusting" ] ; then
       echo -e "\techo \"PKGDIR=\$(SRC)/binutils-build\" > envars && \\" >> $MKFILE.tmp
       echo -e "\techo \"export PKGDIR\" >> envars && \\" >> $MKFILE.tmp
     fi
 
-    # Inser date and disk usage at the top of the log file.
-    echo -e "\techo -e \"\\\n\`date\`\\\n\\\nKB: \`du -sk --exclude=0??-* /\`\\\n\" >\$(LOGDIR)/$i && \\" >> $MKFILE.tmp
-
     # Insert the script run
-    echo -e "\t. envars && commands/$file >>\$(LOGDIR)/$i 2>&1 && \\" >> $MKFILE.tmp
+    # For the mount of kernel filesystems we need to set LFS.
+    if [ "$i" = "057-kernfs" ] ; then
+      echo -e "\techo \"LFS=\$(LFS)\" > envars && \\" >> $MKFILE.tmp
+      echo -e "\techo \"export LFS\" >> envars && \\" >> $MKFILE.tmp
+      # Inser date and disk usage at the top of the log file.
+      echo -e "\techo -e \"\\\n\`date\`\\\n\\\nKB: \`du -sk --exclude=0??-* \$(LFS)\`\\\n\" >logs/$i && \\" >> $MKFILE.tmp
+      echo -e "\t. envars && commands/$file >>logs/$i 2>&1 && \\" >> $MKFILE.tmp
+      # Inser date and disk usage at the bottom of the log file.
+      echo -e "\techo -e \"\\\n\`date\`\\\n\\\nKB: \`du -sk --exclude=0??-* \$(LFS)\`\\\n\" >>logs/$i && \\" >> $MKFILE.tmp
+    else
+      # Inser date and disk usage at the top of the log file.
+      echo -e "\techo -e \"\\\n\`date\`\\\n\\\nKB: \`du -sk --exclude=0??-* /\`\\\n\" >logs/$i && \\" >> $MKFILE.tmp
+      echo -e "\t. envars && commands/$file >>logs/$i 2>&1 && \\" >> $MKFILE.tmp
+      # Inser date and disk usage at the bottom of the log file.
+      echo -e "\techo -e \"\\\n\`date\`\\\n\\\nKB: \`du -sk --exclude=0??-* /\`\\\n\" >>logs/$i && \\" >> $MKFILE.tmp
+    fi
 
-    # Inser date and disk usage at the bottom of the log file.
-    echo -e "\techo -e \"\\\n\`date\`\\\n\\\nKB: \`du -sk --exclude=0??-* \$(LFS)\`\\\n\" >>\$(LOGDIR)/$i && \\" >> $MKFILE.tmp
-
     # Include a touch of the target name so make can check
     # if it's already been made.
     echo -e "\ttouch \$@" >> $MKFILE.tmp
@@ -508,7 +511,7 @@
     fi
 
     # Check if the package has been sucessfully build.
-    echo -e "\tif [ ! -e \$@ ] ; then \\" >> $MKFILE.tmp
+    echo -e "\t at if [ ! -e \$@ ] ; then \\" >> $MKFILE.tmp
     echo -e "\t\techo \"The build of \$@ has failed\" && exit 1; \\" >> $MKFILE.tmp
     echo -e "\tfi;" >> $MKFILE.tmp
 




More information about the alfs-log mailing list