r2073 - jhalfs/trunk

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Oct 4 17:13:30 PDT 2005


Author: jhuntwork
Date: 2005-10-04 18:13:29 -0600 (Tue, 04 Oct 2005)
New Revision: 2073

Modified:
   jhalfs/trunk/jhalfs
Log:
Include chapter6 in the build and remove any chroot commands from the dependency list.

Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2005-10-04 19:32:47 UTC (rev 2072)
+++ jhalfs/trunk/jhalfs	2005-10-05 00:13:29 UTC (rev 2073)
@@ -485,6 +485,12 @@
     # Keep the script file name
     i=`basename $file`
 
+    # We'll run the chroot commands differently than the others, so skip them in the
+    # dependencies and target creation.
+    if echo $i | grep -q "chroot" ; then
+       continue
+    fi
+
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
     chapter6="$chapter6 $i"
@@ -497,9 +503,6 @@
 
     # Drop in the name of the target on a new line, and the previous target
     # as a dependency. Also call the echo_message function.
-    if echo $i | grep -q "chroot" ; then
-       continue
-    else
 (
     cat << EOF
 
@@ -507,7 +510,6 @@
 	@\$(call echo_message, Building)
 EOF
 ) >> $MKFILE.tmp
-    fi
 
     # Find the version of the command files, if it corresponds with the building of
     # a specific package
@@ -626,7 +628,7 @@
   # as a dependency.
 (
     cat << EOF
-all:  chapter4 chapter5
+all:  chapter4 chapter5 chapter6
 	@echo -e "\n\tYour new LFS system has been successfully built"
 
 chapter4:  020-creatingtoolsdir 021-addinguser 022-settingenvironment




More information about the alfs-log mailing list