r2335 - in jhalfs/branches/experimental: HLFS LFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Fri Mar 10 14:27:17 PST 2006


Author: georgeb
Date: 2006-03-10 15:27:16 -0700 (Fri, 10 Mar 2006)
New Revision: 2335

Modified:
   jhalfs/branches/experimental/HLFS/master.sh
   jhalfs/branches/experimental/LFS/master.sh
Log:
LFS/master.sh -- removed bash patch for copying CONFIG, now done via XSL

Modified: jhalfs/branches/experimental/HLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/HLFS/master.sh	2006-03-10 20:15:31 UTC (rev 2334)
+++ jhalfs/branches/experimental/HLFS/master.sh	2006-03-10 22:27:16 UTC (rev 2335)
@@ -174,9 +174,9 @@
     # Skip this script depending on jhalfs.conf flags set.
     case $this_script in
       # If no testsuites will be run, then TCL, Expect and DejaGNU aren't needed
-      *tcl* )     [[ "$TOOLCHAINTEST" = "0" ]] && continue; ;;
-      *expect* )  [[ "$TOOLCHAINTEST" = "0" ]] && continue; ;;
-      *dejagnu* ) [[ "$TOOLCHAINTEST" = "0" ]] && continue; ;;
+      *tcl* )     [[ "$TEST" = "0" ]] && continue; ;;
+      *expect* )  [[ "$TEST" = "0" ]] && continue; ;;
+      *dejagnu* ) [[ "$TEST" = "0" ]] && continue; ;;
         # Test if the stripping phase must be skipped
       *stripping* ) [[ "$STRIP" = "0" ]] && continue ;;
         # Select the appropriate library
@@ -451,7 +451,10 @@
       *reboot)  continue  ;;
       *console) continue  ;; # Use the file generated by lfs-bootscripts
 
-      *kernel)  # How does Manuel add this string to the file..
+      *kernel)  
+          # If no .config file is supplied, the kernel build is skipped
+        [[ -z $CONFIG ]] && continue
+	  # How does Manuel add this string to the file..
         sed 's|cd \$PKGDIR.*||'         -i chapter07/$this_script
           # You cannot run menuconfig from within the makefile
         sed 's|make menuconfig|make oldconfig|' -i chapter07/$this_script
@@ -465,8 +468,6 @@
           sed '/loadkeys -m/d'          -i chapter07/$this_script
           sed '/drivers\/char/d'        -i chapter07/$this_script
         fi
-          # If no .config file is supplied, the kernel build is skipped
-        [[ -z $CONFIG ]] && continue
          ;;
       *usage)   # The script bombs, disable error trapping
         sed 's|set -e|set +e|'  -i chapter07/$this_script

Modified: jhalfs/branches/experimental/LFS/master.sh
===================================================================
--- jhalfs/branches/experimental/LFS/master.sh	2006-03-10 20:15:31 UTC (rev 2334)
+++ jhalfs/branches/experimental/LFS/master.sh	2006-03-10 22:27:16 UTC (rev 2335)
@@ -260,15 +260,6 @@
       wrt_unpack2 "$FILE"
     fi
 
-    # Put in place the kernel .config file
-    if [[ `_IS_ ${this_script} kernel` ]] ; then
-(
-    cat << EOF
-	@cp $CONFIG \$(MOUNT_PT)/sources/kernel-config
-EOF
-) >> $MKFILE.tmp
-    fi
-
       # Check if we have a real /etc/fstab file
     if [[ `_IS_ ${this_script} fstab` ]] && [[ -n "$FSTAB" ]] ; then
       wrt_copy_fstab "${this_script}"




More information about the alfs-log mailing list