r2043 - jhalfs/trunk

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Oct 2 08:56:40 PDT 2005


Author: manuel
Date: 2005-10-02 09:56:40 -0600 (Sun, 02 Oct 2005)
New Revision: 2043

Modified:
   jhalfs/trunk/jhalfs
Log:
More chapter06 work

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2005-10-02 14:28:31 UTC (rev 2042)
+++ jhalfs/trunk/jhalfs	2005-10-02 15:56:40 UTC (rev 2043)
@@ -354,9 +354,6 @@
       echo -e "\techo \"\$(SRC)/\$\$ROOT\" > sources-dir && \\" >> $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??-* \$(LFS)\`\\\n\" >\$(LFS)\$(LOGDIR)/$i && \\" >> $MKFILE.tmp
-
     # For the Adjusting phase we must to cd to the binutils-build directory.
     if [ "$i" = "031-adjusting" ] ; then
       echo -e "\techo \"PKGDIR=\$(LFS)\$(SRC)/binutils-build\" > envars && \\" >> $MKFILE.tmp
@@ -369,6 +366,9 @@
       echo -e "\techo \"export TCLPATH\" >> 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??-* \$(LFS)\`\\\n\" >\$(LFS)\$(LOGDIR)/$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
 
@@ -464,8 +464,11 @@
       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
+    # 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
@@ -473,8 +476,11 @@
       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/jhalfs/commands/$file >>\$(LOGDIR)/$i 2>&1 && \\" >> $MKFILE.tmp
+    echo -e "\t. envars && commands/$file >>\$(LOGDIR)/$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\" >>\$(LOGDIR)/$i && \\" >> $MKFILE.tmp




More information about the alfs-log mailing list