r2459 - jhalfs/branches/experimental/LFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Wed Mar 29 10:48:49 PST 2006


Author: manuel
Date: 2006-03-29 11:48:47 -0700 (Wed, 29 Mar 2006)
New Revision: 2459

Modified:
   jhalfs/branches/experimental/LFS/master.sh
Log:
Skip console script also in LFS

Modified: jhalfs/branches/experimental/LFS/master.sh
===================================================================
--- jhalfs/branches/experimental/LFS/master.sh	2006-03-29 18:41:33 UTC (rev 2458)
+++ jhalfs/branches/experimental/LFS/master.sh	2006-03-29 18:48:47 UTC (rev 2459)
@@ -75,7 +75,7 @@
       *dejagnu)   [[ "${TEST}" = "0" ]] && continue ;;
       *stripping) [[ "${STRIP}" = "0" ]] && continue ;;
     esac
-  
+
     # First append each name of the script files to a list (this will become
     # the names of the targets in the Makefile
     chapter5="$chapter5 ${this_script}"
@@ -221,6 +221,7 @@
     case ${this_script} in
       *grub)    continue ;;
       *reboot)  continue ;;
+      *console) continue  ;; # Use the file generated by lfs-bootscripts
       *kernel)  [[ -z ${CONFIG} ]] && continue
                 cp ${CONFIG} $BUILDDIR/sources/kernel-config  ;;
     esac
@@ -250,7 +251,7 @@
           wrt_unpack2 "$FILE"
        ;;
     esac
-    
+
       # Check if we have a real /etc/fstab file
     case "${this_script}" in
       *fstab) if [[ -n $FSTAB ]]; then
@@ -267,7 +268,7 @@
       *bootscripts)  wrt_remove_build_dirs "dummy" ;;
       *kernel)       wrt_remove_build_dirs "dummy" ;;
     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




More information about the alfs-log mailing list